[Modern Media Controls] Turn media/modern-media-controls/macos-fullscreen-media-controls back on
https://bugs.webkit.org/show_bug.cgi?id=182385
Patch by Antoine Quint <graouts@apple.com> on 2018-02-01
Reviewed by Eric Carlson.
Update tests to match the modern-media-controls design and expectations.
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt:
* media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html:
* platform/mac/TestExpectations:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@227968 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 749d566..b459552 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,27 @@
+2018-02-01 Antoine Quint <graouts@apple.com>
+
+ [Modern Media Controls] Turn media/modern-media-controls/macos-fullscreen-media-controls back on
+ https://bugs.webkit.org/show_bug.cgi?id=182385
+
+ Reviewed by Eric Carlson.
+
+ Update tests to match the modern-media-controls design and expectations.
+
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt:
+ * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html:
+ * platform/mac/TestExpectations:
+
2018-02-01 Frederic Wang <fwang@igalia.com>
Rewrite fast/events/scroll-in-scaled-page-with-overflow-hidden.html to conform with CSSOM View
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt
index ed4879e..8017a00 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt
@@ -5,11 +5,11 @@
PASS centerContainer.element.getBoundingClientRect().width became 178
PASS centerContainer.element.getBoundingClientRect().left is 311
-PASS centerContainer.element.getBoundingClientRect().top is 500
+PASS centerContainer.element.getBoundingClientRect().top is 503
PASS centerContainer.element.getBoundingClientRect().height is 44
-PASS Math.floor(rightContainer.element.getBoundingClientRect().width) became 138
-PASS rightContainer.element.getBoundingClientRect().left is within 0.5 of 496
+PASS Math.floor(rightContainer.element.getBoundingClientRect().width) became 140
+PASS rightContainer.element.getBoundingClientRect().left is within 0.5 of 494
PASS rightContainer.element.getBoundingClientRect().top is 500
PASS rightContainer.element.getBoundingClientRect().height is 44
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html
index 9343b73..5ed3652 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html
@@ -28,21 +28,21 @@
window.jsTestIsAsync = true;
const mediaControls = new MacOSFullscreenMediaControls;
-const centerContainer = mediaControls.controlsBar.children[2];
-const rightContainer = mediaControls.controlsBar.children[3];
-const buttons = centerContainer.buttons.concat(rightContainer.buttons);
+const centerContainer = mediaControls.bottomControlsBar.children[2];
+const rightContainer = mediaControls.bottomControlsBar.children[3];
+const buttons = centerContainer.children.concat(rightContainer.children);
document.getElementById("container").appendChild(mediaControls.element);
debug("");
shouldBecomeEqual("centerContainer.element.getBoundingClientRect().width", "178", () => {
shouldBe("centerContainer.element.getBoundingClientRect().left", "311");
- shouldBe("centerContainer.element.getBoundingClientRect().top", "500");
+ shouldBe("centerContainer.element.getBoundingClientRect().top", "503");
shouldBe("centerContainer.element.getBoundingClientRect().height", "44");
debug("");
- shouldBecomeEqual("Math.floor(rightContainer.element.getBoundingClientRect().width)", "138", () => {
- shouldBeCloseTo("rightContainer.element.getBoundingClientRect().left", 496, 0.5);
+ shouldBecomeEqual("Math.floor(rightContainer.element.getBoundingClientRect().width)", "140", () => {
+ shouldBeCloseTo("rightContainer.element.getBoundingClientRect().left", 494, 0.5);
shouldBe("rightContainer.element.getBoundingClientRect().top", "500");
shouldBe("rightContainer.element.getBoundingClientRect().height", "44");
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt
index dc949d1..8b97403 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt
@@ -5,24 +5,24 @@
RewindButton
-PASS getComputedStyle(button.element).top became "17px"
+PASS getComputedStyle(button.element).top became "14px"
PASS getComputedStyle(button.element).left is "27px"
PASS getComputedStyle(button.element).height is "16px"
PlayPauseButton
-PASS getComputedStyle(button.element).top became "12px"
+PASS getComputedStyle(button.element).top became "9px"
PASS getComputedStyle(button.element).left is "78px"
PASS getComputedStyle(button.element).height is "26px"
ForwardButton
-PASS getComputedStyle(button.element).top became "17px"
+PASS getComputedStyle(button.element).top became "14px"
PASS getComputedStyle(button.element).left is "127px"
PASS getComputedStyle(button.element).height is "16px"
AirplayButton
PASS getComputedStyle(button.element).top became "18px"
PASS getComputedStyle(button.element).left is "12px"
-PASS getComputedStyle(button.element).height is "14px"
+PASS getComputedStyle(button.element).height is "13px"
PiPButton
PASS getComputedStyle(button.element).top became "18px"
@@ -32,12 +32,12 @@
TracksButton
PASS getComputedStyle(button.element).top became "18px"
PASS getComputedStyle(button.element).left is "79px"
-PASS getComputedStyle(button.element).height is "14px"
+PASS getComputedStyle(button.element).height is "13px"
FullscreenButton
PASS getComputedStyle(button.element).top became "18px"
-PASS getComputedStyle(button.element).left is "111px"
-PASS getComputedStyle(button.element).height is "18px"
+PASS getComputedStyle(button.element).left is "112px"
+PASS getComputedStyle(button.element).height is "16px"
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html
index 715ed46..695f282 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html
@@ -12,13 +12,13 @@
document.body.appendChild(mediaControls.element);
const buttonPositions = [
- [mediaControls.rewindButton, 27, 17, 16],
- [mediaControls.playPauseButton, 78, 12, 26],
- [mediaControls.forwardButton, 127, 17, 16],
- [mediaControls.airplayButton, 12, 18, 14],
+ [mediaControls.rewindButton, 27, 14, 16],
+ [mediaControls.playPauseButton, 78, 9, 26],
+ [mediaControls.forwardButton, 127, 14, 16],
+ [mediaControls.airplayButton, 12, 18, 13],
[mediaControls.pipButton, 44, 18, 16],
- [mediaControls.tracksButton, 79, 18, 14],
- [mediaControls.fullscreenButton, 111, 18, 18]
+ [mediaControls.tracksButton, 79, 18, 13],
+ [mediaControls.fullscreenButton, 112, 18, 16]
];
let button, x, y;
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt
index 4319035..52a1a588 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt
@@ -8,31 +8,31 @@
PASS mediaControls.layoutTraits is LayoutTraits.macOS | LayoutTraits.Fullscreen
Controls bar
-PASS mediaControls.controlsBar.children.length is 4
-PASS mediaControls.controlsBar.children[1] instanceof ButtonsContainer is true
-PASS mediaControls.controlsBar.children[2] instanceof ButtonsContainer is true
-PASS mediaControls.controlsBar.children[3] instanceof ButtonsContainer is true
+PASS mediaControls.bottomControlsBar.children.length is 4
+PASS mediaControls.bottomControlsBar.children[1] instanceof ButtonsContainer is true
+PASS mediaControls.bottomControlsBar.children[2] instanceof ButtonsContainer is true
+PASS mediaControls.bottomControlsBar.children[3] instanceof ButtonsContainer is true
Left container
-PASS mediaControls.controlsBar.children[1].buttons is [mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]
-PASS mediaControls.controlsBar.children[1].element.className is "buttons-container left"
-PASS mediaControls.controlsBar.children[1].leftMargin is 12
-PASS mediaControls.controlsBar.children[1].rightMargin is 0
-PASS mediaControls.controlsBar.children[1].buttonMargin is 6
+PASS mediaControls.bottomControlsBar.children[1].children is [mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]
+PASS mediaControls.bottomControlsBar.children[1].element.className is "buttons-container left"
+PASS mediaControls.bottomControlsBar.children[1].leftMargin is 12
+PASS mediaControls.bottomControlsBar.children[1].rightMargin is 0
+PASS mediaControls.bottomControlsBar.children[1].buttonMargin is 6
Center container
-PASS mediaControls.controlsBar.children[2].buttons is [mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]
-PASS mediaControls.controlsBar.children[2].element.className is "buttons-container center"
-PASS mediaControls.controlsBar.children[2].leftMargin is 27
-PASS mediaControls.controlsBar.children[2].rightMargin is 27
-PASS mediaControls.controlsBar.children[2].buttonMargin is 27
+PASS mediaControls.bottomControlsBar.children[2].children is [mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]
+PASS mediaControls.bottomControlsBar.children[2].element.className is "buttons-container center"
+PASS mediaControls.bottomControlsBar.children[2].leftMargin is 27
+PASS mediaControls.bottomControlsBar.children[2].rightMargin is 27
+PASS mediaControls.bottomControlsBar.children[2].buttonMargin is 27
Right container
-PASS mediaControls.controlsBar.children[3].buttons is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
-PASS mediaControls.controlsBar.children[3].element.className is "buttons-container right"
-PASS mediaControls.controlsBar.children[3].leftMargin is 12
-PASS mediaControls.controlsBar.children[3].rightMargin is 12
-PASS mediaControls.controlsBar.children[3].buttonMargin is 24
+PASS mediaControls.bottomControlsBar.children[3].children is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
+PASS mediaControls.bottomControlsBar.children[3].element.className is "buttons-container right"
+PASS mediaControls.bottomControlsBar.children[3].leftMargin is 12
+PASS mediaControls.bottomControlsBar.children[3].rightMargin is 12
+PASS mediaControls.bottomControlsBar.children[3].buttonMargin is 16
PASS successfullyParsed is true
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html
index a5687f6..b9b8ac2 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html
@@ -13,34 +13,34 @@
debug("");
debug("Controls bar");
-shouldBe("mediaControls.controlsBar.children.length", "4");
-shouldBeTrue("mediaControls.controlsBar.children[1] instanceof ButtonsContainer");
-shouldBeTrue("mediaControls.controlsBar.children[2] instanceof ButtonsContainer");
-shouldBeTrue("mediaControls.controlsBar.children[3] instanceof ButtonsContainer");
+shouldBe("mediaControls.bottomControlsBar.children.length", "4");
+shouldBeTrue("mediaControls.bottomControlsBar.children[1] instanceof ButtonsContainer");
+shouldBeTrue("mediaControls.bottomControlsBar.children[2] instanceof ButtonsContainer");
+shouldBeTrue("mediaControls.bottomControlsBar.children[3] instanceof ButtonsContainer");
debug("");
debug("Left container");
-shouldBe("mediaControls.controlsBar.children[1].buttons", "[mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]");
-shouldBeEqualToString("mediaControls.controlsBar.children[1].element.className", "buttons-container left");
-shouldBe("mediaControls.controlsBar.children[1].leftMargin", "12");
-shouldBe("mediaControls.controlsBar.children[1].rightMargin", "0");
-shouldBe("mediaControls.controlsBar.children[1].buttonMargin", "6");
+shouldBe("mediaControls.bottomControlsBar.children[1].children", "[mediaControls.volumeDownButton, mediaControls.volumeSlider, mediaControls.volumeUpButton]");
+shouldBeEqualToString("mediaControls.bottomControlsBar.children[1].element.className", "buttons-container left");
+shouldBe("mediaControls.bottomControlsBar.children[1].leftMargin", "12");
+shouldBe("mediaControls.bottomControlsBar.children[1].rightMargin", "0");
+shouldBe("mediaControls.bottomControlsBar.children[1].buttonMargin", "6");
debug("");
debug("Center container");
-shouldBe("mediaControls.controlsBar.children[2].buttons", "[mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]");
-shouldBeEqualToString("mediaControls.controlsBar.children[2].element.className", "buttons-container center");
-shouldBe("mediaControls.controlsBar.children[2].leftMargin", "27");
-shouldBe("mediaControls.controlsBar.children[2].rightMargin", "27");
-shouldBe("mediaControls.controlsBar.children[2].buttonMargin", "27");
+shouldBe("mediaControls.bottomControlsBar.children[2].children", "[mediaControls.rewindButton, mediaControls.playPauseButton, mediaControls.forwardButton]");
+shouldBeEqualToString("mediaControls.bottomControlsBar.children[2].element.className", "buttons-container center");
+shouldBe("mediaControls.bottomControlsBar.children[2].leftMargin", "27");
+shouldBe("mediaControls.bottomControlsBar.children[2].rightMargin", "27");
+shouldBe("mediaControls.bottomControlsBar.children[2].buttonMargin", "27");
debug("");
debug("Right container");
-shouldBe("mediaControls.controlsBar.children[3].buttons", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
-shouldBeEqualToString("mediaControls.controlsBar.children[3].element.className", "buttons-container right");
-shouldBe("mediaControls.controlsBar.children[3].leftMargin", "12");
-shouldBe("mediaControls.controlsBar.children[3].rightMargin", "12");
-shouldBe("mediaControls.controlsBar.children[3].buttonMargin", "24");
+shouldBe("mediaControls.bottomControlsBar.children[3].children", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
+shouldBeEqualToString("mediaControls.bottomControlsBar.children[3].element.className", "buttons-container right");
+shouldBe("mediaControls.bottomControlsBar.children[3].leftMargin", "12");
+shouldBe("mediaControls.bottomControlsBar.children[3].rightMargin", "12");
+shouldBe("mediaControls.bottomControlsBar.children[3].buttonMargin", "16");
debug("");
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt
index 60f24c9..e3cc76e 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles-expected.txt
@@ -3,6 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS document.body.contains(mediaControls.bottomControlsBar.element) became true
PASS style.bottom is "25px"
PASS style.width is "468px"
PASS style.height is "75px"
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html
index d2e9c82..779dae9 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-controls-bar-styles.html
@@ -21,14 +21,12 @@
window.jsTestIsAsync = true;
const mediaControls = new MacOSFullscreenMediaControls;
+document.getElementById("container").appendChild(mediaControls.element);
let style, bounds;
-scheduler.frameDidFire = function()
-{
- document.getElementById("container").appendChild(mediaControls.element);
-
- style = window.getComputedStyle(mediaControls.controlsBar.element);
- bounds = mediaControls.controlsBar.element.getBoundingClientRect();
+shouldBecomeEqual("document.body.contains(mediaControls.bottomControlsBar.element)", "true", () => {
+ style = window.getComputedStyle(mediaControls.bottomControlsBar.element);
+ bounds = mediaControls.bottomControlsBar.element.getBoundingClientRect();
shouldBeEqualToString("style.bottom", "25px");
shouldBeEqualToString("style.width", "468px");
@@ -44,7 +42,7 @@
debug("");
finishMediaControlsTest();
-};
+});
</script>
<script src="../../../resources/js-test-post.js"></script>
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html
index 1ca2c8f..fb7bf98 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html
@@ -9,7 +9,7 @@
window.jsTestIsAsync = true;
const mediaControls = new MacOSFullscreenMediaControls;
-const rightContainer = mediaControls.controlsBar.children[3];
+const rightContainer = mediaControls.bottomControlsBar.children[3];
let numberOfFrames = 0;
scheduler.frameDidFire = function()
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt
index 628632a..a1f749a 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt
@@ -3,10 +3,10 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS window.getComputedStyle(mediaControls.timeControl.element).width became "457px"
+PASS window.getComputedStyle(mediaControls.timeControl.element).width became "448px"
PASS window.getComputedStyle(mediaControls.timeControl.element).left is "10px"
-PASS window.getComputedStyle(mediaControls.timeControl.element).top is "48px"
-PASS window.getComputedStyle(mediaControls.timeControl.scrubber.element).top is "-3px"
+PASS window.getComputedStyle(mediaControls.timeControl.element).top is "49px"
+PASS window.getComputedStyle(mediaControls.timeControl.scrubber.element).top is "0px"
PASS window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).fontSize is "12px"
PASS window.getComputedStyle(mediaControls.timeControl.remainingTimeLabel.element).fontSize is "12px"
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html
index 5910f3f..9ca77b5 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html
@@ -11,10 +11,10 @@
const mediaControls = new MacOSFullscreenMediaControls;
document.body.appendChild(mediaControls.element);
-shouldBecomeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).width", "457px", () => {
+shouldBecomeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).width", "448px", () => {
shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).left", "10px");
- shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).top", "48px");
- shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.scrubber.element).top", "-3px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).top", "49px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.scrubber.element).top", "0px");
shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).fontSize", "12px");
shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.remainingTimeLabel.element).fontSize", "12px");
debug("");
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt
index e6aea4d..e7df6ad 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles-expected.txt
@@ -4,7 +4,9 @@
PASS window.getComputedStyle(mediaControls.volumeSlider.element).left became "30px"
-PASS window.getComputedStyle(mediaControls.volumeSlider.element).top is "19px"
+PASS window.getComputedStyle(mediaControls.volumeSlider.element).top is "0px"
+PASS window.getComputedStyle(mediaControls.volumeSlider.element).width is "60px"
+PASS window.getComputedStyle(mediaControls.volumeSlider.element).height is "16px"
PASS successfullyParsed is true
diff --git a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html
index e1d1a8a..5ae144d 100644
--- a/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html
+++ b/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-styles.html
@@ -12,7 +12,9 @@
document.body.appendChild(mediaControls.element);
shouldBecomeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).left", "30px", () => {
- shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).top", "19px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).top", "0px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).width", "60px");
+ shouldBeEqualToString("window.getComputedStyle(mediaControls.volumeSlider.element).height", "16px");
mediaControls.element.remove();
debug("");
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 3e77bdc..6dbf577 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1461,9 +1461,7 @@
media/modern-media-controls/layout-item [ Pass ]
media/modern-media-controls/layout-node [ Pass ]
media/modern-media-controls/localized-strings [ 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/macos-fullscreen-media-controls/macos-fullscreen-media-controls-volume-controls-hidden-when-mute-button-disabled.html [ Pass ]
+media/modern-media-controls/macos-fullscreen-media-controls [ Pass ]
media/modern-media-controls/macos-inline-media-controls [ Pass ]
media/modern-media-controls/media-controller [ Pass ]
media/modern-media-controls/media-controls [ Pass ]
