Diff
Modified: trunk/LayoutTests/ChangeLog (218237 => 218238)
--- trunk/LayoutTests/ChangeLog 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/ChangeLog 2017-06-14 01:23:55 UTC (rev 218238)
@@ -1,5 +1,21 @@
2017-06-13 Antoine Quint <[email protected]>
+ Rebaseline media/modern-media-controls/time-control
+ https://bugs.webkit.org/show_bug.cgi?id=173218
+
+ Reviewed by Dean Jackson.
+
+ There no longer is a Scrubber class and the useSixDigitsForTimeLabels property no longer exists.
+
+ * media/modern-media-controls/time-control/time-control-expected.txt:
+ * media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels-expected.txt: Removed.
+ * media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels.html: Removed.
+ * media/modern-media-controls/time-control/time-control.html:
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac/TestExpectations:
+
+2017-06-13 Antoine Quint <[email protected]>
+
Rebaseline media/modern-media-controls/status-label
https://bugs.webkit.org/show_bug.cgi?id=173217
Modified: trunk/LayoutTests/media/modern-media-controls/time-control/time-control-expected.txt (218237 => 218238)
--- trunk/LayoutTests/media/modern-media-controls/time-control/time-control-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/media/modern-media-controls/time-control/time-control-expected.txt 2017-06-14 01:23:55 UTC (rev 218238)
@@ -7,24 +7,19 @@
PASS timeControl.element.className is "time-control"
PASS timeControl.elapsedTimeLabel instanceof TimeLabel is true
-PASS timeControl.scrubber instanceof Scrubber is true
+PASS timeControl.scrubber instanceof Slider is true
PASS timeControl.remainingTimeLabel instanceof TimeLabel is true
+timeControl.width = 500;
PASS timeControl.children.length is 3
PASS timeControl.children[0] is timeControl.elapsedTimeLabel
PASS timeControl.children[1] is timeControl.scrubber
PASS timeControl.children[2] is timeControl.remainingTimeLabel
+PASS timeControl.elapsedTimeLabel.x is 0
+PASS timeControl.scrubber.x is 32
+PASS timeControl.scrubber.width is 430
+PASS timeControl.remainingTimeLabel.x is 467
-timeControl.width = 500;
-PASS timeControl.elapsedTimeLabel.x is -2
-PASS timeControl.scrubber.x is 43
-PASS timeControl.scrubber.width is 406
-PASS timeControl.remainingTimeLabel.x is 454
-PASS timeControl.isSufficientlyWide is true
-
-timeControl.width = 261;
-PASS timeControl.isSufficientlyWide is false
-
PASS successfullyParsed is true
TEST COMPLETE
Deleted: trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels-expected.txt (218237 => 218238)
--- trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels-expected.txt 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels-expected.txt 2017-06-14 01:23:55 UTC (rev 218238)
@@ -1,20 +0,0 @@
-Testing the TimeControl class property useSixDigitsForTimeLabels.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Testing default value
-PASS timeControl.useSixDigitsForTimeLabels is false
-
-Setting timeControl.useSixDigitsForTimeLabels = true
-PASS timeControl.useSixDigitsForTimeLabels is true
-
-PASS timeControl.elapsedTimeLabel.x is -2
-PASS timeControl.scrubber.x is 65
-PASS timeControl.scrubber.width is 362
-PASS timeControl.remainingTimeLabel.x is 432
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels.html (218237 => 218238)
--- trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels.html 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/media/modern-media-controls/time-control/time-control-use-six-digits-for-time-labels.html 2017-06-14 01:23:55 UTC (rev 218238)
@@ -1,30 +0,0 @@
-<script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<body>
-<script type="text/_javascript_">
-
-description("Testing the <code>TimeControl</code> class property useSixDigitsForTimeLabels.");
-
-const timeControl = new TimeControl;
-
-debug("Testing default value");
-shouldBeFalse("timeControl.useSixDigitsForTimeLabels");
-
-debug("");
-debug("Setting timeControl.useSixDigitsForTimeLabels = true");
-timeControl.useSixDigitsForTimeLabels = true;
-shouldBeTrue("timeControl.useSixDigitsForTimeLabels");
-
-timeControl.width = 500;
-debug("");
-shouldBe("timeControl.elapsedTimeLabel.x", "-2");
-shouldBe("timeControl.scrubber.x", "65");
-shouldBe("timeControl.scrubber.width", "362");
-shouldBe("timeControl.remainingTimeLabel.x", "432");
-
-debug("");
-
-</script>
-<script src=""
-</body>
Modified: trunk/LayoutTests/media/modern-media-controls/time-control/time-control.html (218237 => 218238)
--- trunk/LayoutTests/media/modern-media-controls/time-control/time-control.html 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/media/modern-media-controls/time-control/time-control.html 2017-06-14 01:23:55 UTC (rev 218238)
@@ -1,14 +1,5 @@
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
<script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
<body>
<script type="text/_javascript_">
@@ -21,31 +12,23 @@
debug("");
shouldBeTrue("timeControl.elapsedTimeLabel instanceof TimeLabel");
-shouldBeTrue("timeControl.scrubber instanceof Scrubber");
+shouldBeTrue("timeControl.scrubber instanceof Slider");
shouldBeTrue("timeControl.remainingTimeLabel instanceof TimeLabel");
debug("");
+debug("timeControl.width = 500;");
+timeControl.width = 500;
shouldBe("timeControl.children.length", "3");
shouldBe("timeControl.children[0]", "timeControl.elapsedTimeLabel");
shouldBe("timeControl.children[1]", "timeControl.scrubber");
shouldBe("timeControl.children[2]", "timeControl.remainingTimeLabel");
+shouldBe("timeControl.elapsedTimeLabel.x", "0");
+shouldBe("timeControl.scrubber.x", "32");
+shouldBe("timeControl.scrubber.width", "430");
+shouldBe("timeControl.remainingTimeLabel.x", "467");
debug("");
-debug("timeControl.width = 500;");
-timeControl.width = 500;
-shouldBe("timeControl.elapsedTimeLabel.x", "-2");
-shouldBe("timeControl.scrubber.x", "43");
-shouldBe("timeControl.scrubber.width", "406");
-shouldBe("timeControl.remainingTimeLabel.x", "454");
-shouldBeTrue("timeControl.isSufficientlyWide");
-debug("");
-debug("timeControl.width = 261;");
-timeControl.width = 261;
-shouldBeFalse("timeControl.isSufficientlyWide");
-
-debug("");
-
</script>
<script src=""
</body>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (218237 => 218238)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-06-14 01:23:55 UTC (rev 218238)
@@ -92,6 +92,7 @@
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-control [ Pass ]
media/modern-media-controls/time-label [ Pass ]
# AirPlay cannot be tested on iOS
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218237 => 218238)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:22:23 UTC (rev 218237)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-14 01:23:55 UTC (rev 218238)
@@ -1574,6 +1574,7 @@
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-control [ Pass ]
media/modern-media-controls/time-label [ Pass ]
media/modern-media-controls/volume-up-support [ Pass ]
