Branch: refs/heads/safari-7617.2.1.10-branch
Home: https://github.com/WebKit/WebKit
Commit: 5e62d504367c3cb6d07a8c394ecc28cc17666a85
https://github.com/WebKit/WebKit/commit/5e62d504367c3cb6d07a8c394ecc28cc17666a85
Author: Myah Cobbs <[email protected]>
Date: 2023-12-04 (Mon, 04 Dec 2023)
Changed paths:
M Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7617.2.1.10.1
Identifier: [email protected]
Commit: 56fa3a19d532d73e9fb00c4761f8747c65dbbc66
https://github.com/WebKit/WebKit/commit/56fa3a19d532d73e9fb00c4761f8747c65dbbc66
Author: Myah Cobbs <[email protected]>
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: [email protected]
Commit: dbcc506e57c89e133e02dfa713e4c532971c9929
https://github.com/WebKit/WebKit/commit/dbcc506e57c89e133e02dfa713e4c532971c9929
Author: Myah Cobbs <[email protected]>
Date: 2023-12-06 (Wed, 06 Dec 2023)
Changed paths:
M Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7617.2.1.10.2
Identifier: [email protected]
Commit: 37ca3b3d13f866a753163b3c3154f352c56bf8e5
https://github.com/WebKit/WebKit/commit/37ca3b3d13f866a753163b3c3154f352c56bf8e5
Author: Myah Cobbs <[email protected]>
Date: 2023-12-07 (Thu, 07 Dec 2023)
Changed paths:
M Configurations/Version.xcconfig
Log Message:
-----------
Versioning.
WebKit-7617.2.1.10.3
Identifier: [email protected]
Compare: https://github.com/WebKit/WebKit/compare/5e62d504367c%5E...37ca3b3d13f8
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
