Changeset 185397 in webkit

Timestamp:

Jun 9, 2015, 5:53:13 PM (11 years ago)

Author:

dino@apple.com

Message:

MediaControls: Reenable resize of controls on pinch zoom
​https://bugs.webkit.org/show_bug.cgi?id=145824
<rdar://problem/21212778>

Reviewed by Darin Adler.

Reinstate the code that updated the scaling of the
controls in response to changes in page scale.
This time around we have to change both the controls
panel, and its blurry background.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.set pageScaleFactor): Deleted a comment.

• Modules/mediacontrols/mediaControlsiOS.css:

(video::-webkit-media-controls-panel-background): Set the background to pin
to the bottom of its view.

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype.get pageScaleFactor): Basic getter, copied from mediaControlsApple.
(ControllerIOS.prototype.set pageScaleFactor): The setter that reacts to the page scale
and applies an inverse scaling on the control panel using a transform, and adjusts the
height on the background similarly.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/mediaControlsApple.js (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.css (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-09  Dean Jackson  <dino@apple.com>
+
+        MediaControls: Reenable resize of controls on pinch zoom
+        https://bugs.webkit.org/show_bug.cgi?id=145824
+        <rdar://problem/21212778>
+
+        Reviewed by Darin Adler.
+
+        Reinstate the code that updated the scaling of the
+        controls in response to changes in page scale.
+        This time around we have to change both the controls
+        panel, and its blurry background.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.set pageScaleFactor): Deleted a comment.
+        * Modules/mediacontrols/mediaControlsiOS.css:
+        (video::-webkit-media-controls-panel-background): Set the background to pin
+        to the bottom of its view.
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype.get pageScaleFactor): Basic getter, copied from mediaControlsApple.
+        (ControllerIOS.prototype.set pageScaleFactor): The setter that reacts to the page scale
+        and applies an inverse scaling on the control panel using a transform, and adjusts the
+        height on the background similarly.
+
 2015-06-09  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

@@ -2035 +2035 @@
 
         this._pageScaleFactor = newScaleFactor;
-
-        // FIXME: this should react to the scale change by
-        // unscaling the controls panel. However, this
-        // hits a bug with the backdrop blur layer getting
-        // too big and moving to a tiled layer.
-        // https://bugs.webkit.org/show_bug.cgi?id=142317
     },
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css

@@ -121 +121 @@
     opacity: 0;
     pointer-events: none;
+    bottom: 0;
+    position: absolute;
 }
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -25 +25 @@
 /* Enums */
 ControllerIOS.StartPlaybackControls = 2;
-
 
 ControllerIOS.prototype = {
@@ -618 +617 @@
     },
 
+    get pageScaleFactor()
+    {
+        return this._pageScaleFactor;
+    },
+
+    set pageScaleFactor(newScaleFactor)
+    {
+        if (!newScaleFactor || this._pageScaleFactor === newScaleFactor)
+            return;
+
+        this._pageScaleFactor = newScaleFactor;
+
+        var scaleValue = 1 / newScaleFactor;
+        var scaleTransform = "scale(" + scaleValue + ")";
+        if (this.controls.startPlaybackButton)
+            this.controls.startPlaybackButton.style.webkitTransform = scaleTransform;
+        if (this.controls.panel) {
+            var bottomAligment = -2 * scaleValue;
+            this.controls.panel.style.bottom = bottomAligment + "px";
+            this.controls.panel.style.paddingBottom = -(newScaleFactor * bottomAligment) + "px";
+            this.controls.panel.style.width = Math.round(newScaleFactor * 100) + "%";
+            this.controls.panel.style.webkitTransform = scaleTransform;
+
+            this.controls.panelBackground.style.height = (50 * scaleValue) + "px";
+
+            this.setNeedsTimelineMetricsUpdate();
+            this.updateProgress();
+            this.scheduleUpdateLayoutForDisplayedWidth();
+        }
+    },
 
 };