[Mac] Don't show default controls after playing to wireless target, again
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2015 22:08:59 +0000 (22:08 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2015 22:08:59 +0000 (22:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=145620
<rdar://problem/21145806>

Reviewed by Dean Jackson.

Follow up to fix two tests broken by r185207.

* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.updateControls): Always show controls when the video element
  is the fullscreen element because custom controls aren't possible.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185220 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

index d8ccd0b..729fcd4 100644 (file)
@@ -1,3 +1,17 @@
+2015-06-04  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] Don't show default controls after playing to wireless target, again
+        https://bugs.webkit.org/show_bug.cgi?id=145620
+        <rdar://problem/21145806>
+
+        Reviewed by Dean Jackson.
+
+        Follow up to fix two tests broken by r185207.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.updateControls): Always show controls when the video element
+          is the fullscreen element because custom controls aren't possible.
+
 2015-06-04  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [Cocoa] Add ASSERT to FontPlatformData::ctFont()
index af49603..2419be5 100644 (file)
@@ -612,7 +612,7 @@ Controller.prototype = {
         this.updateLayoutForDisplayedWidth();
         this.setNeedsTimelineMetricsUpdate();
 
-        if (this.video.controls) {
+        if (this.video.controls || this.isFullScreen()) {
             this.controls.panel.classList.add(this.ClassNames.show);
             this.controls.panel.classList.remove(this.ClassNames.hidden);
             this.resetHideControlsTimer();