Branch: refs/heads/safari-7617.2.1.11-branch Home: https://github.com/WebKit/WebKit Commit: 8986231244e953713250b24e8b93317d8e38d7da https://github.com/WebKit/WebKit/commit/8986231244e953713250b24e8b93317d8e38d7da Author: Myah Cobbs <mco...@apple.com> Date: 2023-12-04 (Mon, 04 Dec 2023)
Changed paths: M Configurations/Version.xcconfig Log Message: ----------- Versioning. WebKit-7617.2.1.11.1 Identifier: 267815.600@safari-7617.2.1.11-branch Commit: 8d5e71057e7843f2ecbac5a3b7ed8d7a12a1a176 https://github.com/WebKit/WebKit/commit/8d5e71057e7843f2ecbac5a3b7ed8d7a12a1a176 Author: Myah Cobbs <mco...@apple.com> Date: 2023-12-04 (Mon, 04 Dec 2023) Changed paths: A LayoutTests/media/content/test-inband-captions.mp4 A LayoutTests/media/track/track-in-band-layout-expected.txt A LayoutTests/media/track/track-in-band-layout.html M LayoutTests/platform/glib/TestExpectations M Source/WebCore/html/track/InbandGenericTextTrack.cpp M Source/WebCore/html/track/TextTrackCueGeneric.cpp M Source/WebCore/html/track/TextTrackCueGeneric.h M Source/WebCore/html/track/VTTCue.h M Source/WebCore/platform/graphics/InbandGenericCue.cpp M Source/WebCore/platform/graphics/InbandGenericCue.h M Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp M Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in Log Message: ----------- Cherry-pick 53b6a4522e45. rdar://119138261 REGRESSION(265596@main): [Cocoa] In-band captions generate large, line-wrapped cues https://bugs.webkit.org/show_bug.cgi?id=265635 rdar://119024855 Reviewed by Eric Carlson. When modernizing VTTCue, TextTrackCueGeneric was not sufficiently updated to take advantage of the correct layout implemented by VTTCue. Specifically, TextTrackCueGeneric still queried VTTCueBox::fontSizeFromCaptionUserPrefs(), which was no longer set, and caused the cue width to be incorrectly set to zero. Remove that dead method, and remove most of the implementation of TextTrackCueGenericBoxElement::applyCSSProperties, relying instead upon VTTCueBoxElement's implementation. In order to correctly position TextTrackCueGeneric objects created from AVFoundation, set the resulting cue's positionAlign() to "Center" by way of GenericCueData. This causes VTTCue to position the cue relative to the cue's center point, which is the same way AVFoundation represents the cue's position. * LayoutTests/media/content/test-inband-captions.mp4: Added. * LayoutTests/media/track/track-in-band-layout-expected.txt: Added. * LayoutTests/media/track/track-in-band-layout.html: Added. * Source/WebCore/html/track/InbandGenericTextTrack.cpp: (WebCore::InbandGenericTextTrack::updateCueFromCueData): * Source/WebCore/html/track/TextTrackCueGeneric.cpp: (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties): (WebCore::TextTrackCueGeneric::setBaseFontSizeRelativeToVideoHeight): (WebCore::TextTrackCueGeneric::setFontSizeMultiplier): (WebCore::TextTrackCueGeneric::setFontSize): Deleted. * Source/WebCore/html/track/TextTrackCueGeneric.h: * Source/WebCore/html/track/VTTCue.h: (WebCore::VTTCueBox::setFontSizeFromCaptionUserPrefs): Deleted. (WebCore::VTTCueBox::fontSizeFromCaptionUserPrefs const): Deleted. * Source/WebCore/platform/graphics/InbandGenericCue.cpp: (WebCore::InbandGenericCue::toJSONString const): * Source/WebCore/platform/graphics/InbandGenericCue.h: (WebCore::GenericCueData::GenericCueData): (WebCore::InbandGenericCue::positionAlign const): (WebCore::InbandGenericCue::setPositionAlign): * Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp: (WebCore::InbandTextTrackPrivateAVF::processAttributedStrings): * Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in: Canonical link: https://commits.webkit.org/271415@main Identifier: 267815.602@safari-7617.2.1.11-branch Commit: d1a5e462cdd8bf91c6af09afa3a7d871a9e62d91 https://github.com/WebKit/WebKit/commit/d1a5e462cdd8bf91c6af09afa3a7d871a9e62d91 Author: Myah Cobbs <mco...@apple.com> Date: 2023-12-06 (Wed, 06 Dec 2023) Changed paths: M Configurations/Version.xcconfig Log Message: ----------- Versioning. WebKit-7617.2.1.11.2 Identifier: 267815.603@safari-7617.2.1.11-branch Commit: 618b100bbd02cd9bc6e54948f4bb9d3fd45a0f68 https://github.com/WebKit/WebKit/commit/618b100bbd02cd9bc6e54948f4bb9d3fd45a0f68 Author: Myah Cobbs <mco...@apple.com> Date: 2023-12-07 (Thu, 07 Dec 2023) Changed paths: M Configurations/Version.xcconfig Log Message: ----------- Versioning. WebKit-7617.2.1.11.3 Identifier: 267815.604@safari-7617.2.1.11-branch Compare: https://github.com/WebKit/WebKit/compare/8986231244e9%5E...618b100bbd02 To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications _______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes