Changeset 211154 in webkit

Timestamp:

Jan 25, 2017 10:32:05 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

LayoutTest media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html is flaky
​https://bugs.webkit.org/show_bug.cgi?id=167253

Patch by Antoine Quint <Antoine Quint> on 2017-01-25
Reviewed by Jon Lee.

Source/WebCore:

An IconButton loads its image asynchronously and waits for its load to obtain metrics. Once that happens,
its layout delegate needs to be notified that it needs a new layout. The test was a flaky failure because
the images would sometime load prior to layout, and sometime after, which would cause a failure. The test
is now robust with a controls layout happening after all buttons had loaded.

• Modules/modern-media-controls/controls/icon-button.js:

(IconButton.prototype._updateImage):
(IconButton):

LayoutTests:

This test should no longer be flaky, so let's not mark it as such anymore.

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/controls/icon-button.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-25  Antoine Quint  <graouts@apple.com>
+
+        LayoutTest media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=167253
+
+        Reviewed by Jon Lee.
+
+        This test should no longer be flaky, so let's not mark it as such anymore.
+
+        * platform/mac-wk1/TestExpectations:
+
 2017-01-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -300 +300 @@
 media/modern-media-controls/tracks-support/tracks-support-click-track-in-panel.html [ Pass Timeout ]
 
-webkit.org/b/167253 media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html [ Pass Failure ]
-
 webkit.org/b/167320 [ Sierra Release ] media/modern-media-controls/placard-support/placard-support-pip.html [ Pass Crash ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-25  Antoine Quint  <graouts@apple.com>
+
+        LayoutTest media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=167253
+
+        Reviewed by Jon Lee.
+
+        An IconButton loads its image asynchronously and waits for its load to obtain metrics. Once that happens,
+        its layout delegate needs to be notified that it needs a new layout. The test was a flaky failure because
+        the images would sometime load prior to layout, and sometime after, which would cause a failure. The test
+        is now robust with a controls layout happening after all buttons had loaded.
+
+        * Modules/modern-media-controls/controls/icon-button.js:
+        (IconButton.prototype._updateImage):
+        (IconButton):
+
 2017-01-25  Timothy Hatcher  <timothy@hatcher.name>
 

trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-button.js

@@ -104 +104 @@
     _updateImage()
     {
-        this.width = this._image.width / window.devicePixelRatio;
-        this.height = this._image.height / window.devicePixelRatio;
+        const width = this._image.width / window.devicePixelRatio;
+        const height = this._image.height / window.devicePixelRatio;
+
+        if (this.width === width && this.height === height)
+            return;
+
+        this.width = width;
+        this.height = height;
 
         this.needsLayout = true;
+
+        if (this.layoutDelegate)
+            this.layoutDelegate.needsLayout = true;
     }