Attachment 344921 Details for Bug 186226 – Patch for landing.

[patch] Patch for landing.

bug-186226-20180712200952.patch (text/plain), 24.38 KB, created by Jeremy Jones on 2018-07-12 20:09:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Jones

Created: 2018-07-12 20:09:53 PDT

Size: 24.38 KB

patch

obsolete

>Subversion Revision: 233789
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 804d11fd76e7b9cefb446b2a6000cd1d67c983db..8b7902ab7c8f0348e592b2f0666e200216625880 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-06-29  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Fullscreen requires active document.
>+        https://bugs.webkit.org/show_bug.cgi?id=186226
>+        rdar://problem/36187413
>+
>+        Reviewed by Jer Noble.
>+
>+        Test: media/no-fullscreen-when-hidden.html
>+
>+        This change guarantees the document to be visible for both element fullscreen and video fullscreen.
>+
>+        User gesture is not enough to guarantee that the document is visible when fullscreen is initiated
>+        because JavaScript can spin wait before initiating fullscreen. During that spin the page or window might
>+        be hidden.
>+
>+        Document::hidden() can't be relied upon because it won't update while JavaScript spins.
>+
>+        This change adds a sync call to the UI process to get the current UI visibility state.
>+
>+        * dom/Document.cpp:
>+        (WebCore::Document::requestFullScreenForElement):
>+        * html/HTMLMediaElement.cpp:
>+        (WebCore::HTMLMediaElement::enterFullscreen):
>+        * page/ChromeClient.h:
>+
> 2018-07-12  Alex Christensen  <achristensen@webkit.org>
> 
>         Reduce size of WebCore::URL
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 3a8a40f7882a6dded75e2d0ab1a74a0c4e5d849b..30467b3b46a22961bca18cbe4c2e38efd5e7dea8 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,29 @@
>+2018-06-29  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Fullscreen requires active document.
>+        https://bugs.webkit.org/show_bug.cgi?id=186226
>+        rdar://problem/36187413
>+
>+        Reviewed by Jer Noble.
>+
>+        This change guarantees the document to be visible for both element fullscreen and video fullscreen.
>+
>+        User gesture is not enough to guarantee that the document is visible when fullscreen is initiated
>+        because JavaScript can spin wait before initiating fullscreen. During that spin the page or window might
>+        be hidden.
>+
>+        Document::hidden() can't be relied upon because it won't update while JavaScript spins.
>+
>+        This change adds a sync call to the UI process to get the current UI visibility state.
>+
>+        * UIProcess/WebPageProxy.cpp:
>+        (WebKit::WebPageProxy::getIsViewVisible):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
>+        (WebKit::WebChromeClient::isViewVisible):
>+        * WebProcess/WebCoreSupport/WebChromeClient.h:
>+
> 2018-07-12  Alex Christensen  <achristensen@webkit.org>
> 
>         Reduce size of WebCore::URL
>diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
>index 26c30ce2efc0928a5df3e5df5c738936505a3fa6..17863b57e3dcb30b3e77491c7523d36dc7169f95 100644
>--- a/Source/WebCore/dom/Document.cpp
>+++ b/Source/WebCore/dom/Document.cpp
>@@ -6019,6 +6019,10 @@ void Document::requestFullScreenForElement(Element* element, FullScreenCheckType
>         // an event named fullscreenerror with its bubbles attribute set to true on the context object's 
>         // node document:
> 
>+        // Don't allow fullscreen if document is hidden.
>+        if (!page() || !page()->chrome().client().isViewVisible())
>+            break;
>+
>         // The context object is not in a document.
>         if (!element->isConnected())
>             break;
>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index 037d9bfeac3a0b8e8e286a6c320a107815d7e92f..2fe9753142fc6c900f5d1edea53f4417fed0b6c4 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -5910,6 +5910,11 @@ void HTMLMediaElement::enterFullscreen(VideoFullscreenMode mode)
>     if (m_videoFullscreenMode == mode)
>         return;
> 
>+    if (!document().page() || !document().page()->chrome().client().isViewVisible()) {
>+        ALWAYS_LOG(LOGIDENTIFIER, "  returning because document is hidden");
>+        return;
>+    }
>+
>     m_temporarilyAllowingInlinePlaybackAfterFullscreen = false;
>     m_waitingToEnterFullscreen = true;
> 
>@@ -5936,7 +5941,7 @@ void HTMLMediaElement::enterFullscreen(VideoFullscreenMode mode)
>     configureMediaControls();
>     if (hasMediaControls())
>         mediaControls()->enteredFullscreen();
>-    if (document().page() && is<HTMLVideoElement>(*this)) {
>+    if (is<HTMLVideoElement>(*this)) {
>         HTMLVideoElement& asVideo = downcast<HTMLVideoElement>(*this);
>         if (document().page()->chrome().client().supportsVideoFullscreen(m_videoFullscreenMode)) {
>             document().page()->chrome().client().enterVideoFullscreenForVideoElement(asVideo, m_videoFullscreenMode, m_videoFullscreenStandby);
>diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
>index bea0d8f4cb8ad34b1e996ebf318cffb0fb968be7..472b6183fc7bc2dbffbea0a59735e7cab0f50ce9 100644
>--- a/Source/WebCore/page/ChromeClient.h
>+++ b/Source/WebCore/page/ChromeClient.h
>@@ -487,6 +487,8 @@ public:
> 
>     virtual String signedPublicKeyAndChallengeString(unsigned, const String&, const URL&) const { return emptyString(); }
> 
>+    virtual bool isViewVisible() { return true; }
>+
> protected:
>     virtual ~ChromeClient() = default;
> };
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
>index b61153692074f3dd5eefe5b7d2b464956a7d7495..0bd801756f58fc486fdfb746b7c21babb64d6f31 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.cpp
>+++ b/Source/WebKit/UIProcess/WebPageProxy.cpp
>@@ -7828,4 +7828,9 @@ void WebPageProxy::setDefersLoadingForTesting(bool defersLoading)
>     m_process->send(Messages::WebPage::SetDefersLoading(defersLoading), m_pageID);
> }
> 
>+void WebPageProxy::getIsViewVisible(bool& result)
>+{
>+    result = isViewVisible();
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index de21ed0b4ba77fc8257eed8bcbc723c6cacf7393..86a2700a30c134209c54b801bd9087fca555746a 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -1452,6 +1452,7 @@ private:
>     void getMenuBarIsVisible(Messages::WebPageProxy::GetMenuBarIsVisible::DelayedReply&&);
>     void setStatusBarIsVisible(bool statusBarIsVisible);
>     void getStatusBarIsVisible(Messages::WebPageProxy::GetStatusBarIsVisible::DelayedReply&&);
>+    void getIsViewVisible(bool&);
>     void setIsResizable(bool isResizable);
>     void screenToRootView(const WebCore::IntPoint& screenPoint, Messages::WebPageProxy::ScreenToRootView::DelayedReply&&);
>     void rootViewToScreen(const WebCore::IntRect& viewRect, Messages::WebPageProxy::RootViewToScreen::DelayedReply&&);
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>index d9f59107e72209a2db37fc622b6926d0dbb25e2c..93e9529905bd55bdcb6da15dca475c5b1631f0e0 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
>+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>@@ -61,6 +61,7 @@ messages -> WebPageProxy {
>     GetWindowFrame() -> (WebCore::FloatRect windowFrame) Delayed
>     ScreenToRootView(WebCore::IntPoint screenPoint) -> (WebCore::IntPoint windowPoint) Delayed
>     RootViewToScreen(WebCore::IntRect rect) -> (WebCore::IntRect screenFrame) Delayed
>+    GetIsViewVisible() -> (bool result)
> 
> #if PLATFORM(COCOA)
>     ShowValidationMessage(WebCore::IntRect anchorRect, String message)
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
>index 0c955f6771beccbe568f0242479f16301f5d1f4c..c0652f16dcd87f91641d56a47cf92fee3d53a6f5 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp
>@@ -1311,4 +1311,11 @@ void WebChromeClient::requestStorageAccess(String&& subFrameHost, String&& topFr
> }
> #endif
> 
>+bool WebChromeClient::isViewVisible()
>+{
>+    bool isVisible = false;
>+    WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPageProxy::GetIsViewVisible(), Messages::WebPageProxy::GetIsViewVisible::Reply(isVisible), m_page.pageID());
>+    return isVisible;
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
>index 811a822c94534366a75031115e9a0faa93f427d8..e5d8e433e4107032466963eaa8ea45a34987776f 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h
>@@ -367,6 +367,8 @@ private:
>     void requestStorageAccess(String&& subFrameHost, String&& topFrameHost, uint64_t frameID, uint64_t pageID, WTF::CompletionHandler<void (bool)>&&) final;
> #endif
> 
>+    bool isViewVisible() final;
>+
>     String m_cachedToolTip;
>     mutable RefPtr<WebFrame> m_cachedFrameSetLargestFrame;
>     mutable bool m_cachedMainFrameHasHorizontalScrollbar { false };
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 5ffacc6515bfcaced19829d5c9655ffbbbd70c63..7f26463fe2180365f09b58f4a7dbb9f455f0b835 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,37 @@
>+2018-06-29  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Fullscreen requires active document.
>+        https://bugs.webkit.org/show_bug.cgi?id=186226
>+        rdar://problem/36187413
>+
>+        Reviewed by Jer Noble.
>+
>+        This change guarantees the document to be visible for both element fullscreen and video fullscreen.
>+
>+        User gesture is not enough to guarantee that the document is visible when fullscreen is initiated
>+        because JavaScript can spin wait before initiating fullscreen. During that spin the page or window might
>+        be hidden.
>+
>+        Document::hidden() can't be relied upon because it won't update while JavaScript spins.
>+
>+        This change adds a sync call to the UI process to get the current UI visibility state.
>+
>+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
>+        * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
>+        (WTR::TestRunner::setViewVisible):
>+        * WebKitTestRunner/InjectedBundle/TestRunner.h:
>+        * WebKitTestRunner/PlatformWebView.h:
>+        * WebKitTestRunner/TestInvocation.cpp:
>+        (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):
>+        * WebKitTestRunner/gtk/PlatformWebViewGtk.cpp:
>+        (WTR::PlatformWebView::setHidden):
>+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
>+        (WTR::PlatformWebView::setHidden):
>+        * WebKitTestRunner/mac/PlatformWebViewMac.mm:
>+        (WTR::PlatformWebView::setHidden):
>+        * WebKitTestRunner/wpe/PlatformWebViewWPE.cpp:
>+        (WTR::PlatformWebView::setHidden):
>+
> 2018-07-12  Alex Christensen  <achristensen@webkit.org>
> 
>         Reduce size of WebCore::URL
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>index 6c4b9890c5a7b6baf3d79132d8be5ea8369ad7c4..30b61aace2e252cc45612e8f7b3f93ea261f95a7 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>+++ b/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl
>@@ -346,4 +346,6 @@ interface TestRunner {
> 
>     void injectUserScript(DOMString string);
>     readonly attribute unsigned long userScriptInjectedCount;
>+
>+    void setViewVisible(boolean value);
> };
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>index b3af72a49b9b48e6fc09fc4c016b47dd459b0413..c8f2f533a9d5fb93f2187e8c0b36da66a9bf5d6d 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp
>@@ -2044,6 +2044,14 @@ void TestRunner::resetMockMediaDevices()
>     WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), nullptr, nullptr);
> }
> 
>+void TestRunner::setViewVisible(bool value)
>+{
>+    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("SetViewVisible"));
>+    WKRetainPtr<WKBooleanRef> messageBody(AdoptWK, WKBooleanCreate(value));
>+
>+    WKBundlePostSynchronousMessage(InjectedBundle::singleton().bundle(), messageName.get(), messageBody.get(), nullptr);
>+}
>+
> #if PLATFORM(MAC)
> void TestRunner::connectMockGamepad(unsigned index)
> {
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>index 2639b4eed47c97ef8d8479af5940a43602da639d..0050c97c16013484018b9a018f8539ec36af1156 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>+++ b/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
>@@ -453,6 +453,7 @@ public:
>     void clearMockMediaDevices();
>     void removeMockMediaDevice(JSStringRef persistentId);
>     void resetMockMediaDevices();
>+    void setViewVisible(bool value);
> 
>     size_t userScriptInjectedCount() const;
>     void injectUserScript(JSStringRef);
>diff --git a/Tools/WebKitTestRunner/PlatformWebView.h b/Tools/WebKitTestRunner/PlatformWebView.h
>index 40884882053b3389e1287d3c1cb1c071a9af799d..79ef3ee0b69e0af4ef7abb5d14aa47788f57046a 100644
>--- a/Tools/WebKitTestRunner/PlatformWebView.h
>+++ b/Tools/WebKitTestRunner/PlatformWebView.h
>@@ -93,6 +93,7 @@ public:
>     void makeWebViewFirstResponder();
>     void setWindowIsKey(bool);
>     bool windowIsKey() const { return m_windowIsKey; }
>+    void setHidden(bool);
>     
>     void removeFromWindow();
>     void addToWindow();
>diff --git a/Tools/WebKitTestRunner/TestInvocation.cpp b/Tools/WebKitTestRunner/TestInvocation.cpp
>index 9eadd2c1d688f492e757ed36aa9b33848263b1fb..4e23d72bf60c4bcf9b070b7ef59cbe9fcd76d29d 100644
>--- a/Tools/WebKitTestRunner/TestInvocation.cpp
>+++ b/Tools/WebKitTestRunner/TestInvocation.cpp
>@@ -949,6 +949,12 @@ WKRetainPtr<WKTypeRef> TestInvocation::didReceiveSynchronousMessageFromInjectedB
>         return nullptr;
>     }
> 
>+    if (WKStringIsEqualToUTF8CString(messageName, "SetViewVisible")) {
>+        WKBooleanRef value = static_cast<WKBooleanRef>(messageBody);
>+        TestController::singleton().mainWebView()->setHidden(!WKBooleanGetValue(value));
>+        return nullptr;
>+    }
>+
> #if PLATFORM(MAC)
>     if (WKStringIsEqualToUTF8CString(messageName, "ConnectMockGamepad")) {
>         ASSERT(WKGetTypeID(messageBody) == WKUInt64GetTypeID());
>diff --git a/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp b/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>index 47354f800df9c514936adcd6b245b8149301e434..a02eedb9b24331c0328ae3f5ef02d37e268cd914 100644
>--- a/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>+++ b/Tools/WebKitTestRunner/gtk/PlatformWebViewGtk.cpp
>@@ -85,6 +85,10 @@ void PlatformWebView::setWindowIsKey(bool isKey)
>         gtk_main_iteration();
> }
> 
>+void PlatformWebView::setHidden(bool)
>+{
>+}
>+
> void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode sizingMode)
> {
>     WKRect frame = windowFrame();
>diff --git a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>index e852292de2e02013964322f8fac5d4479924f8cd..be322081239b98a2e8f9edb8e95cd05b72ad70be 100644
>--- a/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>+++ b/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm
>@@ -210,6 +210,14 @@ void PlatformWebView::setWindowIsKey(bool isKey)
>         [m_window makeKeyWindow];
> }
> 
>+void PlatformWebView::setHidden(bool value)
>+{
>+    if (value)
>+        [m_view removeFromSuperview];
>+    else
>+        [m_window.rootViewController.view addSubview:m_view];
>+}
>+
> void PlatformWebView::addToWindow()
> {
>     [m_window.rootViewController.view addSubview:m_view];
>diff --git a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>index 82e2d0333ea2f94f94e70d485297c84789d86c56..5dd764fb476ac78b66e5284cf838f7c6e3ef211d 100644
>--- a/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>+++ b/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm
>@@ -169,6 +169,14 @@ void PlatformWebView::setWindowIsKey(bool isKey)
>         [m_window resignKeyWindow];
> }
> 
>+void PlatformWebView::setHidden(bool value)
>+{
>+    if (value)
>+        [m_window orderOut:nil];
>+    else
>+        [m_window orderFront:nil];
>+}
>+
> void PlatformWebView::resizeTo(unsigned width, unsigned height, WebViewSizingMode sizingMode)
> {
>     WKRect frame = windowFrame();
>diff --git a/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp b/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>index 05c65681273344bb6a8e8304d2fd16bc2560ec15..3da11c8f7b290da2bf26e6ed083b4d621ca7c4bc 100644
>--- a/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>+++ b/Tools/WebKitTestRunner/wpe/PlatformWebViewWPE.cpp
>@@ -95,6 +95,10 @@ void PlatformWebView::setWindowIsKey(bool windowIsKey)
>     m_windowIsKey = windowIsKey;
> }
> 
>+void PlatformWebView::setHidden(bool)
>+{
>+}
>+
> void PlatformWebView::makeWebViewFirstResponder()
> {
> }
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1d21286e3a329f226776bdc94780490dc56769ff..c7a5913d7e9b56de34833c5cb6c04fce03d80d01 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-29  Jeremy Jones  <jeremyj@apple.com>
>+
>+        Fullscreen requires active document.
>+        https://bugs.webkit.org/show_bug.cgi?id=186226
>+        rdar://problem/36187413
>+
>+        Reviewed by Jer Noble.
>+
>+        This change guarantees the document to be visible for both element fullscreen and video fullscreen.
>+
>+        User gesture is not enough to guarantee that the document is visible when fullscreen is initiated
>+        because JavaScript can spin wait before initiating fullscreen. During that spin the page or window might
>+        be hidden.
>+
>+        Document::hidden() can't be relied upon because it won't update while JavaScript spins.
>+
>+        This change adds a sync call to the UI process to get the current UI visibility state.
>+
>+        * media/no-fullscreen-when-hidden-expected.txt: Added.
>+        * media/no-fullscreen-when-hidden.html: Added.
>+        * platform/ios-wk1/TestExpectations:
>+        * platform/mac-wk1/TestExpectations:
>+
> 2018-07-12  Youenn Fablet  <youenn@apple.com>
> 
>         Add a FrameLoaderClient willInjectUserScriptForFrame callback
>diff --git a/LayoutTests/media/no-fullscreen-when-hidden-expected.txt b/LayoutTests/media/no-fullscreen-when-hidden-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..2a3f1462db22eee3132ceb466be0ad1d608fbfa9
>--- /dev/null
>+++ b/LayoutTests/media/no-fullscreen-when-hidden-expected.txt
>@@ -0,0 +1,9 @@
>+Fullscreen should be prevented when page is not visible.
>+
>+RUN(testRunner.setViewVisible(false))
>+Attempting to go into Full Screen
>+RUN(video.webkitRequestFullscreen())
>+RUN(video.webkitEnterFullscreen())
>+RUN(divElement.webkitRequestFullscreen())
>+END OF TEST
>+
>diff --git a/LayoutTests/media/no-fullscreen-when-hidden.html b/LayoutTests/media/no-fullscreen-when-hidden.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..9eafd2c272ef7b76f013833102c5fa068fae5f6b
>--- /dev/null
>+++ b/LayoutTests/media/no-fullscreen-when-hidden.html
>@@ -0,0 +1,40 @@
>+<html>
>+<head>
>+    <title>Test fullscreen video going into pip should exit fullscreen</title>
>+    <script src="media-file.js"></script>
>+    <script src="video-test.js"></script>
>+    <script>
>+
>+        var divElement
>+
>+        function init()
>+        {
>+            findMediaElement();
>+            video.addEventListener('canplaythrough', oncanplaythrough);
>+            video.src = findMediaFile('video', 'content/test');
>+            divElement = document.getElementById("divElement");
>+        }
>+
>+        function oncanplaythrough()
>+        {
>+            waitForEventAndFail('webkitpresentationmodechanged');
>+            waitForEventAndFail('webkitbeginfullscreen');
>+            waitForEventAndFail('webkitfullscreenchange');
>+            runWithKeyDown(function(){ 
>+                run('testRunner.setViewVisible(false)');
>+                consoleWrite("Attempting to go into Full Screen");
>+                run('video.webkitRequestFullscreen()'); 
>+                run('video.webkitEnterFullscreen()');
>+                run('divElement.webkitRequestFullscreen()');
>+                endTestLater()
>+            });
>+        }
>+    </script>
>+</head>
>+<body onload="init()">
>+    Fullscreen should be prevented when page is not visible.<br>
>+    <div id="divElement"></div>
>+    <video controls></video>
>+</body>
>+</html>
>+
>diff --git a/LayoutTests/media/video-test.js b/LayoutTests/media/video-test.js
>index 67a356de39cf31b7eab7a565ce14e82054e3e224..c7061e4e963f06d419a74ad7e8b5d0ba0d4adb4e 100644
>--- a/LayoutTests/media/video-test.js
>+++ b/LayoutTests/media/video-test.js
>@@ -439,12 +439,17 @@ function setCaptionDisplayMode(mode)
>         consoleWrite("<br><b>** This test only works in DRT! **<" + "/b><br>");
> }
> 
>+function isIOS()
>+{
>+    return navigator.userAgent.includes('iPhone') || navigator.userAgent.includes('iPad');
>+}
>+
> function runWithKeyDown(fn, preventDefault) 
> {
>     // FIXME: WKTR does not yet support the keyDown() message.  Do a mouseDown here
>     // instead until keyDown support is added.
>-    var eventName = !window.testRunner || eventSender.keyDown ? 'keypress' : 'mousedown'
> 
>+    var eventName = isIOS() ? 'touchstart' : (!window.testRunner || eventSender.keyDown ? 'keypress' : 'mousedown')
>     function thunk(event) {
>         if (preventDefault)
>             event.preventDefault();
>@@ -458,7 +463,15 @@ function runWithKeyDown(fn, preventDefault)
>     document.addEventListener(eventName, thunk, false);
> 
>     if (window.testRunner) {
>-        if (eventSender.keyDown)
>+        if (isIOS() && testRunner.runUIScript) {
>+            var script = `
>+                (function() {
>+                    uiController.singleTapAtPoint(1, 1, function() {
>+                        uiController.uiScriptComplete("Done");
>+                    });
>+                })();`;
>+            testRunner.runUIScript(script, () => { });
>+        } else if (eventSender.keyDown)
>             eventSender.keyDown("a", []);
>         else
>             eventSender.mouseDown();
>diff --git a/LayoutTests/platform/ios-wk1/TestExpectations b/LayoutTests/platform/ios-wk1/TestExpectations
>index ceea3130ad814f7e4eaa897d37b6ac7d00c48d9b..13fa39bd788b528cfec02ef8446ec0a5969c6963 100644
>--- a/LayoutTests/platform/ios-wk1/TestExpectations
>+++ b/LayoutTests/platform/ios-wk1/TestExpectations
>@@ -21,6 +21,9 @@ imported/w3c/web-platform-tests/webrtc [ Skip ]
> webrtc [ Skip ]
> fast/events/constructors/media-stream-event-constructor.html
> 
>+# Not supported on WK1
>+media/no-fullscreen-when-hidden.html [ Skip ]
>+
> # <rdar://problem/6501130> LayoutTests: Enable editing tests after we support editing
> editing/deleting/4922367.html
> editing/deleting/5126166.html
>diff --git a/LayoutTests/platform/ios/TestExpectations b/LayoutTests/platform/ios/TestExpectations
>index 1f6baa2f23270cebc8fbc223ffa6b89b44a3a775..cad3a12f3443665d8388759a5eb0797a16907cf3 100644
>--- a/LayoutTests/platform/ios/TestExpectations
>+++ b/LayoutTests/platform/ios/TestExpectations
>@@ -971,6 +971,7 @@ media/picture-in-picture-interruption.html [ Skip ]
> media/restricted-audio-playback-with-document-gesture.html [ Skip ]
> media/restricted-audio-playback-with-multiple-settimeouts.html [ Skip ]
> media/video-fullscreen-reload-crash.html [ Skip ]
>+media/no-fullscreen-when-hidden.html [ Skip ]
> scrollbars/scrolling-backward-by-page-accounting-bottom-fixed-elements-on-keyboard-spacebar.html [ Skip ]
> scrollbars/scrolling-backward-by-page-on-keyboard-spacebar.html [ Skip ]
> scrollbars/scrolling-by-page-accounting-oversized-fixed-elements-on-keyboard-spacebar.html [ Skip ]
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index 0d0cfce2fda86e5289572e3096cfa24242be2f7e..65b8b95cae57fef434c665b2c8b33f4ccb68b016 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -320,6 +320,9 @@ webkit.org/b/156069 http/tests/download/anchor-download-no-value.html [ Skip ]
> webkit.org/b/156069 imported/w3c/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click.html [ Skip ]
> webkit.org/b/156069 imported/w3c/web-platform-tests/html/semantics/embedded-content/the-area-element/area-download-click.html [ Skip ]
> 
>+# Not supported on WK1
>+media/no-fullscreen-when-hidden.html [ Skip ]
>+
> webkit.org/b/169523 [ Debug ] imported/w3c/web-platform-tests/html/dom/interfaces.worker.html [ Failure ]
> 
> imported/w3c/web-platform-tests/html/browsers/history/the-history-interface/history_go_no_argument.html [ Pass Failure ]

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 186226: 341832 | 341834 | 341835 | 341836 | 341840 | 341868 | 343833 | 343859 | 343873 | 343945 | 343956 | 343957 | 343965 | 343972 | 343985 | 343995 | 344478 | 344494 | 344500 | 344727 | 344733 | 344735 | 344737 | 344739 | 344908 | 344910 | 344916 | 344919 | 344921 | 344923 | 344925 | 345028 | 345030 | 345031 | 345111