Title: [183417] trunk/Source/WebCore
- Revision
- 183417
- Author
- [email protected]
- Date
- 2015-04-27 13:33:15 -0700 (Mon, 27 Apr 2015)
Log Message
WirelessTargetPicker should not be visible unless a file is playable
https://bugs.webkit.org/show_bug.cgi?id=144271
<rdar://problem/20712003>
Reviewed by Jer Noble.
* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.isPlayable): New.
(Controller.prototype.setStatusHidden): Call updateWirelessTargetAvailable.
(Controller.prototype.updateWirelessTargetAvailable): Don't show the button until the
status message has been hidden.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183416 => 183417)
--- trunk/Source/WebCore/ChangeLog 2015-04-27 20:30:15 UTC (rev 183416)
+++ trunk/Source/WebCore/ChangeLog 2015-04-27 20:33:15 UTC (rev 183417)
@@ -1,3 +1,17 @@
+2015-04-27 Eric Carlson <[email protected]>
+
+ WirelessTargetPicker should not be visible unless a file is playable
+ https://bugs.webkit.org/show_bug.cgi?id=144271
+ <rdar://problem/20712003>
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.isPlayable): New.
+ (Controller.prototype.setStatusHidden): Call updateWirelessTargetAvailable.
+ (Controller.prototype.updateWirelessTargetAvailable): Don't show the button until the
+ status message has been hidden.
+
2015-04-22 Martin Robinson <[email protected]>
[CMake] Autogenerate cmakeconfig.h.cmake
Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (183416 => 183417)
--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-27 20:30:15 UTC (rev 183416)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-04-27 20:33:15 UTC (rev 183417)
@@ -597,6 +597,11 @@
this.setNeedsTimelineMetricsUpdate();
},
+ isPlayable: function()
+ {
+ return this.video.readyState > HTMLMediaElement.HAVE_NOTHING && !this.video.error;
+ },
+
updateStatusDisplay: function(event)
{
this.updateShouldListenForPlaybackTargetAvailabilityEvent();
@@ -609,7 +614,7 @@
else
this.controls.statusDisplay.innerText = '';
- this.setStatusHidden(!this.isLive && this.video.readyState > HTMLMediaElement.HAVE_NOTHING && !this.video.error);
+ this.setStatusHidden(!this.isLive && this.isPlayable());
},
handleLoadStart: function(event)
@@ -1411,6 +1416,7 @@
this.controls.remainingTime.classList.add(this.ClassNames.hidden);
this.hideControls();
}
+ this.updateWirelessTargetAvailable();
},
trackHasThumbnails: function(track)
@@ -1829,7 +1835,7 @@
if (this.wirelessPlaybackDisabled)
wirelessPlaybackTargetsAvailable = false;
- if (wirelessPlaybackTargetsAvailable)
+ if (wirelessPlaybackTargetsAvailable && this.isPlayable())
this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.hidden);
else
this.controls.wirelessTargetPicker.classList.add(this.ClassNames.hidden);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
