Title: [174281] branches/safari-600.1.4.11-branch/Source/WebCore
- Revision
- 174281
- Author
- [email protected]
- Date
- 2014-10-03 13:20:20 -0700 (Fri, 03 Oct 2014)
Log Message
Merged r174277. <rdar://problem/18436044>
Modified Paths
Diff
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog (174280 => 174281)
--- branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-10-03 20:15:44 UTC (rev 174280)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/ChangeLog 2014-10-03 20:20:20 UTC (rev 174281)
@@ -1,5 +1,27 @@
2014-10-03 Babak Shafiei <[email protected]>
+ Merge r174277.
+
+ 2014-10-03 Jer Noble <[email protected]>
+
+ [iOS] Back-to-back fullscreen videos result in incorrectly sized videos
+ https://bugs.webkit.org/show_bug.cgi?id=137380
+
+ Reviewed by Eric Carlson.
+
+ During a normal workflow, a <video> element will create an AVPlayerLayer, then it will get a
+ fullscreen (hosted) parent layer, then it will be told an explicit fullscreen size. But when
+ a <video> element creates an AVPlayerLayer after the <video> element is already in
+ fullscreen mode, it sets that AVPlayerLayer's frame using the size of the hosted parent
+ layer, rather than the explicit fullscreen size. Instead, use the (already set) explicit
+ fullscreen size after creating the AVPlayerLayer.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::ensureAVPlayerLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::platformLayer):
+
+2014-10-03 Babak Shafiei <[email protected]>
+
Merge r174244.
2014-10-02 Pratik Solanki <[email protected]>
Modified: branches/safari-600.1.4.11-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (174280 => 174281)
--- branches/safari-600.1.4.11-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-03 20:15:44 UTC (rev 174280)
+++ branches/safari-600.1.4.11-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-10-03 20:20:20 UTC (rev 174281)
@@ -603,7 +603,7 @@
#if PLATFORM(IOS)
[m_videoLayer web_disableAllActions];
if (m_videoFullscreenLayer) {
- [m_videoLayer setFrame:[m_videoFullscreenLayer bounds]];
+ [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
[m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
} else
#endif
@@ -1004,7 +1004,7 @@
[CATransaction setDisableActions:YES];
if (m_videoFullscreenLayer && m_videoLayer) {
- [m_videoLayer setFrame:[m_videoFullscreenLayer bounds]];
+ [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
[m_videoLayer removeFromSuperlayer];
[m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
} else if (m_videoInlineLayer && m_videoLayer) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
