Changeset 195671 in webkit

Timestamp:

Jan 27, 2016 7:20:03 AM (8 years ago)

Author:

jer.noble@apple.com

Message:

Calling video.controls=true during a scrub operation cancels scrub.
​https://bugs.webkit.org/show_bug.cgi?id=153494

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/media-controls-drag-timeline-set-controls-property.html

Verify that the video.controls attribute actually changed before tearing down and
re-adding the media controls to the Shadow DOM.

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.handleControlsChange):
(Controller.prototype.hasControls):

LayoutTests:

• media/media-controls-drag-timeline-set-controls-property-expected.txt: Added.
• media/media-controls-drag-timeline-set-controls-property.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt (added)
• LayoutTests/media/media-controls-drag-timeline-set-controls-property.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-26  Jer Noble  <jer.noble@apple.com>
+
+        Calling video.controls=true during a scrub operation cancels scrub.
+        https://bugs.webkit.org/show_bug.cgi?id=153494
+
+        Reviewed by Eric Carlson.
+
+        * media/media-controls-drag-timeline-set-controls-property-expected.txt: Added.
+        * media/media-controls-drag-timeline-set-controls-property.html: Added.
+
 2016-01-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-26  Jer Noble  <jer.noble@apple.com>
+
+        Calling video.controls=true during a scrub operation cancels scrub.
+        https://bugs.webkit.org/show_bug.cgi?id=153494
+
+        Reviewed by Eric Carlson.
+
+        Test: media/media-controls-drag-timeline-set-controls-property.html
+
+        Verify that the video.controls attribute actually changed before tearing down and
+        re-adding the media controls to the Shadow DOM.
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.handleControlsChange):
+        (Controller.prototype.hasControls):
+
 2016-01-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -1088 +1088 @@
             this.updateBase();
 
-            if (this.shouldHaveControls())
+            if (this.shouldHaveControls() && !this.hasControls())
                 this.addControls();
-            else
+            else if (!this.shouldHaveControls() && this.hasControls())
                 this.removeControls();
         } catch(e) {
@@ -1541 +1541 @@
         this.base.appendChild(this.controls.panel);
         this.updateControls();
+    },
+
+    hasControls: function()
+    {
+        return this.controls.panel.parentElement;
     },