Attachment 348814 Details for Bug 189259 – Patch

[patch] Patch

bug-189259-20180904153343.patch (text/plain), 5.49 KB, created by Antoine Quint on 2018-09-04 06:33:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2018-09-04 06:33:45 PDT

Size: 5.49 KB

patch

obsolete

>Subversion Revision: 235590
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 618188fb426a90c19e078225ecf677482865068a..464716e79b3c51397056accbbc5cec2181101798 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-04  Antoine Quint  <graouts@apple.com>
>+
>+        [Modern Media Controls] Disabling both fullscreen and picture-in-picture shows an empty top left container
>+        https://bugs.webkit.org/show_bug.cgi?id=189259
>+        <rdar://problem/42026625>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip.html
>+
>+        Ensure the top left controls bar is hidden when none of its children are visible.
>+
>+        * Modules/modern-media-controls/controls/inline-media-controls.js:
>+        (InlineMediaControls.prototype.layout):
>+
> 2018-09-02  Zalan Bujtas  <zalan@apple.com>
> 
>         REGRESSION (r191336): RenderFlexibleBox::adjustChildSizeForMinAndMax crashes in std::optional<>::value()
>diff --git a/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js b/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js
>index ac487abcdbbbe6a335e3e2a28c440a0a058b014f..0de34b587b132a4a335d5199e9076f1536da9612 100644
>--- a/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js
>+++ b/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js
>@@ -134,7 +134,7 @@ class InlineMediaControls extends MediaControls
>         this._topLeftControlsBarContainer.children = this._topLeftContainerButtons();
>         this._topLeftControlsBarContainer.layout();
>         this.topLeftControlsBar.width = this._topLeftControlsBarContainer.width;
>-        this.topLeftControlsBar.visible = this._topLeftControlsBarContainer.children.length > 0;
>+        this.topLeftControlsBar.visible = this._topLeftControlsBarContainer.children.some(button => button.visible);
> 
>         // Compute the visible size for the controls bar.
>         this.bottomControlsBar.width = this._shouldUseAudioLayout ? this.width : (this.width - 2 * InsideMargin);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 22914b3aec5d9f14e53eab7426303741d0f50055..91c6d6a1b828d5e98e2d98a0e72d4b5e7b0c3c3b 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-04  Antoine Quint  <graouts@apple.com>
>+
>+        [Modern Media Controls] Disabling both fullscreen and picture-in-picture shows an empty top left container
>+        https://bugs.webkit.org/show_bug.cgi?id=189259
>+        <rdar://problem/42026625>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adding a new test that checks that the top left container is hidden when both the fullscreen and picture-in-picture buttons are disabled.
>+
>+        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip-expected.txt: Added.
>+        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip.html: Added.
>+
> 2018-09-02  Zalan Bujtas  <zalan@apple.com>
> 
>         REGRESSION (r191336): RenderFlexibleBox::adjustChildSizeForMinAndMax crashes in std::optional<>::value()
>diff --git a/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip-expected.txt b/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..2112e22544e1a6c74d8a95b32e5a030300d7350f
>--- /dev/null
>+++ b/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip-expected.txt
>@@ -0,0 +1,10 @@
>+Testing MacOSInlineMediaControls with disabled fullscreen and picture-in-picture buttons.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS mediaControls.topLeftControlsBar.visible is false
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip.html b/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ff0a851fa4eb7b9bda0db314c6d0be0740a53cd1
>--- /dev/null
>+++ b/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-disabled-fullscreen-and-pip.html
>@@ -0,0 +1,19 @@
>+<script src="../../../resources/js-test-pre.js"></script>
>+<script src="../resources/media-controls-loader.js" type="text/javascript"></script>
>+<script src="../resources/media-controls-utils.js" type="text/javascript"></script>
>+<body>
>+<script type="text/javascript">
>+
>+description("Testing <code>MacOSInlineMediaControls</code> with disabled fullscreen and picture-in-picture buttons.");
>+
>+const mediaControls = new MacOSInlineMediaControls({ width: 680, height: 300 });
>+
>+// Disabling both the fullscreen and picture-and-picture buttons should make the top left controls bar have no visible
>+// buttons and thus have its visible property set to false.
>+mediaControls.fullscreenButton.enabled = false;
>+mediaControls.pipButton.enabled = false;
>+shouldBeFalse("mediaControls.topLeftControlsBar.visible");
>+
>+</script>
>+<script src="../../../resources/js-test-post.js"></script>
>+</body>

Flags:

dino: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189259: 348814