Changeset 164997 in webkit

Timestamp:

Mar 3, 2014 12:01:26 PM (10 years ago)

Author:

Simon Fraser

Message:

Crash when going into video fullscreen on iOS
​https://bugs.webkit.org/show_bug.cgi?id=129613

Reviewed by Dean Jackson.

We shouldn't reparent a UIView's layer without unparenting
the view first.

• UIProcess/ios/WebVideoFullscreenManagerProxy.mm:

(WebKit::WebVideoFullscreenManagerProxy::setVideoLayerID):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WebVideoFullscreenManagerProxy.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Crash when going into video fullscreen on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=129613
+
+        Reviewed by Dean Jackson.
+        
+        We shouldn't reparent a UIView's layer without unparenting
+        the view first.
+
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+        (WebKit::WebVideoFullscreenManagerProxy::setVideoLayerID):
+
 2014-03-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm

@@ -73 +73 @@
     RemoteLayerTreeDrawingAreaProxy* remoteDrawingAreaProxy = toRemoteLayerTreeDrawingAreaProxy(m_page->drawingArea());
 
-    UIView *videoView = remoteDrawingAreaProxy->remoteLayerTreeHost().getLayer(videoLayerID);
-    setVideoLayer(videoView.layer);
+    if (videoLayerID) {
+        // Entering fullscreen.
+        UIView *videoView = remoteDrawingAreaProxy->remoteLayerTreeHost().getLayer(videoLayerID);
+        // Remove the UIView from its superlayer, so we can reparent the layer without problems.
+        [videoView removeFromSuperview];
+        
+        setVideoLayer(videoView.layer);
+    } else
+        setVideoLayer(nil);
     
     m_videoLayerID = videoLayerID;