Title: [183115] trunk/Source/WebCore
- Revision
- 183115
- Author
- [email protected]
- Date
- 2015-04-22 11:33:10 -0700 (Wed, 22 Apr 2015)
Log Message
Rollout part of r182263 that broke inline media controls on iOS.
<rdar://problem/20654260>
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handlePanelTransitionEnd):
(Controller.prototype.setPlaying):
(Controller.prototype.showControls):
(Controller.prototype.hideControls):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183114 => 183115)
--- trunk/Source/WebCore/ChangeLog 2015-04-22 17:41:34 UTC (rev 183114)
+++ trunk/Source/WebCore/ChangeLog 2015-04-22 18:33:10 UTC (rev 183115)
@@ -1,3 +1,14 @@
+2015-04-22 Roger Fong <[email protected]>
+
+ Rollout part of r182263 that broke inline media controls on iOS.
+ <rdar://problem/20654260>
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handlePanelTransitionEnd):
+ (Controller.prototype.setPlaying):
+ (Controller.prototype.showControls):
+ (Controller.prototype.hideControls):
+
2015-04-22 Eric Carlson <[email protected]>
Unreviewed post-review clean up after r183096.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (183114 => 183115)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-22 17:41:34 UTC (rev 183114)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-22 18:33:10 UTC (rev 183115)
@@ -802,8 +802,12 @@
var opacity = window.getComputedStyle(this.controls.panel).opacity;
if (parseInt(opacity) > 0) {
this.controls.panel.classList.remove(this.ClassNames.hidden);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.remove(this.ClassNames.hidden);
} else if (!this.controlsAlwaysVisible()) {
this.controls.panel.classList.add(this.ClassNames.hidden);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.add(this.ClassNames.hidden);
}
},
@@ -1293,10 +1297,14 @@
if (!isPlaying) {
this.controls.panel.classList.add(this.ClassNames.paused);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.add(this.ClassNames.paused);
this.controls.playButton.classList.add(this.ClassNames.paused);
this.controls.playButton.setAttribute('aria-label', this.UIString('Play'));
} else {
this.controls.panel.classList.remove(this.ClassNames.paused);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.remove(this.ClassNames.paused);
this.controls.playButton.classList.remove(this.ClassNames.paused);
this.controls.playButton.setAttribute('aria-label', this.UIString('Pause'));
this.resetHideControlsTimer();
@@ -1313,6 +1321,11 @@
this.controls.panel.classList.add(this.ClassNames.show);
this.controls.panel.classList.remove(this.ClassNames.hidden);
+
+ if (this.controls.panelBackground) {
+ this.controls.panelBackground.classList.add(this.ClassNames.show);
+ this.controls.panelBackground.classList.remove(this.ClassNames.hidden);
+ }
this.updateShouldListenForPlaybackTargetAvailabilityEvent();
},
@@ -1324,6 +1337,8 @@
this.updateShouldListenForPlaybackTargetAvailabilityEvent();
this.controls.panel.classList.remove(this.ClassNames.show);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.remove(this.ClassNames.show);
},
controlsAlwaysVisible: function()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
