Changeset 187317 in webkit

Timestamp:

Jul 24, 2015, 12:54:25 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187203. rdar://problem/21012688

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187203. rdar://problem/21012688
+
+    2015-07-22  Dean Jackson  <dino@apple.com>
+
+            Video controls, though hidden, are still interactive when in PiP
+            https://bugs.webkit.org/show_bug.cgi?id=147216
+            <rdar://problem/21012688>
+
+            Reviewed by Simon Fraser.
+
+            Explicitly add the PiP class to the controls container so that
+            we can hang a pointer-events: none off it.
+
+            * Modules/mediacontrols/mediaControlsiOS.css:
+            (video::-webkit-media-controls-panel.picture-in-picture): Add a pointer-events: none.
+            * Modules/mediacontrols/mediaControlsiOS.js:
+            (ControllerIOS.prototype.handlePresentationModeChange): Add/remove a PiP class
+            to the controls panel when necessary.
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css

@@ -176 +176 @@
 }
 
+video::-webkit-media-controls-panel.picture-in-picture {
+    pointer-events: none;
+}
+
 video::-webkit-media-controls-rewind-button,
 audio::-webkit-media-controls-rewind-button,

branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -589 +589 @@
         switch (presentationMode) {
             case 'inline':
+                this.controls.panel.classList.remove(this.ClassNames.pictureInPicture);
                 this.controls.panelContainer.classList.remove(this.ClassNames.pictureInPicture);
                 this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
@@ -598 +599 @@
                 break;
             case 'picture-in-picture':
+                this.controls.panel.classList.add(this.ClassNames.pictureInPicture);
                 this.controls.panelContainer.classList.add(this.ClassNames.pictureInPicture);
                 this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.pictureInPicture);
@@ -610 +612 @@
                 break;
             default:
+                this.controls.panel.classList.remove(this.ClassNames.pictureInPicture);
                 this.controls.panelContainer.classList.remove(this.ClassNames.pictureInPicture);
                 this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.pictureInPicture);