Title: [187317] branches/safari-601.1-branch/Source/WebCore
- Revision
- 187317
- Author
- [email protected]
- Date
- 2015-07-24 00:54:25 -0700 (Fri, 24 Jul 2015)
Log Message
Merge r187203. rdar://problem/21012688
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187316 => 187317)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:22 UTC (rev 187316)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-24 07:54:25 UTC (rev 187317)
@@ -1,5 +1,26 @@
2015-07-24 Matthew Hanson <[email protected]>
+ Merge r187203. rdar://problem/21012688
+
+ 2015-07-22 Dean Jackson <[email protected]>
+
+ 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 <[email protected]>
+
Merge r187189. rdar://problem/21567767
2015-07-22 Dean Jackson <[email protected]>
Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (187316 => 187317)
--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-24 07:54:22 UTC (rev 187316)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-07-24 07:54:25 UTC (rev 187317)
@@ -175,6 +175,10 @@
opacity: 1;
}
+video::-webkit-media-controls-panel.picture-in-picture {
+ pointer-events: none;
+}
+
video::-webkit-media-controls-rewind-button,
audio::-webkit-media-controls-rewind-button,
video::-webkit-media-controls-panel .mute-box,
Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (187316 => 187317)
--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-24 07:54:22 UTC (rev 187316)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-07-24 07:54:25 UTC (rev 187317)
@@ -588,6 +588,7 @@
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);
this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.pictureInPicture);
@@ -597,6 +598,7 @@
this.controls.pictureInPictureButton.classList.remove(this.ClassNames.returnFromPictureInPicture);
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);
this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.hidden);
@@ -609,6 +611,7 @@
this.controls.pictureInPictureButton.classList.add(this.ClassNames.returnFromPictureInPicture);
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);
this.controls.inlinePlaybackPlaceholderTextTop.classList.remove(this.ClassNames.pictureInPicture);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
