Title: [201569] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 201569
- Author
- [email protected]
- Date
- 2016-06-01 14:31:46 -0700 (Wed, 01 Jun 2016)
Log Message
Merge r201567. rdar://problem/25388848
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201568 => 201569)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-06-01 21:27:04 UTC (rev 201568)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-06-01 21:31:46 UTC (rev 201569)
@@ -1,3 +1,20 @@
+2016-06-01 Babak Shafiei <[email protected]>
+
+ Merge r201567. rdar://problem/25388848
+
+ 2016-06-01 Jer Noble <[email protected]>
+
+ 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 <[email protected]>
Merge r201474. rdar://problem/24476949
Modified: branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (201568 => 201569)
--- branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-01 21:27:04 UTC (rev 201568)
+++ branches/safari-602.1.32-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2016-06-01 21:31:46 UTC (rev 201569)
@@ -1219,7 +1219,9 @@
void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenGravity(MediaPlayer::VideoGravity gravity)
{
m_videoFullscreenGravity = gravity;
- if (!m_videoLayer)
+
+ auto activeLayer = m_secondaryVideoLayer.get() ?: m_videoLayer.get();
+ if (!activeLayer)
return;
NSString *videoGravity = AVLayerVideoGravityResizeAspect;
@@ -1232,10 +1234,10 @@
else
ASSERT_NOT_REACHED();
- if ([m_videoLayer videoGravity] == videoGravity)
+ if ([activeLayer videoGravity] == videoGravity)
return;
- [m_videoLayer setVideoGravity:videoGravity];
+ [activeLayer setVideoGravity:videoGravity];
syncTextTrackBounds();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
