Changeset 252240 in webkit

Timestamp:

Nov 8, 2019 10:06:43 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Picture-in-Picture events are not fired when enter/exit the Picture-in-Picture mode through modern media controls
​https://bugs.webkit.org/show_bug.cgi?id=203933

Patch by Peng Liu <Peng Liu> on 2019-11-08
Reviewed by Eric Carlson.

Covered by existing layout test cases. No new test is required.

• Modules/modern-media-controls/media/pip-support.js:

(PiPSupport.prototype.buttonWasPressed):

• Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp:

(WebCore::HTMLVideoElementPictureInPicture::didEnterPictureInPicture):
(WebCore::HTMLVideoElementPictureInPicture::didExitPictureInPicture):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/modern-media-controls/media/pip-support.js (modified) (1 diff)
• Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-08  Peng Liu  <peng.liu6@apple.com>
+
+        Picture-in-Picture events are not fired when enter/exit the Picture-in-Picture mode through modern media controls
+        https://bugs.webkit.org/show_bug.cgi?id=203933
+
+        Reviewed by Eric Carlson.
+
+        Covered by existing layout test cases. No new test is required.
+
+        * Modules/modern-media-controls/media/pip-support.js:
+        (PiPSupport.prototype.buttonWasPressed):
+        * Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp:
+        (WebCore::HTMLVideoElementPictureInPicture::didEnterPictureInPicture):
+        (WebCore::HTMLVideoElementPictureInPicture::didExitPictureInPicture):
+
 2019-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/Modules/modern-media-controls/media/pip-support.js

@@ -50 +50 @@
     {
         const media = this.mediaController.media;
-        media.webkitSetPresentationMode(media.webkitPresentationMode === PiPMode ? InlineMode : PiPMode);
+        if (!document.pictureInPictureElement)
+            media.requestPictureInPicture();
+        else
+            document.exitPictureInPicture();
     }
 

trunk/Source/WebCore/Modules/pictureinpicture/HTMLVideoElementPictureInPicture.cpp

@@ -153 +153 @@
     m_pictureInPictureWindow->setSize(windowSize);
 
+    EnterPictureInPictureEvent::Init initializer;
+    initializer.bubbles = true;
+    initializer.pictureInPictureWindow = m_pictureInPictureWindow;
+    m_videoElement.scheduleEvent(EnterPictureInPictureEvent::create(eventNames().enterpictureinpictureEvent, WTFMove(initializer)));
+
     if (m_enterPictureInPicturePromise) {
-        EnterPictureInPictureEvent::Init initializer;
-        initializer.bubbles = true;
-        initializer.pictureInPictureWindow = m_pictureInPictureWindow;
-        m_videoElement.scheduleEvent(EnterPictureInPictureEvent::create(eventNames().enterpictureinpictureEvent, WTFMove(initializer)));
         m_enterPictureInPicturePromise->resolve<IDLInterface<PictureInPictureWindow>>(*m_pictureInPictureWindow);
         m_enterPictureInPicturePromise = nullptr;
@@ -168 +169 @@
     m_pictureInPictureWindow->close();
     m_videoElement.document().setPictureInPictureElement(nullptr);
+    m_videoElement.scheduleEvent(Event::create(eventNames().leavepictureinpictureEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
 
     if (m_exitPictureInPicturePromise) {
-        m_videoElement.scheduleEvent(Event::create(eventNames().leavepictureinpictureEvent, Event::CanBubble::Yes, Event::IsCancelable::No));
         m_exitPictureInPicturePromise->resolve();
         m_exitPictureInPicturePromise = nullptr;