Diff
Modified: trunk/LayoutTests/ChangeLog (209519 => 209520)
--- trunk/LayoutTests/ChangeLog 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 04:46:13 UTC (rev 209520)
@@ -1,3 +1,17 @@
+2016-12-07 Antoine Quint <grao...@apple.com>
+
+ [Modern Media Controls] Use a small picture-in-picture button in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165587
+
+ Reviewed by Dean Jackson.
+
+ Rebaseline tests to account for the smaller picture-in-picture button in fullscreen.
+
+ * 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:
+
2016-12-07 Ryan Haddad <ryanhad...@apple.com>
Marking inspector/debugger/async-stack-trace.html as flaky on macOS.
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt (209519 => 209520)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt 2016-12-08 04:46:13 UTC (rev 209520)
@@ -8,9 +8,9 @@
PASS centerContainerBounds.width is 178
PASS centerContainerBounds.height is 44
-PASS rightContainerBounds.left is within 0.5 of 488
+PASS rightContainerBounds.left is within 0.5 of 493
PASS rightContainerBounds.top is 500
-PASS rightContainerBounds.width is within 0.5 of 146
+PASS rightContainerBounds.width is within 0.5 of 141
PASS rightContainerBounds.height is 44
PASS successfullyParsed is true
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html (209519 => 209520)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html 2016-12-08 04:46:13 UTC (rev 209520)
@@ -41,9 +41,9 @@
debug("");
rightContainerBounds = rightContainer.element.getBoundingClientRect();
- shouldBeCloseTo("rightContainerBounds.left", 488, 0.5);
+ shouldBeCloseTo("rightContainerBounds.left", 493, 0.5);
shouldBe("rightContainerBounds.top", "500");
- shouldBeCloseTo("rightContainerBounds.width", 146, 0.5);
+ shouldBeCloseTo("rightContainerBounds.width", 141, 0.5);
shouldBe("rightContainerBounds.height", "44");
mediaControls.element.remove();
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt (209519 => 209520)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt 2016-12-08 04:46:13 UTC (rev 209520)
@@ -29,12 +29,12 @@
PASS style.height is "44px"
TracksButton
-PASS style.left is "87px"
+PASS style.left is "82px"
PASS style.webkitMaskPositionY is "15px"
PASS style.height is "44px"
FullscreenButton
-PASS style.left is "119px"
+PASS style.left is "114px"
PASS style.webkitMaskPositionY is "13px"
PASS style.height is "44px"
Modified: trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html (209519 => 209520)
--- trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html 2016-12-08 04:46:13 UTC (rev 209520)
@@ -16,8 +16,8 @@
[mediaControls.forwardButton, 127, 16],
[mediaControls.airplayButton, 12, 13],
[mediaControls.pipButton, 44, 13],
- [mediaControls.tracksButton, 87, 15],
- [mediaControls.fullscreenButton, 119, 13]
+ [mediaControls.tracksButton, 82, 15],
+ [mediaControls.fullscreenButton, 114, 13]
];
let style;
Modified: trunk/Source/WebCore/ChangeLog (209519 => 209520)
--- trunk/Source/WebCore/ChangeLog 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 04:46:13 UTC (rev 209520)
@@ -1,3 +1,16 @@
+2016-12-07 Antoine Quint <grao...@apple.com>
+
+ [Modern Media Controls] Use a small picture-in-picture button in fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=165587
+
+ Reviewed by Dean Jackson.
+
+ Use a newer, smaller asset for picture-in-picture in fullscreen.
+
+ * Modules/modern-media-controls/controls/icon-service.js:
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png: Added.
+ * Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png: Added.
+
2016-12-07 Dean Jackson <d...@apple.com>
Remove runtime toggle for pointer-lock
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js (209519 => 209520)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/icon-service.js 2016-12-08 04:46:13 UTC (rev 209520)
@@ -44,7 +44,7 @@
VolumeMuted : "volume-mute"
};
-const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.Play];
+const IconsWithFullscreenVariants = [Icons.Airplay, Icons.Tracks, Icons.Pause, Icons.EnterPiP, Icons.Play];
const iconService = new class IconService {
Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png
(Binary files differ)
Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png
===================================================================
--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png 2016-12-08 04:46:13 UTC (rev 209520)
Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@1x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property
Added: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png
(Binary files differ)
Index: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png
===================================================================
--- trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png 2016-12-08 04:27:19 UTC (rev 209519)
+++ trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png 2016-12-08 04:46:13 UTC (rev 209520)
Property changes on: trunk/Source/WebCore/Modules/modern-media-controls/images/macOS/pip-in-fullscr...@2x.png
___________________________________________________________________
Added: svn:mime-type
+image/png
\ No newline at end of property