Title: [184939] tags/Safari-601.1.33.1/Source/WebCore
- Revision
- 184939
- Author
- [email protected]
- Date
- 2015-05-27 19:33:21 -0700 (Wed, 27 May 2015)
Log Message
Roll out r184794. rdar://problem/21130157
Modified Paths
Diff
Modified: tags/Safari-601.1.33.1/Source/WebCore/ChangeLog (184938 => 184939)
--- tags/Safari-601.1.33.1/Source/WebCore/ChangeLog 2015-05-28 02:30:05 UTC (rev 184938)
+++ tags/Safari-601.1.33.1/Source/WebCore/ChangeLog 2015-05-28 02:33:21 UTC (rev 184939)
@@ -1,3 +1,7 @@
+2015-05-27 Babak Shafiei <[email protected]>
+
+ Roll out r184794.
+
2015-05-26 Chris Fleizach <[email protected]>
AX: display:none content exposed to accessibility when aria-hidden is toggled on ancestor element
Modified: tags/Safari-601.1.33.1/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (184938 => 184939)
--- tags/Safari-601.1.33.1/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-28 02:30:05 UTC (rev 184938)
+++ tags/Safari-601.1.33.1/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-28 02:33:21 UTC (rev 184939)
@@ -823,7 +823,7 @@
handlePanelTransitionEnd: function(event)
{
var opacity = window.getComputedStyle(this.controls.panel).opacity;
- if (!parseInt(opacity) && !this.controlsAlwaysVisible() && this.video.controls) {
+ if (!parseInt(opacity) && !this.controlsAlwaysVisible()) {
this.base.removeChild(this.controls.inlinePlaybackPlaceholder);
this.base.removeChild(this.controls.panel);
}
@@ -1333,7 +1333,7 @@
setPlaying: function(isPlaying)
{
- if (!this.video.controls)
+ if (this.showInlinePlaybackPlaceholderOnly())
return;
if (this.isPlaying === isPlaying)
@@ -1376,7 +1376,7 @@
showControls: function()
{
this.updateShouldListenForPlaybackTargetAvailabilityEvent();
- if (!this.video.controls)
+ if (this.showInlinePlaybackPlaceholderOnly())
return;
this.updateForShowingControls();
@@ -1934,7 +1934,6 @@
}
this.setNeedsUpdateForDisplayedWidth();
this.updateLayoutForDisplayedWidth();
- this.reconnectControls();
this.updateWirelessTargetPickerButton();
},
@@ -1964,6 +1963,8 @@
this.updateWirelessTargetAvailable();
this.updateWirelessPlaybackStatus();
this.setNeedsTimelineMetricsUpdate();
+ if (this.showInlinePlaybackPlaceholderOnly())
+ this.reconnectControls();
},
handleWirelessTargetAvailableChange: function(event) {
@@ -1990,6 +1991,11 @@
this.stopListeningFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
},
+ showInlinePlaybackPlaceholderOnly: function(event)
+ {
+ return this.currentPlaybackTargetIsWireless() && !this.video.controls;
+ },
+
get scrubbing()
{
return this._scrubbing;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
