Title: [201691] trunk/Source/WebCore
- Revision
- 201691
- Author
- [email protected]
- Date
- 2016-06-04 17:36:55 -0700 (Sat, 04 Jun 2016)
Log Message
REGRESSION (r201474): Should set overflow: hidden on -webkit-media-controls when placeholder is showing
https://bugs.webkit.org/show_bug.cgi?id=158377
Reviewed by Darin Adler.
In r201474, we defer removing the hidden class from inlinePlaybackPlaceholder until
showInlinePlaybackPlaceholderWhenSafe(). We also need to move the code that adds the
placeholder-showing class to -webkit-media-controls to that method.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.showInlinePlaybackPlaceholderWhenSafe):
Add the "placeholder-showing" class to -webkit-media-controls when we show the placeholder.
(Controller.prototype.handlePresentationModeChange):
Remove the "placeholder-showing" class from -webkit-media-controls when we hide the
placeholder. Remove the old code that adds and removes that class.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (201690 => 201691)
--- trunk/Source/WebCore/ChangeLog 2016-06-04 23:02:48 UTC (rev 201690)
+++ trunk/Source/WebCore/ChangeLog 2016-06-05 00:36:55 UTC (rev 201691)
@@ -1,3 +1,21 @@
+2016-06-03 Ada Chan <[email protected]>
+
+ REGRESSION (r201474): Should set overflow: hidden on -webkit-media-controls when placeholder is showing
+ https://bugs.webkit.org/show_bug.cgi?id=158377
+
+ Reviewed by Darin Adler.
+
+ In r201474, we defer removing the hidden class from inlinePlaybackPlaceholder until
+ showInlinePlaybackPlaceholderWhenSafe(). We also need to move the code that adds the
+ placeholder-showing class to -webkit-media-controls to that method.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.showInlinePlaybackPlaceholderWhenSafe):
+ Add the "placeholder-showing" class to -webkit-media-controls when we show the placeholder.
+ (Controller.prototype.handlePresentationModeChange):
+ Remove the "placeholder-showing" class from -webkit-media-controls when we hide the
+ placeholder. Remove the old code that adds and removes that class.
+
2016-06-04 Darin Adler <[email protected]>
leaks seen in fast/css/variables tests
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (201690 => 201691)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-06-04 23:02:48 UTC (rev 201690)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-06-05 00:36:55 UTC (rev 201691)
@@ -842,9 +842,10 @@
if (this.presentationMode() != 'picture-in-picture')
return;
- if (!this.host.isVideoLayerInline)
+ if (!this.host.isVideoLayerInline) {
this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.hidden);
- else
+ this.base.classList.add(this.ClassNames.placeholderShowing);
+ } else
setTimeout(this.showInlinePlaybackPlaceholderWhenSafe.bind(this), this.PlaceholderPollingDelay);
},
@@ -859,6 +860,7 @@
this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.pictureInPicture);
this.controls.inlinePlaybackPlaceholderTextTop.classList.remove(this.ClassNames.pictureInPicture);
this.controls.inlinePlaybackPlaceholderTextBottom.classList.remove(this.ClassNames.pictureInPicture);
+ this.base.classList.remove(this.ClassNames.placeholderShowing);
this.controls.pictureInPictureButton.classList.remove(this.ClassNames.returnFromPictureInPicture);
break;
@@ -884,11 +886,6 @@
break;
}
- if (this.controls.inlinePlaybackPlaceholder.classList.contains(this.ClassNames.hidden))
- this.base.classList.remove(this.ClassNames.placeholderShowing);
- else
- this.base.classList.add(this.ClassNames.placeholderShowing);
-
this.updateControls();
this.updateCaptionContainer();
this.resetHideControlsTimer();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
