Changeset 195511 in webkit

Timestamp:

Jan 23, 2016 2:51:40 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fix media controls displaying without controls attribute
​https://bugs.webkit.org/show_bug.cgi?id=152500

Media controls is not displayed without controls attribute by default
when the video element has text track. It'll be displayed on fullscreen
regardless of controls attribute.

Patch by Wonchul Lee <​wonchul.lee@collabora.co.uk> on 2016-01-23
Reviewed by Michael Catanzaro.

Source/WebCore:

• Modules/mediacontrols/mediaControlsGtk.js:

(ControllerGtk.prototype.shouldHaveControls):
(ControllerGtk.prototype.reconnectControls):
(ControllerGtk.prototype.removeControls):
(ControllerGtk.prototype.configureControls): Deleted.

LayoutTests:

• media/video-controls-no-display-with-text-track-expected.txt: Added.
• media/video-controls-no-display-with-text-track.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-controls-no-display-with-text-track-expected.txt (added)
• LayoutTests/media/video-controls-no-display-with-text-track.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-23  Wonchul Lee  <wonchul.lee@collabora.co.uk>
+
+        [GTK] Fix media controls displaying without controls attribute
+        https://bugs.webkit.org/show_bug.cgi?id=152500
+
+        Media controls is not displayed without controls attribute by default
+        when the video element has text track. It'll be displayed on fullscreen
+        regardless of controls attribute.
+
+        Reviewed by Michael Catanzaro.
+
+        * media/video-controls-no-display-with-text-track-expected.txt: Added.
+        * media/video-controls-no-display-with-text-track.html: Added.
+
 2016-01-23  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-23  Wonchul Lee  <wonchul.lee@collabora.co.uk>
+
+        [GTK] Fix media controls displaying without controls attribute
+        https://bugs.webkit.org/show_bug.cgi?id=152500
+
+        Media controls is not displayed without controls attribute by default
+        when the video element has text track. It'll be displayed on fullscreen
+        regardless of controls attribute.
+
+        Reviewed by Michael Catanzaro.
+
+        * Modules/mediacontrols/mediaControlsGtk.js:
+        (ControllerGtk.prototype.shouldHaveControls):
+        (ControllerGtk.prototype.reconnectControls):
+        (ControllerGtk.prototype.removeControls):
+        (ControllerGtk.prototype.configureControls): Deleted.
 2016-01-23  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -55 +55 @@
     },
 
-    configureControls: function() {
-        if (this.controls.configured)
-            return;
+    shouldHaveControls: function()
+    {
+        return this.video.controls || this.isFullScreen();
+    },
+
+    reconnectControls: function()
+    {
+        Controller.prototype.disconnectControls.apply(this, arguments);
 
         this.configureInlineControls();
-        this.controls.configured = true;
-        this.addControls();
-    },
-
-    reconnectControls: function()
-    {
-        this.configureControls();
+
+        if (this.shouldHaveControls())
+            this.addControls();
     },
 
@@ -134 +135 @@
     },
 
+    removeControls: function()
+    {
+        if (this.controls.enclosure.parentNode)
+            this.controls.enclosure.parentNode.removeChild(this.controls.enclosure);
+        this.destroyCaptionMenu();
+    },
+
     addControls: function()
     {