Changeset 185726 in webkit

Timestamp:

Jun 18, 2015, 4:38:55 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Fix crash when entering fullscreen during exit fullscreen animation.
​https://bugs.webkit.org/show_bug.cgi?id=146117

Patch by Jeremy Jones <​jeremyj@apple.com> on 2015-06-18
Reviewed by Simon Fraser.

Source/WebCore:

Because enterFullscreen can be called during exitFullscreen animation, the exit fullscreen teardown
should not imply a fullscreen state change on video element.

• platform/ios/WebVideoFullscreenControllerAVKit.mm:

(WebVideoFullscreenControllerContext::exitFullscreen): May be called from mainThread
(-[WebVideoFullscreenController exitFullscreen]): May be called from mainThread

• platform/ios/WebVideoFullscreenModelVideoElement.mm:

(WebVideoFullscreenModelVideoElement::setVideoElement):
Changing associated video element does not imply fullscreen mode change.

Source/WebKit2:

A partial teardown left the LayerHostingContext in a bad state when attempting to reuse the model and interface
objects. Instead, complete the teardown and don't reuse the objects.

• WebProcess/ios/WebVideoFullscreenManager.mm:

(WebKit::WebVideoFullscreenManager::didEnterFullscreen): WebThreadRun is a no-op in WK2. Use dispatch_async.
(WebKit::WebVideoFullscreenManager::didCleanupFullscreen): Do complete teardown before entering fullscreen again.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (modified) (2 diffs)
• WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-18  Jeremy Jones  <jeremyj@apple.com>
+
+        Fix crash when entering fullscreen during exit fullscreen animation.
+        https://bugs.webkit.org/show_bug.cgi?id=146117
+
+        Reviewed by Simon Fraser.
+
+        Because enterFullscreen can be called during exitFullscreen animation, the exit fullscreen teardown
+        should not imply a fullscreen state change on video element.
+
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (WebVideoFullscreenControllerContext::exitFullscreen): May be called from mainThread
+        (-[WebVideoFullscreenController exitFullscreen]): May be called from mainThread
+        * platform/ios/WebVideoFullscreenModelVideoElement.mm:
+        (WebVideoFullscreenModelVideoElement::setVideoElement): 
+        Changing associated video element does not imply fullscreen mode change.
+
 2015-06-18  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm

@@ -530 +530 @@
 void WebVideoFullscreenControllerContext::exitFullscreen()
 {
-    ASSERT(WebThreadIsCurrent());
+    ASSERT(WebThreadIsCurrent() || isMainThread());
     IntRect screenRect = m_videoElement->screenRect();
     RefPtr<WebVideoFullscreenControllerContext> strongThis(this);
@@ -578 +578 @@
 - (void)exitFullscreen
 {
-    ASSERT(WebThreadIsCurrent());
+    ASSERT(WebThreadIsCurrent() || isMainThread());
     _context->exitFullscreen();
 }

trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelVideoElement.mm

@@ -83 +83 @@
         m_videoFullscreenInterface->resetMediaState();
 
-    if (m_videoElement && m_videoElement->fullscreenMode())
-        m_videoElement->fullscreenModeChanged(HTMLMediaElementEnums::VideoFullscreenModeNone);
-
     if (m_videoElement && m_videoElement->videoFullscreenLayer())
         m_videoElement->setVideoFullscreenLayer(nullptr);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-18  Jeremy Jones  <jeremyj@apple.com>
+
+        Fix crash when entering fullscreen during exit fullscreen animation.
+        https://bugs.webkit.org/show_bug.cgi?id=146117
+
+        Reviewed by Simon Fraser.
+
+        A partial teardown left the LayerHostingContext in a bad state when attempting to reuse the model and interface
+        objects. Instead, complete the teardown and don't reuse the objects.
+
+        * WebProcess/ios/WebVideoFullscreenManager.mm:
+        (WebKit::WebVideoFullscreenManager::didEnterFullscreen): WebThreadRun is a no-op in WK2. Use dispatch_async.
+        (WebKit::WebVideoFullscreenManager::didCleanupFullscreen): Do complete teardown before entering fullscreen again.
+
 2015-06-18  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm

@@ -450 +450 @@
     // exit fullscreen now if it was previously requested during an animation.
     RefPtr<WebVideoFullscreenManager> strongThis(this);
-    WebThreadRun([strongThis, videoElement] {
+    dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement] {
         strongThis->exitVideoFullscreenForVideoElement(*videoElement);
     });
@@ -483 +483 @@
     interface->setIsFullscreen(false);
     HTMLMediaElementEnums::VideoFullscreenMode mode = interface->fullscreenMode();
+    bool targetIsFullscreen = interface->targetIsFullscreen();
 
     model->setVideoFullscreenLayer(nil);
     RefPtr<HTMLVideoElement> videoElement = model->videoElement();
 
-    if (!interface->targetIsFullscreen()) {
-        model->setVideoElement(nullptr);
-        model->setWebVideoFullscreenInterface(nullptr);
-        interface->invalidate();
-        m_videoElements.remove(videoElement.get());
-        m_contextMap.remove(contextId);
+    model->setVideoElement(nullptr);
+    model->setWebVideoFullscreenInterface(nullptr);
+    interface->invalidate();
+    m_videoElements.remove(videoElement.get());
+    m_contextMap.remove(contextId);
+
+    if (!videoElement || !targetIsFullscreen)
         return;
-    }
-
-    if (!videoElement)
-        return;
-
-    // exit fullscreen now if it was previously requested during an animation.
+
     RefPtr<WebVideoFullscreenManager> strongThis(this);
-    WebThreadRun([strongThis, videoElement, mode] {
+    dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement, mode] {
         strongThis->enterVideoFullscreenForVideoElement(*videoElement, mode);
     });