Changeset 171292 in webkit

Timestamp:

Jul 20, 2014, 11:16:44 PM (11 years ago)

Author:

jeremyj-wk@apple.com

Message:

Unreviewed Fix test crashes when cloning video layer since r171286
​https://bugs.webkit.org/show_bug.cgi?id=135112

Unreviewed. Fix crashing tests by conditionalizing inline video layer change.
compositing/video/video-reflection.html [ Crash ]
media/video-layer-crash.html [ Crash ]

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: add conditional
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: ditto

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer): ditto
(WebCore::MediaPlayerPrivateAVFoundationObjC::destroyVideoLayer): ditto
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformLayer): ditto

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog ¶

@@ -21 +21 @@
         * platform/SharedBuffer.cpp:
         (WebCore::SharedBuffer::append):
+
+2014-07-20  Jeremy Jones  <jeremyj@apple.com>
+
+        Fix test crashes when cloning video layer since r171286
+        https://bugs.webkit.org/show_bug.cgi?id=135112
+
+        Unreviewed. Fix crashing tests by conditionalizing inline video layer change.
+        compositing/video/video-reflection.html [ Crash ]
+        media/video-layer-crash.html [ Crash ]
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h: add conditional
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm: ditto
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer): ditto
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::destroyVideoLayer): ditto
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformLayer): ditto
 
 2014-07-20  Jeremy Jones  <jeremyj@apple.com>

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h ¶

@@ -277 +277 @@
     RetainPtr<AVPlayerItem> m_avPlayerItem;
     RetainPtr<AVPlayerLayer> m_videoLayer;
+#if PLATFORM(IOS)
     RetainPtr<PlatformLayer> m_videoInlineLayer;
-#if PLATFORM(IOS)
     RetainPtr<PlatformLayer> m_videoFullscreenLayer;
     FloatRect m_videoFullscreenFrame;

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm ¶

@@ -587 +587 @@
     [m_videoLayer setPlayer:m_avPlayer.get()];
     [m_videoLayer setBackgroundColor:cachedCGColor(Color::black, ColorSpaceDeviceRGB)];
-    m_videoInlineLayer = adoptNS([[WebVideoContainerLayer alloc] init]);
 #ifndef NDEBUG
     [m_videoLayer setName:@"MediaPlayerPrivate AVPlayerLayer"];
@@ -594 +593 @@
     updateVideoLayerGravity();
     IntSize defaultSize = player()->mediaPlayerClient() ? player()->mediaPlayerClient()->mediaPlayerContentBoxRect().pixelSnappedSize() : IntSize();
+    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
+
+#if PLATFORM(IOS)
+    m_videoInlineLayer = adoptNS([[WebVideoContainerLayer alloc] init]);
     [m_videoInlineLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
-    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
-
-#if PLATFORM(IOS)
     if (m_videoFullscreenLayer) {
         [m_videoLayer setFrame:[m_videoFullscreenLayer bounds]];
         [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
-    } else
-#endif
-    {
+    } else {
         [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
         [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
     }
+#else
+    [m_videoLayer setFrame:CGRectMake(0, 0, defaultSize.width(), defaultSize.height())];
+#endif
 }
 
@@ -622 +623 @@
     if (m_videoFullscreenLayer)
         [m_videoLayer removeFromSuperlayer];
+    m_videoInlineLayer = nil;
 #endif
 
     m_videoLayer = nil;
-    m_videoInlineLayer = nil;
 }
 
@@ -956 +957 @@
 PlatformLayer* MediaPlayerPrivateAVFoundationObjC::platformLayer() const
 {
+#if PLATFORM(IOS)
     return m_haveBeenAskedToCreateLayer ? m_videoInlineLayer.get() : nullptr;
+#else
+    return m_haveBeenAskedToCreateLayer ? m_videoLayer.get() : nullptr;
+#endif
 }