Changeset 209156 in webkit

Timestamp:

Nov 30, 2016 2:45:38 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[Modern Media Controls] Controls are not visible when returning from picture-in-picture playback
​https://bugs.webkit.org/show_bug.cgi?id=165183

Patch by Antoine Quint <Antoine Quint> on 2016-11-30
Reviewed by Dean Jackson.

We need to call MediaControlsHost::setPreparedToReturnVideoLayerToInline() when we return from
picture-in-picture playback such that the video layer is correctly stacked under the media controls.
We call that function in a rAF call to ensure it's performed in sync with the next scheduled layout
or the media controls would not appear in sync with the video layer.

We also fix an error from a previous commit in ControlsVisibilitySupport.

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

(ControlsVisibilitySupport.prototype.syncControl):
(ControlsVisibilitySupport):

• Modules/modern-media-controls/media/media-controller.js:

(MediaController):
(MediaController.prototype.handleEvent):
(MediaController.prototype._returnMediaLayerToInlineIfNeeded):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/modern-media-controls/media/controls-visibility-support.js (modified) (1 diff)
• Modules/modern-media-controls/media/media-controller.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-30  Antoine Quint  <graouts@apple.com>
+
+        [Modern Media Controls] Controls are not visible when returning from picture-in-picture playback
+        https://bugs.webkit.org/show_bug.cgi?id=165183
+
+        Reviewed by Dean Jackson.
+
+        We need to call MediaControlsHost::setPreparedToReturnVideoLayerToInline() when we return from
+        picture-in-picture playback such that the video layer is correctly stacked under the media controls.
+        We call that function in a rAF call to ensure it's performed in sync with the next scheduled layout
+        or the media controls would not appear in sync with the video layer.
+
+        We also fix an error from a previous commit in ControlsVisibilitySupport.
+
+        * Modules/modern-media-controls/media/controls-visibility-support.js:
+        (ControlsVisibilitySupport.prototype.syncControl):
+        (ControlsVisibilitySupport):
+        * Modules/modern-media-controls/media/media-controller.js:
+        (MediaController):
+        (MediaController.prototype.handleEvent):
+        (MediaController.prototype._returnMediaLayerToInlineIfNeeded):
+
 2016-11-30  Jiewen Tan  <jiewen_tan@apple.com>
 

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

@@ -50 +50 @@
     {
         let shouldShowControls = this.mediaController.media.controls;
-        if (media instanceof HTMLVideoElement)
+        if (this.mediaController.media instanceof HTMLVideoElement)
             shouldShowControls = shouldShowControls && this.mediaController.media.readyState > HTMLMediaElement.HAVE_NOTHING;
 

trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js

@@ -33 +33 @@
         this.host = host;
 
+        if (host)
+            media.addEventListener("webkitpresentationmodechanged", this);
+
         this._updateControlsIfNeeded();
 
@@ -62 +65 @@
     handleEvent(event)
     {
-        if (event.type === "resize" && event.currentTarget === this.media)
+        if (event.currentTarget !== this.media)
+            return;
+
+        switch (event.type) {
+        case "resize":
             this._updateControlsSize();
-        else if (event.type === "webkitfullscreenchange" && event.currentTarget === this.media)
+            break;
+        case "webkitfullscreenchange":
             this._updateControlsIfNeeded();
+            break;
+        case "webkitpresentationmodechanged":
+            this._returnMediaLayerToInlineIfNeeded();
+            break;
+        }
     }
 
@@ -104 +117 @@
     }
 
+    _returnMediaLayerToInlineIfNeeded()
+    {
+        window.requestAnimationFrame(() => this.host.setPreparedToReturnVideoLayerToInline(this.media.webkitPresentationMode !== PiPMode));
+    }
+
     _controlsClass()
     {