Changeset 249141 in webkit

Timestamp:

Aug 27, 2019, 8:23:46 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

webkitpresentationmodechanged is fired twice when exiting picture in picture
​https://bugs.webkit.org/show_bug.cgi?id=193765

Patch by Peng Liu <Peng Liu> on 2019-08-27
Reviewed by Jer Noble.

Source/WebCore:

This patch removes the extra "webkitpresentationmodechanged" event when the browser switches from
picture-in-picture or fullscreen to inline.

The bug was introduced by the fix for bug
​https://bugs.webkit.org/show_bug.cgi?id=181095
But now we are using modern media controls and the fix is not necessary.
Reverting that fix can fix the issue.

Also, this patch gets rid of the unnecessary try to call a JavaScript function which is not available
in the modern media controls.

Test: media/presentationmodechanged-fired-once.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::exitFullscreen):
(WebCore::HTMLMediaElement::updateMediaControlsAfterPresentationModeChange):

LayoutTests:

• media/presentationmodechanged-fired-once-expected.txt: Added.
• media/presentationmodechanged-fired-once.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/presentationmodechanged-fired-once-expected.txt (added)
• LayoutTests/media/presentationmodechanged-fired-once.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-27  Peng Liu  <peng.liu6@apple.com>
+
+        webkitpresentationmodechanged is fired twice when exiting picture in picture
+        https://bugs.webkit.org/show_bug.cgi?id=193765
+
+        Reviewed by Jer Noble.
+
+        * media/presentationmodechanged-fired-once-expected.txt: Added.
+        * media/presentationmodechanged-fired-once.html: Added.
+
 2019-08-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Peng Liu  <peng.liu6@apple.com>
+
+        webkitpresentationmodechanged is fired twice when exiting picture in picture
+        https://bugs.webkit.org/show_bug.cgi?id=193765
+
+        Reviewed by Jer Noble.
+
+        This patch removes the extra "webkitpresentationmodechanged" event when the browser switches from
+        picture-in-picture or fullscreen to inline.
+
+        The bug was introduced by the fix for bug
+        https://bugs.webkit.org/show_bug.cgi?id=181095
+        But now we are using modern media controls and the fix is not necessary.
+        Reverting that fix can fix the issue.
+
+        Also, this patch gets rid of the unnecessary try to call a JavaScript function which is not available
+        in the modern media controls.
+
+        Test: media/presentationmodechanged-fired-once.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::exitFullscreen):
+        (WebCore::HTMLMediaElement::updateMediaControlsAfterPresentationModeChange):
+
 2019-08-27  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6122 +6122 @@
             document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
         scheduleEvent(eventNames().webkitendfullscreenEvent);
-        scheduleEvent(eventNames().webkitpresentationmodechangedEvent);
     }
 }
@@ -7434 +7433 @@
     // stopped/suspended the object.
     if (!m_mediaControlsHost || document().activeDOMObjectsAreSuspended() || document().activeDOMObjectsAreStopped())
+        return;
+
+    if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
         return;