Title: [269638] branches/safari-611.1.5-branch/Source/WebKit
Revision
269638
Author
[email protected]
Date
2020-11-10 11:38:28 -0800 (Tue, 10 Nov 2020)

Log Message

Cherry-pick r269610. rdar://problem/71247293

    REGRESSION (r269557): ASSERTION FAILED: Completion handler should always be called under WebCore::HTMLMediaElement::exitFullscreen
    https://bugs.webkit.org/show_bug.cgi?id=218722

    Reviewed by Eric Carlson.

    No new tests, covered by an existing test that is crashing on the bots.

    * WebProcess/cocoa/VideoFullscreenManager.mm:
    (WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269610 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611.1.5-branch/Source/WebKit/ChangeLog (269637 => 269638)


--- branches/safari-611.1.5-branch/Source/WebKit/ChangeLog	2020-11-10 19:34:00 UTC (rev 269637)
+++ branches/safari-611.1.5-branch/Source/WebKit/ChangeLog	2020-11-10 19:38:28 UTC (rev 269638)
@@ -1,3 +1,32 @@
+2020-11-10  Alan Coon  <[email protected]>
+
+        Cherry-pick r269610. rdar://problem/71247293
+
+    REGRESSION (r269557): ASSERTION FAILED: Completion handler should always be called under WebCore::HTMLMediaElement::exitFullscreen
+    https://bugs.webkit.org/show_bug.cgi?id=218722
+    
+    Reviewed by Eric Carlson.
+    
+    No new tests, covered by an existing test that is crashing on the bots.
+    
+    * WebProcess/cocoa/VideoFullscreenManager.mm:
+    (WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-11-09  Peng Liu  <[email protected]>
+
+            REGRESSION (r269557): ASSERTION FAILED: Completion handler should always be called under WebCore::HTMLMediaElement::exitFullscreen
+            https://bugs.webkit.org/show_bug.cgi?id=218722
+
+            Reviewed by Eric Carlson.
+
+            No new tests, covered by an existing test that is crashing on the bots.
+
+            * WebProcess/cocoa/VideoFullscreenManager.mm:
+            (WebKit::VideoFullscreenManager::exitVideoFullscreenForVideoElement):
+
 2020-11-09  Joonghun Park  <[email protected]>
 
         Unreviewed. Fix the build warning below since r269525.

Modified: branches/safari-611.1.5-branch/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm (269637 => 269638)


--- branches/safari-611.1.5-branch/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm	2020-11-10 19:34:00 UTC (rev 269637)
+++ branches/safari-611.1.5-branch/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.mm	2020-11-10 19:38:28 UTC (rev 269638)
@@ -300,8 +300,10 @@
 
     auto contextId = m_videoElements.get(&videoElement);
     auto& interface = ensureInterface(contextId);
-    if (interface.animationState() != VideoFullscreenInterfaceContext::AnimationType::None)
+    if (interface.animationState() != VideoFullscreenInterfaceContext::AnimationType::None) {
+        completionHandler(false);
         return;
+    }
 
     m_page->sendWithAsyncReply(Messages::VideoFullscreenManagerProxy::ExitFullscreen(contextId, inlineVideoFrame(videoElement)), [protectedThis = makeRefPtr(this), this, contextId, completionHandler = WTFMove(completionHandler)](auto success) mutable {
         if (!success) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to