Diff
Modified: trunk/LayoutTests/ChangeLog (218236 => 218237)
--- trunk/LayoutTests/ChangeLog 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/ChangeLog 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1,5 +1,23 @@
2017-06-13 Antoine Quint <[email protected]>
+ Rebaseline media/modern-media-controls/status-label
+ https://bugs.webkit.org/show_bug.cgi?id=173217
+
+ Reviewed by Dean Jackson.
+
+ There is no need for macOS and iOS-specific tests, they share the same styles.
+
+ * media/modern-media-controls/status-label/status-label-expected.txt:
+ * media/modern-media-controls/status-label/status-label-in-controls-expected.txt: Renamed from LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt.
+ * media/modern-media-controls/status-label/status-label-in-controls.html: Renamed from LayoutTests/media/modern-media-controls/status-label/status-label-macos.html.
+ * media/modern-media-controls/status-label/status-label-ios-expected.txt: Removed.
+ * media/modern-media-controls/status-label/status-label-ios.html: Removed.
+ * media/modern-media-controls/status-label/status-label.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-13 Antoine Quint <[email protected]>
+
Remove media/modern-media-controls/start-button
https://bugs.webkit.org/show_bug.cgi?id=173216
Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
@@ -18,7 +18,7 @@
PASS style.textOverflow is "ellipsis"
PASS style.whiteSpace is "nowrap"
PASS style.overflow is "hidden"
-PASS style.fontSize is "14px"
+PASS style.fontSize is "12px"
PASS successfullyParsed is true
Copied: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls-expected.txt (from rev 218236, trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt) (0 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls-expected.txt (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
@@ -0,0 +1,16 @@
+Testing StatusLabel properties when used inside InlineMediaControls.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS document.body.contains(mediaControls.statusLabel.element) became true
+PASS style.mixBlendMode is "plus-lighter"
+PASS rgba(style.color).r is 255
+PASS rgba(style.color).g is 255
+PASS rgba(style.color).b is 255
+PASS rgba(style.color).a is within 0.001 of 0.54902
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls.html (from rev 218236, trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html) (0 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls.html (rev 0)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-in-controls.html 2017-06-14 01:22:23 UTC (rev 218237)
@@ -0,0 +1,31 @@
+<script src=""
+<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+<body>
+<script type="text/_javascript_">
+
+window.jsTestIsAsync = true;
+
+description("Testing <code>StatusLabel</code> properties when used inside <code>InlineMediaControls</code>.");
+
+const mediaControls = new MacOSInlineMediaControls({ width: 600, height: 300 });
+mediaControls.statusLabel.enabled = true;
+mediaControls.statusLabel.text = "Hello World";
+
+document.body.appendChild(mediaControls.element);
+
+let style;
+shouldBecomeEqual("document.body.contains(mediaControls.statusLabel.element)", "true", () => {
+ style = getComputedStyle(mediaControls.statusLabel.element);
+
+ shouldBeEqualToString("style.mixBlendMode", "plus-lighter");
+ shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.54902)");
+
+ mediaControls.element.remove();
+ debug("");
+ finishJSTest();
+});
+
+</script>
+<script src=""
+</body>
Deleted: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1,13 +0,0 @@
-Testing StatusText properties when used in IOSInlineMediaControls.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.body.contains(mediaControls.statusLabel.element) became true
-PASS style.top is "14.5px"
-PASS style.color is "rgb(0, 0, 0)"
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-ios.html 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1,31 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing <code>StatusText</code> properties when used in <code>IOSInlineMediaControls</code>.");
-
-const mediaControls = new IOSInlineMediaControls({ width: 600, height: 300 });
-mediaControls.statusLabel.enabled = true;
-mediaControls.statusLabel.text = "Hello World";
-
-document.body.appendChild(mediaControls.element);
-
-let style;
-shouldBecomeEqual("document.body.contains(mediaControls.statusLabel.element)", "true", () => {
- style = getComputedStyle(mediaControls.statusLabel.element);
-
- shouldBeEqualToString("style.top", "14.5px");
- shouldBeEqualToString("style.color", "rgb(0, 0, 0)");
-
- mediaControls.element.remove();
- debug("");
- finishJSTest();
-});
-
-</script>
-<script src=""
-</body>
Deleted: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1,17 +0,0 @@
-Testing StatusText properties when used in MacOSInlineMediaControls.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.body.contains(mediaControls.statusLabel.element) became true
-PASS style.top is "14.5px"
-PASS style.mixBlendMode is "plus-lighter"
-PASS rgba(style.color).r is 255
-PASS rgba(style.color).g is 255
-PASS rgba(style.color).b is 255
-PASS rgba(style.color).a is within 0.001 of 0.45
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label-macos.html 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1,32 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-window.jsTestIsAsync = true;
-
-description("Testing <code>StatusText</code> properties when used in <code>MacOSInlineMediaControls</code>.");
-
-const mediaControls = new MacOSInlineMediaControls({ width: 600, height: 300 });
-mediaControls.statusLabel.enabled = true;
-mediaControls.statusLabel.text = "Hello World";
-
-document.body.appendChild(mediaControls.element);
-
-let style;
-shouldBecomeEqual("document.body.contains(mediaControls.statusLabel.element)", "true", () => {
- style = getComputedStyle(mediaControls.statusLabel.element);
-
- shouldBeEqualToString("style.top", "14.5px");
- shouldBeEqualToString("style.mixBlendMode", "plus-lighter");
- shouldBeEqualToRGBAColor("style.color", "rgba(255, 255, 255, 0.45)");
-
- mediaControls.element.remove();
- debug("");
- finishJSTest();
-});
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html (218236 => 218237)
--- trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/media/modern-media-controls/status-label/status-label.html 2017-06-14 01:22:23 UTC (rev 218237)
@@ -39,7 +39,7 @@
shouldBeEqualToString("style.textOverflow", "ellipsis");
shouldBeEqualToString("style.whiteSpace", "nowrap");
shouldBeEqualToString("style.overflow", "hidden");
- shouldBeEqualToString("style.fontSize", "14px");
+ shouldBeEqualToString("style.fontSize", "12px");
statusLabel.element.remove();
debug("");
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218236 => 218237)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:22:23 UTC (rev 218237)
@@ -91,6 +91,7 @@
media/modern-media-controls/skip-back-button [ Pass ]
media/modern-media-controls/skip-forward-button [ Pass ]
media/modern-media-controls/slider [ Pass ]
+media/modern-media-controls/status-label [ Pass ]
media/modern-media-controls/time-label [ Pass ]
# AirPlay cannot be tested on iOS
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218236 => 218237)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:19:57 UTC (rev 218236)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:22:23 UTC (rev 218237)
@@ -1573,6 +1573,7 @@
media/modern-media-controls/skip-back-button [ Pass ]
media/modern-media-controls/skip-forward-button [ Pass ]
media/modern-media-controls/slider [ Pass ]
+media/modern-media-controls/status-label [ Pass ]
media/modern-media-controls/time-label [ Pass ]
media/modern-media-controls/volume-up-support [ Pass ]
