Title: [182812] trunk/Source/WebCore
- Revision
- 182812
- Author
- [email protected]
- Date
- 2015-04-14 14:35:02 -0700 (Tue, 14 Apr 2015)
Log Message
Insert volume control in correct place after exiting wireless play.
https://bugs.webkit.org/show_bug.cgi?id=143721.
<rdar://problem/20526106>
Reviewed by Darin Adler.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateWirelessPlaybackStatus):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182811 => 182812)
--- trunk/Source/WebCore/ChangeLog 2015-04-14 21:25:22 UTC (rev 182811)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 21:35:02 UTC (rev 182812)
@@ -1,3 +1,14 @@
+2015-04-14 Roger Fong <[email protected]>
+
+ Insert volume control in correct place after exiting wireless play.
+ https://bugs.webkit.org/show_bug.cgi?id=143721.
+ <rdar://problem/20526106>
+
+ Reviewed by Darin Adler.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.updateWirelessPlaybackStatus):
+
2015-04-14 Brady Eidson <[email protected]>
Media elements not in a page shouldn't load.
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (182811 => 182812)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-14 21:25:22 UTC (rev 182811)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-14 21:35:02 UTC (rev 182812)
@@ -1767,19 +1767,16 @@
this.controls.inlinePlaybackPlaceholderTextBottom.classList.remove(this.ClassNames.small);
}
if (this.isFullScreen())
- this.controls.panel.removeChild(this.controls.volumeBox);
+ this.controls.volumeBox.style.display = "none";
else
- this.controls.panel.removeChild(this.controls.muteBox);
+ this.controls.muteBox.style.display = "none";
} else {
this.controls.inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.playing);
- if (this.isFullScreen()) {
- if (!this.controls.volumeBox.parentNode)
- this.controls.panel.appendChild(this.controls.volumeBox);
- } else {
- if (!this.controls.muteBox.parentNode)
- this.controls.panel.appendChild(this.controls.muteBox);
- }
+ if (this.isFullScreen())
+ this.controls.volumeBox.style.display = "-webkit-flex";
+ else
+ this.controls.muteBox.style.display = "-webkit-flex";
}
},
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
