Changeset 179612 in webkit

Timestamp:

Feb 4, 2015 10:16:06 AM (9 years ago)

Author:

eric.carlson@apple.com

Message:

video.attribute should not return true just because of fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=141219

Reviewed by Dean Jackson.

Source/WebCore:

No new tests, updated media/video-fullscreeen-only-controls.html

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.shouldHaveControls):

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype.isFullScreen):

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::controls): Don't consider fullscreen status.
(WebCore::HTMLMediaElement::configureMediaControls): Create controls if a video element

isn't allowed to play inline, or if it is in fullscreen.

LayoutTests:

• media/video-fullscreeen-only-controls-expected.txt: Update.
• media/video-fullscreeen-only-controls.html: Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-fullscreeen-only-controls-expected.txt (modified) (1 diff)
• LayoutTests/media/video-fullscreeen-only-controls.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-04  Eric Carlson  <eric.carlson@apple.com>
+
+        video.attribute should not return true just because of fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=141219
+
+        Reviewed by Dean Jackson.
+
+        * media/video-fullscreeen-only-controls-expected.txt: Update.
+        * media/video-fullscreeen-only-controls.html: Ditto.
+
 2015-02-04  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/media/video-fullscreeen-only-controls-expected.txt

@@ -3 +3 @@
 
 RUN(internals.setMediaSessionRestrictions('video', 'InlineVideoPlaybackRestricted'))
+EXPECTED (video.hasAttribute('controls') == 'false') OK
+EXPECTED (video.controls == 'false') OK
 EXPECTED (shadowRoot = internals.shadowRoot(video) != 'null') OK
 EXPECTED (panel = mediaControlsElement(shadowRoot.firstChild, '-webkit-media-controls-panel') != 'null') OK

trunk/LayoutTests/media/video-fullscreeen-only-controls.html

@@ -15 +15 @@
     video.src = findMediaFile("video", "content/test");
 
+    testExpected("video.hasAttribute('controls')", false);
+    testExpected("video.controls", false);
+
     if (window.internals) {
         testExpected("shadowRoot = internals.shadowRoot(video)", null, "!=");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-04  Eric Carlson  <eric.carlson@apple.com>
+
+        video.attribute should not return true just because of fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=141219
+
+        Reviewed by Dean Jackson.
+
+        No new tests, updated media/video-fullscreeen-only-controls.html
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.shouldHaveControls):
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype.isFullScreen):
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::controls): Don't consider fullscreen status.
+        (WebCore::HTMLMediaElement::configureMediaControls): Create controls if a video element
+            isn't allowed to play inline, or if it is in fullscreen.
+
 2015-02-04  Mark Lam  <mark.lam@apple.com>
 

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

@@ -251 +251 @@
     shouldHaveControls: function()
     {
+        if (!this.isAudio() && !this.host.mediaPlaybackAllowsInline)
+            return true;
+
         return this.video.controls || this.isFullScreen();
     },

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -414 +414 @@
     isFullScreen: function()
     {
-        return this.video.webkitDisplayingFullscreen;
+        return this.video.webkitDisplayingFullscreen && this.presentationMode() != 'optimized';
     },
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -2967 +2967 @@
         return true;
 
-    // always show controls for video when fullscreen playback is required.
-    if (isVideo() && m_mediaSession->requiresFullscreenForVideoPlayback(*this))
-        return true;
-
-    // Always show controls when in full screen mode.
-    if (isFullscreen())
-        return true;
-
     return fastHasAttribute(controlsAttr);
 }
@@ -5257 +5249 @@
 void HTMLMediaElement::configureMediaControls()
 {
+    bool requireControls = controls();
+
+    // Always create controls for video when fullscreen playback is required.
+    if (isVideo() && m_mediaSession->requiresFullscreenForVideoPlayback(*this))
+        requireControls = true;
+
+    // Always create controls when in full screen mode.
+    if (isFullscreen())
+        requireControls = true;
+
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
-    if (!controls() || !inDocument())
+    if (!requireControls || !inDocument())
         return;
 
     ensureUserAgentShadowRoot();
 #else
-    if (!controls() || !inDocument()) {
+    if (!requireControls || !inDocument()) {
         if (hasMediaControls())
             mediaControls()->hide();