Merge r220910 - [GTK] Show controls if a video element isn't allowed …

…to play inline. https://bugs.webkit.org/show_bug.cgi?id=141705 Patch by Ms2ger <Ms2ger@gmail.com> on 2017-08-18 Reviewed by Xabier Rodriguez-Calvar. Source/WebCore: Test: covered by media/video-fullscreeen-only-controls.html [sic]. * Modules/mediacontrols/mediaControlsGtk.js: (ControllerGtk.prototype.shouldHaveControls): LayoutTests: * platform/gtk/TestExpectations: enable test for this case.
WebKit · Aug 28, 2017 · 0a06eca · 0a06eca
1 parent 1396651
commit 0a06eca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-18  Ms2ger  <Ms2ger@gmail.com>
+
+        [GTK] Show controls if a video element isn't allowed to play inline.
+        https://bugs.webkit.org/show_bug.cgi?id=141705
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        * platform/gtk/TestExpectations: enable test for this case.
+
 2017-08-17  Antti Koivisto  <antti@apple.com>
 
         RenderListItem - Avoid render tree mutation during layout

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
@@ -920,8 +920,6 @@ webkit.org/b/141699 fast/attachment/attachment-disabled-rendering.html [ Failure
 webkit.org/b/141699 fast/attachment/attachment-rendering.html [ Failure ]
 webkit.org/b/141699 fast/attachment/attachment-respects-css-size.html [ ImageOnlyFailure ]
 
-webkit.org/b/141705 media/video-fullscreeen-only-controls.html [ Failure ]
-
 webkit.org/b/141831 svg/animations/animate-text-nested-transforms.html [ Failure ]
 webkit.org/b/98653  svg/text/lengthAdjust-text-metrics.html [ Failure ]
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2017-08-18  Ms2ger  <Ms2ger@gmail.com>
+
+        [GTK] Show controls if a video element isn't allowed to play inline.
+        https://bugs.webkit.org/show_bug.cgi?id=141705
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Test: covered by media/video-fullscreeen-only-controls.html [sic].
+
+        * Modules/mediacontrols/mediaControlsGtk.js:
+        (ControllerGtk.prototype.shouldHaveControls):
+
 2017-08-17  Antti Koivisto  <antti@apple.com>
 
         RenderListItem - Avoid render tree mutation during layout

diff --git a/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js b/Source/WebCore/Modules/mediacontrols/mediaControlsGtk.js
@@ -56,6 +56,9 @@ ControllerGtk.prototype = {
 
     shouldHaveControls: function()
     {
+        if (!this.isAudio() && !this.host.allowsInlineMediaPlayback)
+            return true;
+
         return this.video.controls || this.isFullScreen();
     },