[webkit-changes] [WebKit/WebKit] cb29b3: Versioning.

[Jonathan Bedard]

  Branch: refs/heads/safari-7617.1.17.10-branch
  Home:   https://github.com/WebKit/WebKit
  Commit: cb29b347f62c4934ee689d4630885ef9ca317f64
      https://github.com/WebKit/WebKit/commit/cb29b347f62c4934ee689d4630885ef9ca317f64
  Author: Russell Epstein <repstein at apple.com>
  Date:   2023-12-01 (Fri, 01 Dec 2023)

  Changed paths:
    M Configurations/Version.xcconfig

  Log Message:
  -----------
  Versioning.

WebKit-7617.1.17.10.9

Canonical link: https://commits.webkit.org/267815.580@safari-7617.1.17.10-branch


  Commit: 3449c3dbe5f2a5c5c50361157aafe22e6a8458f0
      https://github.com/WebKit/WebKit/commit/3449c3dbe5f2a5c5c50361157aafe22e6a8458f0
  Author: Russell Epstein <repstein at apple.com>
  Date:   2023-12-01 (Fri, 01 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://119024855

    REGRESSION(265596 at 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

Canonical link: https://commits.webkit.org/267815.581@safari-7617.1.17.10-branch


  Commit: aeb93dacafa90789c779bada705a3b9a8713374b
      https://github.com/WebKit/WebKit/commit/aeb93dacafa90789c779bada705a3b9a8713374b
  Author: Dan Robson <dtr_bugzilla at apple.com>
  Date:   2023-12-14 (Thu, 14 Dec 2023)

  Changed paths:
    M Configurations/Version.xcconfig

  Log Message:
  -----------
  Versioning.

WebKit-617.1.17.10.10

Identifier: 267815.582 at safari-7617.1.17.10-branch


Compare: https://github.com/WebKit/WebKit/compare/038e3ac23c11...aeb93dacafa9