Changeset 220985 in webkit

Timestamp:

Aug 21, 2017 3:17:24 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Stop media/video-controls-toggling.html from timing out.
​https://bugs.webkit.org/show_bug.cgi?id=116266

Patch by Ms2ger <​Ms2ger@gmail.com> on 2017-08-21
Reviewed by Dean Jackson.

Use getComputedStyle to check the display property. Element::style only
contains properties set in the style attribute, but the display property
is set through CSS using the 'hidden' class.

• media/video-controls-toggling-expected.txt:
• media/video-controls-toggling.html:
• platform/gtk/TestExpectations:
• platform/gtk/media/video-controls-toggling-expected.txt: Copied from LayoutTests/media/video-controls-toggling-expected.txt. I'm not sure where the console message comes from, but it seems to be in the GTK-specific code.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• media/video-controls-toggling-expected.txt (modified) (4 diffs)
• media/video-controls-toggling.html (modified) (5 diffs)
• platform/gtk/TestExpectations (modified) (1 diff)
• platform/gtk/media/video-controls-toggling-expected.txt (copied) (copied from trunk/LayoutTests/media/video-controls-toggling-expected.txt) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-08-21  Ms2ger  <Ms2ger@gmail.com>
+
+        Stop media/video-controls-toggling.html from timing out.
+        https://bugs.webkit.org/show_bug.cgi?id=116266
+
+        Reviewed by Dean Jackson.
+
+        Use getComputedStyle to check the display property. Element::style only
+        contains properties set in the style attribute, but the display property
+        is set through CSS using the 'hidden' class.
+
+        * media/video-controls-toggling-expected.txt:
+        * media/video-controls-toggling.html:
+        * platform/gtk/TestExpectations:
+        * platform/gtk/media/video-controls-toggling-expected.txt:
+          Copied from LayoutTests/media/video-controls-toggling-expected.txt.
+          I'm not sure where the console message comes from, but it seems to
+          be in the GTK-specific code.
+
 2017-08-21  Dean Jackson  <dino@apple.com>
 

trunk/LayoutTests/media/video-controls-toggling-expected.txt

@@ -1 @@
-Tests that showing / hiding video controls uses the sets the display:none property
+Tests that showing / hiding video controls uses the display:none property
 
 
@@ -9 +9 @@
 
 ** Test that controls are shown when controls attribute is present **
-EXPECTED (panel.style['display'] != 'none') OK
+EXPECTED (getComputedStyle(panel).display != 'none') OK
 
 ** Move mouse outside the video **
@@ -15 +15 @@
 
 ** The controls should have the display property set to none
-EXPECTED (panel.style['display'] == 'none') OK
+EXPECTED (getComputedStyle(panel).display == 'none') OK
 
 ** Remove controls attribute**
@@ -24 +24 @@
 
 ** Video controls should not be shown **
-EXPECTED (panel.style['display'] == 'none') OK
+EXPECTED (getComputedStyle(panel).display == 'none') OK
 
 END OF TEST

trunk/LayoutTests/media/video-controls-toggling.html

@@ -41 +41 @@
             consoleWrite("");
             consoleWrite("** Test that controls are shown when controls attribute is present **");
-            testExpected("panel.style['display']", 'none', "!=");
+            testExpected("getComputedStyle(panel).display", 'none', "!=");
 
             if (window.eventSender) {
@@ -54 +54 @@
         function continueTest()
         {
-            if (panel.style['display'] != 'none') {
+            if (getComputedStyle(panel).display != 'none') {
                 setTimeout(continueTest, fadeoutTime);
                 return;
@@ -61 +61 @@
             consoleWrite("");
             consoleWrite("** The controls should have the display property set to none");
-            testExpected("panel.style['display']", 'none', "==");
+            testExpected("getComputedStyle(panel).display", 'none', "==");
 
             consoleWrite("");
@@ -73 +73 @@
             consoleWrite("");
             consoleWrite("** Video controls should not be shown **");
-            testExpected("panel.style['display']", 'none', "==");
+            testExpected("getComputedStyle(panel).display", 'none', "==");
 
             consoleWrite("");
@@ -83 +83 @@
 </head>
 <body onload="init()">
-    Tests that showing / hiding video controls uses the sets the display:none property<br>
+    Tests that showing / hiding video controls uses the display:none property<br>
     <video onplay="test()" controls></video>
 </body>

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2118 +2118 @@
 webkit.org/b/130971 media/track/track-remove-track.html [ Timeout ]
 
-# After webkit.org/b/123097 we flag these tests that also fail in mac
-webkit.org/b/123097 media/video-controls-toggling.html [ Timeout ]
-
 webkit.org/b/145053 http/tests/xmlhttprequest/origin-exact-matching.html [ Timeout Pass ]
 

trunk/LayoutTests/platform/gtk/media/video-controls-toggling-expected.txt

@@ -1 @@
-Tests that showing / hiding video controls uses the sets the display:none property
+CONSOLE MESSAGE: line 122: TypeError: undefined is not an object (evaluating 'this.captionMenu.style')
+Tests that showing / hiding video controls uses the display:none property
 
 
@@ -9 +10 @@
 
 ** Test that controls are shown when controls attribute is present **
-EXPECTED (panel.style['display'] != 'none') OK
+EXPECTED (getComputedStyle(panel).display != 'none') OK
 
 ** Move mouse outside the video **
@@ -15 +16 @@
 
 ** The controls should have the display property set to none
-EXPECTED (panel.style['display'] == 'none') OK
+EXPECTED (getComputedStyle(panel).display == 'none') OK
 
 ** Remove controls attribute**
@@ -24 +25 @@
 
 ** Video controls should not be shown **
-EXPECTED (panel.style['display'] == 'none') OK
+EXPECTED (getComputedStyle(panel).display == 'none') OK
 
 END OF TEST