Changeset 201569 in webkit

Timestamp:

Jun 1, 2016, 2:31:46 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merge r201567. rdar://problem/25388848

Location:

branches/safari-602.1.32-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (2 diffs)

branches/safari-602.1.32-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-01  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r201567. rdar://problem/25388848
+
+    2016-06-01  Jer Noble  <jer.noble@apple.com>
+
+            setVideoFullscreenGravity() has no effect on the fullscreen video layer
+            https://bugs.webkit.org/show_bug.cgi?id=158267
+
+            Reviewed by Eric Carlson.
+
+            When we moved to a 2-AVPlayerLayer solution, we didn't update setVideoFullscreenGravity()
+            to change the correct layer's videoGravity property.
+
+            * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+            (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenGravity):
+
 2016-05-31  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -1220 +1220 @@
 {
     m_videoFullscreenGravity = gravity;
-    if (!m_videoLayer)
+
+    auto activeLayer = m_secondaryVideoLayer.get() ?: m_videoLayer.get();
+    if (!activeLayer)
         return;
 
@@ -1233 +1235 @@
         ASSERT_NOT_REACHED();
     
-    if ([m_videoLayer videoGravity] == videoGravity)
-        return;
-
-    [m_videoLayer setVideoGravity:videoGravity];
+    if ([activeLayer videoGravity] == videoGravity)
+        return;
+
+    [activeLayer setVideoGravity:videoGravity];
     syncTextTrackBounds();
 }