Pausing should clear m_waitingToEnterFullscreen
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Apr 2018 19:01:52 +0000 (19:01 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Apr 2018 19:01:52 +0000 (19:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=184831
<rdar://problem/39602852>

Reviewed by Jer Noble.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::pause): Clear m_waitingToEnterFullscreen

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

Source/WebCore/ChangeLog
Source/WebCore/html/HTMLMediaElement.cpp

index 236b8a6..b24ee02 100644 (file)
@@ -1,5 +1,16 @@
 2018-04-20  Eric Carlson  <eric.carlson@apple.com>
 
+        Pausing should clear m_waitingToEnterFullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=184831
+        <rdar://problem/39602852>
+
+        Reviewed by Jer Noble.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::pause): Clear m_waitingToEnterFullscreen
+
+2018-04-20  Eric Carlson  <eric.carlson@apple.com>
+
         [Extra zoom mode] Disable CA transactions while setting up for fullscreen
         https://bugs.webkit.org/show_bug.cgi?id=184817
         <rdar://problem/39596075>
index 8aa0f03..8e2d554 100644 (file)
@@ -3522,6 +3522,9 @@ void HTMLMediaElement::pause()
 
     m_temporarilyAllowingInlinePlaybackAfterFullscreen = false;
 
+    if (m_waitingToEnterFullscreen)
+        m_waitingToEnterFullscreen = false;
+
     if (!m_mediaSession->playbackPermitted(*this))
         return;