Attachment 261112 Details for Bug 149111 – Patch

[patch] Patch

bug-149111-20150915012635.patch (text/plain), 5.21 KB, created by ChangSeok Oh on 2015-09-14 09:26:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: ChangSeok Oh

Created: 2015-09-14 09:26:46 PDT

Size: 5.21 KB

patch

obsolete

>Subversion Revision: 189566
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5b94e60cac3a0e3474a53f24085b79e317b01b77..abb01d52d5937dc4e827cbf288b58795543d27ca 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2015-09-14  ChangSeok Oh  <changseok.oh@collabora.com>
>+
>+        [GTK] timeline is not updated after few seconds when mouse hovers on controls
>+        https://bugs.webkit.org/show_bug.cgi?id=149111
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Timeline is not updated if controlsAreHidden is true. The problem here is that
>+        the function does not mean actually 'hidden' since it only checkes 'show' and 'hidden'
>+        class existences. The panel's visibility are not only controlled by the two classes,
>+        but also by video::-webkit-media-controls-panel:hover. The panel could be visible
>+        by setting the pseudo hover class. So we need to check panel's opacity as well in controlsAreHidden().
>+
>+        Test: media/media-controls-timeline-updates-when-hovered.html
>+
>+        * Modules/mediacontrols/mediaControlsBase.js:
>+        (Controller.prototype.controlsAreHidden):
>+
> 2015-09-10  ChangSeok Oh  <changseok.oh@collabora.com>
> 
>         [GTK] Volume bar is broken
>diff --git a/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js b/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js
>index 8b2133b9782174a5b86d77060563646d60ac6dd9..892867ef241871008efc6e84ecaa9df09d90ec69 100644
>--- a/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js
>+++ b/Source/WebCore/Modules/mediacontrols/mediaControlsBase.js
>@@ -1023,7 +1023,9 @@ Controller.prototype = {
> 
>     controlsAreHidden: function()
>     {
>-        return !this.controls.panel.classList.contains(this.ClassNames.show) || this.controls.panel.classList.contains(this.ClassNames.hidden);
>+        var panel = this.controls.panel;
>+        return (!panel.classList.contains(this.ClassNames.show) || panel.classList.contains(this.ClassNames.hidden))
>+            && (parseFloat(window.getComputedStyle(panel).opacity) === 0);
>     },
> 
>     removeControls: function()
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index f425442242f0ed7d6634c01bf3ed0a2c9abdbb5c..055b33016b91a0ba62f52c9bdf0626db1bc65b7c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2015-09-14  ChangSeok Oh  <changseok.oh@collabora.com>
>+
>+        [GTK] timeline is not updated after few seconds when mouse hovers on controls
>+        https://bugs.webkit.org/show_bug.cgi?id=149111
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * media/media-controls-timeline-updates-when-hovered-expected.txt: Added.
>+        * media/media-controls-timeline-updates-when-hovered.html: Added.
>+
> 2015-09-10  ChangSeok Oh  <changseok.oh@collabora.com>
> 
>         [GTK] Volume bar is broken
>diff --git a/LayoutTests/media/media-controls-timeline-updates-when-hovered-expected.txt b/LayoutTests/media/media-controls-timeline-updates-when-hovered-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..8a0376cd2d465f6961ead391852f44cb73b2954b
>--- /dev/null
>+++ b/LayoutTests/media/media-controls-timeline-updates-when-hovered-expected.txt
>@@ -0,0 +1,11 @@
>+This tests if media controls timeline is properly updated when a cursor hovers the controls during playback.
>+
>+
>+EVENT(canplaythrough)
>+EXPECTED (timeLineValue() == '0') OK
>+RUN(video.play())
>+EVENT(play)
>+EVENT(timeupdate)
>+TEST(timeLineValue() > 1) OK
>+END OF TEST
>+
>diff --git a/LayoutTests/media/media-controls-timeline-updates-when-hovered.html b/LayoutTests/media/media-controls-timeline-updates-when-hovered.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..5d5932225d242440ba09bd98e21fc1607ec2dba4
>--- /dev/null
>+++ b/LayoutTests/media/media-controls-timeline-updates-when-hovered.html
>@@ -0,0 +1,53 @@
>+<!DOCTYPE html>
>+<p>This tests if media controls timeline is properly updated when a cursor hovers the controls during playback.</p>
>+<video controls></video>
>+<script src=media-file.js></script>
>+<script src=video-test.js></script>
>+<script src=media-controls.js></script>
>+<script>
>+function timeLineValue()
>+{
>+    var timeline = mediaControlsElement(internals.shadowRoot(video).firstChild.firstChild, '-webkit-media-controls-timeline');
>+    if (!timeline)
>+        throw "Failed to find -webkit-media-controls-timeline";
>+
>+    return timeline.value;
>+}
>+
>+function canplaythrough()
>+{
>+    if (!window.testRunner) {
>+        endTest();
>+        return;
>+    }
>+
>+    testExpected("timeLineValue()", 0);
>+
>+    var playButtonCoords;
>+    try {
>+        playButtonCoords = mediaControlsButtonCoordinates(video, "play-button");
>+    } catch (exception) {
>+        endTest();
>+        return;
>+    }
>+    eventSender.mouseMoveTo(playButtonCoords[0], playButtonCoords[1]);
>+
>+    video.addEventListener("timeupdate", function() {
>+         if (video.currentTime > 1.0) {
>+            consoleWrite("EVENT(timeupdate)");
>+            test("timeLineValue() > 1");
>+            endTest();
>+         }
>+    });
>+
>+    run("video.play()");
>+}
>+
>+var video;
>+findMediaElement();
>+video.src = findMediaFile("video", "content/test");
>+
>+waitForEvent("canplaythrough", canplaythrough);
>+waitForEvent("play");
>+waitForEventAndFail("error");
>+</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 149111: 261112 | 261311