Diff
Modified: trunk/LayoutTests/ChangeLog (218057 => 218058)
--- trunk/LayoutTests/ChangeLog 2017-06-11 01:37:09 UTC (rev 218057)
+++ trunk/LayoutTests/ChangeLog 2017-06-11 02:10:26 UTC (rev 218058)
@@ -1,3 +1,18 @@
+2017-06-09 Antoine Quint <[email protected]>
+
+ Rebaseline media/modern-media-controls/icon-service
+ https://bugs.webkit.org/show_bug.cgi?id=173200
+
+ Reviewed by Jon Lee.
+
+ The method we were testing has changed name and the pause icon is no longer a good
+ test since it doesn't have a fullscreen variant, so we use the AirPlay icon instead.
+
+ * media/modern-media-controls/icon-service/icon-service-expected.txt:
+ * media/modern-media-controls/icon-service/icon-service.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
2017-06-09 Brady Eidson <[email protected]>
Crash when IndexedDB's getAll is used inside a Web Worker.
Modified: trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt (218057 => 218058)
--- trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt 2017-06-11 01:37:09 UTC (rev 218057)
+++ trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service-expected.txt 2017-06-11 02:10:26 UTC (rev 218058)
@@ -4,16 +4,15 @@
Checking path to images is computed according to traits
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS).src.includes("macOS/pause@") is true
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS).src.includes("iOS/pause@") is true
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@") is true
+PASS iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS).src.includes("macOS/Airplay.svg") is true
+PASS iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS).src.includes("iOS/Airplay.svg") is true
+PASS iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/Airplay-fullscreen.svg") is true
-Checking fullscreen or compact layout traits are ignored on iOS
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS) is true
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS | LayoutTraits.Compact) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS) is true
+Checking fullscreen layout traits are ignored on iOS
+PASS iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS) is true
Checking requested images are cached
-PASS iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS) is true
+PASS iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS) === iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS) is true
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html (218057 => 218058)
--- trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html 2017-06-11 01:37:09 UTC (rev 218057)
+++ trunk/LayoutTests/media/modern-media-controls/icon-service/icon-service.html 2017-06-11 02:10:26 UTC (rev 218058)
@@ -8,18 +8,17 @@
iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
debug("Checking path to images is computed according to traits");
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS).src.includes("macOS/pause@")');
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS).src.includes("iOS/pause@")');
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/pause-fullscreen@")');
+shouldBeTrue('iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS).src.includes("macOS/Airplay.svg")');
+shouldBeTrue('iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS).src.includes("iOS/Airplay.svg")');
+shouldBeTrue('iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS | LayoutTraits.Fullscreen).src.includes("macOS/Airplay-fullscreen.svg")');
debug("");
-debug("Checking fullscreen or compact layout traits are ignored on iOS");
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS)');
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS | LayoutTraits.Compact) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.iOS)');
+debug("Checking fullscreen layout traits are ignored on iOS");
+shouldBeTrue('iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS | LayoutTraits.Fullscreen) === iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.iOS)');
debug("");
debug("Checking requested images are cached");
-shouldBeTrue('iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS) === iconService.imageForIconNameAndLayoutTraits(Icons.Pause.name, LayoutTraits.macOS)');
+shouldBeTrue('iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS) === iconService.imageForIconAndLayoutTraits(Icons.Airplay, LayoutTraits.macOS)');
</script>
<script src=""
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218057 => 218058)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-11 01:37:09 UTC (rev 218057)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-11 02:10:26 UTC (rev 218058)
@@ -64,6 +64,7 @@
media/modern-media-controls/controls-visibility-support [ Pass ]
media/modern-media-controls/forward-button [ Pass ]
media/modern-media-controls/fullscreen-button [ Pass ]
+media/modern-media-controls/icon-service [ Pass ]
# AirPlay cannot be tested on iOS
webkit.org/b/166062 media/modern-media-controls/airplay-support [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218057 => 218058)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-11 01:37:09 UTC (rev 218057)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-11 02:10:26 UTC (rev 218058)
@@ -1557,6 +1557,7 @@
media/modern-media-controls/controls-visibility-support [ Pass ]
media/modern-media-controls/forward-button [ Pass ]
media/modern-media-controls/fullscreen-button [ Pass ]
+media/modern-media-controls/icon-service [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html [ Pass ]
media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag.html [ Pass ]
media/modern-media-controls/volume-up-support [ Pass ]
