Changeset 226872 in webkit

Timestamp:

Jan 11, 2018 10:31:07 PM (6 years ago)

Author:

jmarcell@apple.com

Message:

Cherry-pick r226796. rdar://problem/36450730

Location:

branches/safari-605-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt (added)
• LayoutTests/media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/media-controls.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/media/airplay-support.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/media/media-controller.js (modified) (2 diffs)

branches/safari-605-branch/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-11  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r226796. rdar://problem/36450730
+
+    2018-01-11  Antoine Quint  <graouts@apple.com>
+
+            Only listen to webkitplaybacktargetavailabilitychanged when media controls are visible to the user
+            https://bugs.webkit.org/show_bug.cgi?id=181547
+            <rdar://problem/35947650>
+
+            Reviewed by Eric Carlson.
+
+            Add a test that checks that enabling AirPlay routes when the controls are not visible to the user
+            does not incur any change, and that making the controls visible again shows the controls in the
+            expected state.
+
+            * media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls-expected.txt: Added.
+            * media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html: Added.
+
 2018-01-11  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-11  Jason Marcell  <jmarcell@apple.com>
+
+        Cherry-pick r226796. rdar://problem/36450730
+
+    2018-01-11  Antoine Quint  <graouts@apple.com>
+
+            Only listen to webkitplaybacktargetavailabilitychanged when media controls are visible to the user
+            https://bugs.webkit.org/show_bug.cgi?id=181547
+            <rdar://problem/35947650>
+
+            Reviewed by Eric Carlson.
+
+            Because listening to "webkitplaybacktargetavailabilitychanged" events incurs some higher power usage on iOS,
+            we only listen to such events when controls are visible to the user. In other words, the MediaControls need to
+            have both "visible" set to "true" and "faded" set to "false". To support this, we add a delegate method on
+            MediaControls such that it can tell the MediaController that the "visible" property changed. With this message,
+            MediaController can inform its MediaControllerSupport objects that user visibility of the controls changed, which
+            lets AirplaySupport disable itself when controls are no longer visible.
+
+            Test: media/modern-media-controls/airplay-support/airplay-support-disable-event-listeners-with-hidden-controls.html
+
+            * Modules/modern-media-controls/controls/media-controls.js:
+            (MediaControls.prototype.set visible):
+            * Modules/modern-media-controls/media/airplay-support.js:
+            (AirplaySupport.prototype.controlsUserVisibilityDidChange):
+            * Modules/modern-media-controls/media/media-controller-support.js:
+            (MediaControllerSupport.prototype.controlsUserVisibilityDidChange):
+            * Modules/modern-media-controls/media/media-controller.js:
+            (MediaController.prototype.mediaControlsVisibilityDidChange):
+            (MediaController.prototype.mediaControlsFadedStateDidChange):
+            (MediaController.prototype._controlsUserVisibilityDidChange):
+
 2018-01-11  Jason Marcell  <jmarcell@apple.com>
 

branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/controls/media-controls.js

@@ -87 +87 @@
         if (flag)
             this.layout();
+
+        if (this.delegate && typeof this.delegate.mediaControlsVisibilityDidChange === "function")
+            this.delegate.mediaControlsVisibilityDidChange();
     }
 

branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/airplay-support.js

@@ -44 +44 @@
     }
 
+    controlsUserVisibilityDidChange()
+    {
+        const controls = this.mediaController.controls;
+        if (controls.visible && !controls.faded)
+            this.enable();
+        else
+            this.disable();
+    }
+
     handleEvent(event)
     {

branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/media-controller-support.js

@@ -91 +91 @@
     }
 
+    controlsUserVisibilityDidChange()
+    {
+        // Implement by subclasses.
+    }
+
     handleEvent(event)
     {

branches/safari-605-branch/Source/WebCore/Modules/modern-media-controls/media/media-controller.js

@@ -125 +125 @@
     }
 
+    mediaControlsVisibilityDidChange()
+    {
+        this._controlsUserVisibilityDidChange();
+    }
+
     mediaControlsFadedStateDidChange()
     {
+        this._controlsUserVisibilityDidChange();
         this._updateTextTracksClassList();
     }
@@ -287 +293 @@
     }
 
+    _controlsUserVisibilityDidChange()
+    {
+        if (!this.controls || !this._supportingObjects)
+            return;
+
+        this._supportingObjects.forEach(supportingObject => supportingObject.controlsUserVisibilityDidChange());
+    }
+
     _updateiOSFullscreenProperties()
     {