Modified: trunk/LayoutTests/ChangeLog (218075 => 218076)
--- trunk/LayoutTests/ChangeLog 2017-06-11 21:48:16 UTC (rev 218075)
+++ trunk/LayoutTests/ChangeLog 2017-06-11 21:49:49 UTC (rev 218076)
@@ -1,5 +1,19 @@
2017-06-11 Antoine Quint <[email protected]>
+ Rebaseline media/modern-media-controls/play-pause-button
+ https://bugs.webkit.org/show_bug.cgi?id=173209
+
+ Reviewed by Jon Lee.
+
+ Use SVG assets.
+
+ * media/modern-media-controls/play-pause-button/play-pause-button-expected.txt:
+ * media/modern-media-controls/play-pause-button/play-pause-button.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-11 Antoine Quint <[email protected]>
+
Rebaseline media/modern-media-controls/placard
https://bugs.webkit.org/show_bug.cgi?id=173208
Modified: trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt (218075 => 218076)
--- trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt 2017-06-11 21:48:16 UTC (rev 218075)
+++ trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button-expected.txt 2017-06-11 21:49:49 UTC (rev 218076)
@@ -4,18 +4,15 @@
PASS playButton.element.localName is "button"
-PASS playButton.element.classList.contains("icon") is true
PASS playButton.element.classList.contains("play-pause") is true
PASS playButton.iconName is Icons.Play
PASS playButton.playing is false
PASS pauseButton.playing is true
PASS pauseButton.iconName is Icons.Pause
-PASS playButton.element.style.webkitMaskImage.includes("macOS/play@") became true
-PASS pauseButton.element.style.webkitMaskImage.includes("macOS/pause@") became true
-PASS iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@") became true
-PASS iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@") became true
-PASS fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@") became true
-PASS fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@") became true
+PASS playButton.image.element.style.webkitMaskImage.includes("macOS/Play.svg") became true
+PASS pauseButton.image.element.style.webkitMaskImage.includes("macOS/Pause.svg") became true
+PASS iOSPlayButton.image.element.style.webkitMaskImage.includes("iOS/Play.svg") became true
+PASS iOSPauseButton.image.element.style.webkitMaskImage.includes("iOS/Pause.svg") became true
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html (218075 => 218076)
--- trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html 2017-06-11 21:48:16 UTC (rev 218075)
+++ trunk/LayoutTests/media/modern-media-controls/play-pause-button/play-pause-button.html 2017-06-11 21:49:49 UTC (rev 218076)
@@ -11,7 +11,6 @@
const playButton = new PlayPauseButton({ layoutTraits: LayoutTraits.macOS });
shouldBeEqualToString("playButton.element.localName", "button");
-shouldBeTrue('playButton.element.classList.contains("icon")');
shouldBeTrue('playButton.element.classList.contains("play-pause")');
shouldBe("playButton.iconName", "Icons.Play");
shouldBeFalse("playButton.playing");
@@ -30,16 +29,12 @@
const iOSPauseButton = new PlayPauseButton({ layoutTraits: LayoutTraits.iOS });
iOSPauseButton.playing = true;
-shouldBecomeEqual('playButton.element.style.webkitMaskImage.includes("macOS/play@")', "true", () => {
- shouldBecomeEqual('pauseButton.element.style.webkitMaskImage.includes("macOS/pause@")', "true", () => {
- shouldBecomeEqual('iOSPlayButton.element.style.webkitMaskImage.includes("iOS/play@")', "true", () => {
- shouldBecomeEqual('iOSPauseButton.element.style.webkitMaskImage.includes("iOS/pause@")', "true", () => {
- shouldBecomeEqual('fullscreenPlayButton.element.style.webkitMaskImage.includes("macOS/play-fullscreen@")', "true", () => {
- shouldBecomeEqual('fullscreenPauseButton.element.style.webkitMaskImage.includes("macOS/pause-fullscreen@")', "true", () => {
- debug("");
- finishJSTest();
- });
- });
+shouldBecomeEqual('playButton.image.element.style.webkitMaskImage.includes("macOS/Play.svg")', "true", () => {
+ shouldBecomeEqual('pauseButton.image.element.style.webkitMaskImage.includes("macOS/Pause.svg")', "true", () => {
+ shouldBecomeEqual('iOSPlayButton.image.element.style.webkitMaskImage.includes("iOS/Play.svg")', "true", () => {
+ shouldBecomeEqual('iOSPauseButton.image.element.style.webkitMaskImage.includes("iOS/Pause.svg")', "true", () => {
+ debug("");
+ finishJSTest();
});
});
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218075 => 218076)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-11 21:48:16 UTC (rev 218075)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-11 21:49:49 UTC (rev 218076)
@@ -72,6 +72,7 @@
media/modern-media-controls/pip-button [ Pass ]
media/modern-media-controls/pip-placard [ Pass ]
media/modern-media-controls/placard [ Pass ]
+media/modern-media-controls/play-pause-button [ Pass ]
# AirPlay cannot be tested on iOS
webkit.org/b/166062 media/modern-media-controls/airplay-support [ Skip ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218075 => 218076)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-11 21:48:16 UTC (rev 218075)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-11 21:49:49 UTC (rev 218076)
@@ -1567,6 +1567,7 @@
media/modern-media-controls/pip-button [ Pass ]
media/modern-media-controls/pip-placard [ Pass ]
media/modern-media-controls/placard [ Pass ]
+media/modern-media-controls/play-pause-button [ Pass ]
media/modern-media-controls/volume-up-support [ Pass ]
# These tests are iOS-specific
