Attachment 341355 Details for Bug 186005 – Patch

[patch] Patch

bug-186005-20180525164619.patch (text/plain), 3.26 KB, created by Eric Carlson on 2018-05-25 16:46:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-05-25 16:46:20 PDT

Size: 3.26 KB

patch

obsolete

>Subversion Revision: 232213
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 76b88fb84f572be121366671078937ae59572044..ae60ff5a57b6db92c3e217e2b00a17044a5bc209 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-05-25  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Captions are sized incorrectly in PiP mode
>+        https://bugs.webkit.org/show_bug.cgi?id=186005
>+        <rdar://problem/39729718>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * html/shadow/MediaControlElements.cpp:
>+        (WebCore::MediaControlTextTrackContainerElement::updateSizes): Only sync text track bounds 
>+        when the size actually changes.
>+
>+        * platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm:
>+        (WebCore::VideoFullscreenLayerManagerObjC::setVideoFullscreenFrame): Call syncTextTrackBounds.
>+        (WebCore::VideoFullscreenLayerManagerObjC::syncTextTrackBounds): Set the text track layer size
>+        to m_videoFullscreenFrame, it is always set the size of the PiP/Fullscreen layer.
>+
> 2018-05-25  Jeremy Jones  <jeremyj@apple.com>
> 
>         Fullscreen element can be clipped by ancestor.
>diff --git a/Source/WebCore/html/shadow/MediaControlElements.cpp b/Source/WebCore/html/shadow/MediaControlElements.cpp
>index 109321c0fffcc2dcb2539607508b1d2379a43716..c41025f58d6cdcb2ab9dea1099e75d58f393637b 100644
>--- a/Source/WebCore/html/shadow/MediaControlElements.cpp
>+++ b/Source/WebCore/html/shadow/MediaControlElements.cpp
>@@ -1382,8 +1382,6 @@ void MediaControlTextTrackContainerElement::updateSizes(bool forceUpdate)
>     if (!document().page())
>         return;
> 
>-    mediaElement->syncTextTrackBounds();
>-
>     IntRect videoBox;
>     if (m_textTrackRepresentation) {
>         videoBox = m_textTrackRepresentation->bounds();
>@@ -1401,6 +1399,7 @@ void MediaControlTextTrackContainerElement::updateSizes(bool forceUpdate)
> 
>     m_videoDisplaySize = videoBox;
>     m_updateTextTrackRepresentationStyle = true;
>+    mediaElement->syncTextTrackBounds();
> 
>     // FIXME (121170): This function is called during layout, and should lay out the text tracks immediately.
>     m_updateTimer.startOneShot(0_s);
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm
>index f9ff45da743ef2ecefcb96cd9a0639263fbbe7f3..1f71d4304ee6ad3417816e2f817aecce108f4b3b 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/VideoFullscreenLayerManagerObjC.mm
>@@ -144,6 +144,7 @@ void VideoFullscreenLayerManagerObjC::setVideoFullscreenFrame(FloatRect videoFul
>         return;
> 
>     [m_videoLayer setFrame:m_videoFullscreenFrame];
>+    syncTextTrackBounds();
> }
> 
> void VideoFullscreenLayerManagerObjC::didDestroyVideoLayer()
>@@ -167,8 +168,7 @@ void VideoFullscreenLayerManagerObjC::syncTextTrackBounds()
>     [CATransaction begin];
>     [CATransaction setDisableActions:YES];
> 
>-    CGRect textFrame = m_videoLayer ? m_videoInlineFrame : m_videoFullscreenFrame;
>-    [m_textTrackRepresentationLayer setFrame:textFrame];
>+    [m_textTrackRepresentationLayer setFrame:m_videoFullscreenFrame];
> 
>     [CATransaction commit];
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 186005: 341355