Title: [207333] trunk/LayoutTests
Revision
207333
Author
commit-qu...@webkit.org
Date
2016-10-14 02:49:47 -0700 (Fri, 14 Oct 2016)

Log Message

REGRESSION (r207299): media/modern-media-controls/pip-button/pip-button.html and media/modern-media-controls/skip-back-button/skip-back-button.html are flaky
https://bugs.webkit.org/show_bug.cgi?id=163411

Patch by Antoine Quint <grao...@apple.com> on 2016-10-14
Reviewed by Antoine Quint.

Ensure all buttons have their required images loaded before we check on the mask-image set through CSS.

* media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html:
* media/modern-media-controls/forward-button/forward-button.html:
* media/modern-media-controls/fullscreen-button/fullscreen-button.html:
* media/modern-media-controls/mute-button/mute-button.html:
* media/modern-media-controls/pip-button/pip-button.html:
* media/modern-media-controls/rewind-button/rewind-button.html:
* media/modern-media-controls/skip-back-button/skip-back-button.html:
* media/modern-media-controls/tracks-button/tracks-button.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (207332 => 207333)


--- trunk/LayoutTests/ChangeLog	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/ChangeLog	2016-10-14 09:49:47 UTC (rev 207333)
@@ -1,3 +1,21 @@
+2016-10-14  Antoine Quint  <grao...@apple.com>
+
+        REGRESSION (r207299): media/modern-media-controls/pip-button/pip-button.html and media/modern-media-controls/skip-back-button/skip-back-button.html are flaky
+        https://bugs.webkit.org/show_bug.cgi?id=163411
+
+        Reviewed by Antoine Quint.
+
+        Ensure all buttons have their required images loaded before we check on the mask-image set through CSS.
+
+        * media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html:
+        * media/modern-media-controls/forward-button/forward-button.html:
+        * media/modern-media-controls/fullscreen-button/fullscreen-button.html:
+        * media/modern-media-controls/mute-button/mute-button.html:
+        * media/modern-media-controls/pip-button/pip-button.html:
+        * media/modern-media-controls/rewind-button/rewind-button.html:
+        * media/modern-media-controls/skip-back-button/skip-back-button.html:
+        * media/modern-media-controls/tracks-button/tracks-button.html:
+
 2016-10-14  Youenn Fablet  <you...@apple.com>
 
         Make NetworkCache aware of fetch cache mode

Modified: trunk/LayoutTests/media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -30,6 +30,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([scaleToFillButton, scaleToFitButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('scaleToFillButton.element.style.webkitMaskImage.includes("macOS/scale-to-fill@")');
     shouldBeTrue('scaleToFitButton.element.style.webkitMaskImage.includes("macOS/scale-to-fit@")');
 

Modified: trunk/LayoutTests/media/modern-media-controls/forward-button/forward-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/forward-button/forward-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/forward-button/forward-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -26,6 +26,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if (forwardButton.width == 0)
+        return;
+
     shouldBeTrue('forwardButton.element.style.webkitMaskImage.includes("macOS/forward@")');
     finishJSTest();
 };

Modified: trunk/LayoutTests/media/modern-media-controls/fullscreen-button/fullscreen-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/fullscreen-button/fullscreen-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/fullscreen-button/fullscreen-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -31,6 +31,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([enterFullscreenButton, iOSEnterFullscreenButton, exitFullscreenButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('enterFullscreenButton.element.style.webkitMaskImage.includes("macOS/enter-fullscreen@")');
     shouldBeTrue('iOSEnterFullscreenButton.element.style.webkitMaskImage.includes("iOS/enter-fullscreen@")');
     shouldBeTrue('exitFullscreenButton.element.style.webkitMaskImage.includes("macOS/exit-fullscreen@")');

Modified: trunk/LayoutTests/media/modern-media-controls/mute-button/mute-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/mute-button/mute-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/mute-button/mute-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -32,6 +32,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([muteButton, mutedButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('muteButton.element.style.webkitMaskImage.includes("macOS/volume@")');
     shouldBeTrue('mutedButton.element.style.webkitMaskImage.includes("macOS/volume-mute@")');
     finishJSTest();

Modified: trunk/LayoutTests/media/modern-media-controls/pip-button/pip-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/pip-button/pip-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/pip-button/pip-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -28,6 +28,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([pipButton, iOSPiPButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('pipButton.element.style.webkitMaskImage.includes("macOS/pip-in@")');
     shouldBeTrue('iOSPiPButton.element.style.webkitMaskImage.includes("iOS/pip-in@")');
     finishJSTest();

Modified: trunk/LayoutTests/media/modern-media-controls/rewind-button/rewind-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/rewind-button/rewind-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/rewind-button/rewind-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -26,6 +26,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if (rewindButton.width == 0)
+        return;
+
     shouldBeTrue('rewindButton.element.style.webkitMaskImage.includes("macOS/rewind@")');
     finishJSTest();
 };

Modified: trunk/LayoutTests/media/modern-media-controls/skip-back-button/skip-back-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/skip-back-button/skip-back-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/skip-back-button/skip-back-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -28,6 +28,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([skipBackButton, iOSSkipBackButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('skipBackButton.element.style.webkitMaskImage.includes("macOS/interval-skip-back@")');
     shouldBeTrue('iOSSkipBackButton.element.style.webkitMaskImage.includes("iOS/interval-skip-back@")');
     finishJSTest();

Modified: trunk/LayoutTests/media/modern-media-controls/tracks-button/tracks-button.html (207332 => 207333)


--- trunk/LayoutTests/media/modern-media-controls/tracks-button/tracks-button.html	2016-10-14 09:17:55 UTC (rev 207332)
+++ trunk/LayoutTests/media/modern-media-controls/tracks-button/tracks-button.html	2016-10-14 09:49:47 UTC (rev 207333)
@@ -28,6 +28,9 @@
 
 scheduler.frameDidFire = function()
 {
+    if ([tracksButton, fullscreenTracksButton].some(button => button.width == 0))
+        return;
+
     shouldBeTrue('tracksButton.element.style.webkitMaskImage.includes("macOS/media-selection@")');
     shouldBeTrue('fullscreenTracksButton.element.style.webkitMaskImage.includes("macOS/media-selection-fullscreen@")');
     finishJSTest();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to