[webkit-changes] [WebKit/WebKit] 213d97: REGRESSION(260575 at main): Subtitles do not work whe...

[Jer Noble]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 213d9746a1a2cca3981c1fe8a27102bb6d8bad62
      https://github.com/WebKit/WebKit/commit/213d9746a1a2cca3981c1fe8a27102bb6d8bad62
  Author: Jer Noble <jer.noble at apple.com>
  Date:   2023-03-23 (Thu, 23 Mar 2023)

  Changed paths:
    M Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm
    M Source/WebCore/platform/cocoa/WebAVPlayerLayer.mm
    M Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm

  Log Message:
  -----------
  REGRESSION(260575 at main): Subtitles do not work when playing Apple Event video in full screen
https://bugs.webkit.org/show_bug.cgi?id=254229
rdar://106342886

Reviewed by Per Arne Vollan.

Add a further (partial) roll-out of 260575 at main by falling back to the previous
behavior in VideoFullscreenManager when the blockMediaLayerRehostingInWebContentProcess()
setting is disabled.

Drive-by fix: even after the partial roll-out, pinch zooming video content in fullscreen
is laid out incorrectly. Pass the correct frame down to the WebContent process in
-[WebAVPlayerLayer resolveBounds], and set the frame (rather than the bounds) of the
videoFullscreenLayer in VideoFullscreenModelVideoElement.

* Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm:
(WebCore::VideoFullscreenModelVideoElement::setVideoFullscreenLayer):
(WebCore::VideoFullscreenModelVideoElement::setVideoLayerFrame):
* Source/WebCore/platform/cocoa/WebAVPlayerLayer.mm:
(-[WebAVPlayerLayer resolveBounds]):
* Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm:
(WebKit::VideoFullscreenManager::enterVideoFullscreenForVideoElement):
(WebKit::VideoFullscreenManager::didExitFullscreen):
(WebKit::VideoFullscreenManager::didCleanupFullscreen):
(WebKit::VideoFullscreenManager::setVideoLayerFrameFenced):

Canonical link: https://commits.webkit.org/262024@main