Changeset 177154 in webkit

Timestamp:

Dec 11, 2014 9:51:25 AM (9 years ago)

Author:

jeremyj-wk@apple.com

Message:

Restore interface state when stopping optimized fullscreen.
​https://bugs.webkit.org/show_bug.cgi?id=139465

Reviewed by Simon Fraser.

• platform/ios/WebVideoFullscreenControllerAVKit.mm:

(-[WebVideoFullscreenController fullscreenMayReturnToInline:]): add empty implementation.

• platform/ios/WebVideoFullscreenInterfaceAVKit.h: add declaration
• platform/ios/WebVideoFullscreenInterfaceAVKit.mm:

(WebVideoFullscreenInterfaceAVKit::enterFullscreen): restore interface context when optimized mode ends.
(WebVideoFullscreenInterfaceAVKit::setIsOptimized): restore interface context when optimized mode ends.

• UIProcess/API/APIUIClient.h:

(API::UIClient::fullscreenMayReturnToInline): added

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h: add declaration
• UIProcess/Cocoa/UIDelegate.h: add declaration
• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate): check for responds to selector
(WebKit::UIDelegate::UIClient::fullscreenMayReturnToInline): added

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::fullscreenMayReturnToInline): added.

• UIProcess/WebPageProxy.h: add declaration
• UIProcess/ios/WebVideoFullscreenManagerProxy.h: add declaration
• UIProcess/ios/WebVideoFullscreenManagerProxy.mm:

(WebKit::WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline): show the tab.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (modified) (3 diffs)
• WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (modified) (1 diff)
• WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/APIUIClient.h (modified) (1 diff)
• WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• WebKit2/UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• WebKit2/UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.h (modified) (1 diff)
• WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h (modified) (1 diff)
• WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-12-09  Jeremy Jones  <jeremyj@apple.com>
+
+        Restore interface state when stopping optimized fullscreen.
+        https://bugs.webkit.org/show_bug.cgi?id=139465
+
+        Reviewed by Simon Fraser.
+
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (-[WebVideoFullscreenController fullscreenMayReturnToInline:]): add empty implementation.
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.h: add declaration
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (WebVideoFullscreenInterfaceAVKit::enterFullscreen): restore interface context when optimized mode ends.
+        (WebVideoFullscreenInterfaceAVKit::setIsOptimized): restore interface context when optimized mode ends.
+
 2014-12-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm

@@ -73 +73 @@
 - (void)didExitFullscreen;
 - (void)didCleanupFullscreen;
+- (void)fullscreenMayReturnToInline;
 @end
 
@@ -83 +84 @@
     virtual void didExitFullscreen() override { [_target didExitFullscreen]; }
     virtual void didCleanupFullscreen() override { [_target didCleanupFullscreen]; }
+    virtual void fullscreenMayReturnToInline() override { [_target fullscreenMayReturnToInline]; }
 };
 
@@ -180 +182 @@
 }
 
+- (void)fullscreenMayReturnToInline
+{
+}
+
 @end
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h

@@ -60 +60 @@
     virtual void didExitFullscreen() = 0;
     virtual void didCleanupFullscreen() = 0;
+    virtual void fullscreenMayReturnToInline() = 0;
 };
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm

@@ -908 +908 @@
                     }
                 });
-            } stopCompletionHandler:^(AVPlayerViewControllerOptimizedFullscreenStopReason) {
+            } stopCompletionHandler:^(AVPlayerViewControllerOptimizedFullscreenStopReason reason) {
                 m_exitCompleted = true;
+                
+                if (m_fullscreenChangeObserver && reason == AVPlayerViewControllerOptimizedFullscreenStopReasonStopped)
+                    m_fullscreenChangeObserver->fullscreenMayReturnToInline();
+
                 if (m_exitRequested) {
                     [m_videoLayerContainer setBackgroundColor:[[getUIColorClass() clearColor] CGColor]];
@@ -1104 +1108 @@
     [m_window setHidden:m_mode & HTMLMediaElement::VideoFullscreenModeOptimized];
     
+    if (m_fullscreenChangeObserver && ~m_mode & HTMLMediaElement::VideoFullscreenModeOptimized)
+        m_fullscreenChangeObserver->fullscreenMayReturnToInline();
+
     if (!m_exitRequested || active)
         return;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-09  Jeremy Jones  <jeremyj@apple.com>
+
+        Restore interface state when stopping optimized fullscreen.
+        https://bugs.webkit.org/show_bug.cgi?id=139465
+
+        Reviewed by Simon Fraser.
+
+        Implement fullscreenMayReturnToInline() to request the client application show the corresponding tab.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::fullscreenMayReturnToInline): added
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h: add declaration
+        * UIProcess/Cocoa/UIDelegate.h: add declaration
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate): check for responds to selector
+        (WebKit::UIDelegate::UIClient::fullscreenMayReturnToInline): added
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::fullscreenMayReturnToInline): added.
+        * UIProcess/WebPageProxy.h: add declaration
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.h: add declaration
+        * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
+        (WebKit::WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline): show the tab.
+
 2014-12-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/APIUIClient.h

@@ -72 +72 @@
     virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
     virtual void showPage(WebKit::WebPageProxy*) { }
+    virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) { }
     virtual void close(WebKit::WebPageProxy*) { }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -46 +46 @@
 
 - (void)_webViewClose:(WKWebView *)webView;
+- (void)_webViewFullscreenMayReturnToInline:(WKWebView *)webView;
 
 #if TARGET_OS_IPHONE

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h

@@ -61 +61 @@
         virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
         virtual void close(WebKit::WebPageProxy*) override;
+        virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) override;
         virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
         virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
@@ -87 +88 @@
         bool webViewPrintFrame : 1;
         bool webViewClose : 1;
+        bool webViewFullscreenMayReturnToInline : 1;
 #if PLATFORM(IOS)
         bool webViewActionsForElementDefaultActions : 1;

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm

@@ -73 +73 @@
     m_delegateMethods.webViewPrintFrame = [delegate respondsToSelector:@selector(_webView:printFrame:)];
     m_delegateMethods.webViewClose = [delegate respondsToSelector:@selector(_webViewClose:)];
+    m_delegateMethods.webViewFullscreenMayReturnToInline = [delegate respondsToSelector:@selector(_webViewFullscreenMayReturnToInline:)];
 #if PLATFORM(IOS)
     m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
@@ -242 +243 @@
 }
 
+void UIDelegate::UIClient::fullscreenMayReturnToInline(WebKit::WebPageProxy*)
+{
+    if (!m_uiDelegate.m_delegateMethods.webViewFullscreenMayReturnToInline)
+        return;
+    
+    auto delegate = m_uiDelegate.m_delegate.get();
+    if (!delegate)
+        return;
+    
+    [(id <WKUIDelegatePrivate>)delegate _webViewFullscreenMayReturnToInline:m_uiDelegate.m_webView];
+}
+    
 #if PLATFORM(IOS)
 RetainPtr<NSArray> UIDelegate::UIClient::actionsForElement(_WKActivatedElementInfo *elementInfo, RetainPtr<NSArray> defaultActions)

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -3090 +3090 @@
 }
 
+void WebPageProxy::fullscreenMayReturnToInline()
+{
+    m_uiClient->fullscreenMayReturnToInline(this);
+}
+
 void WebPageProxy::closePage(bool stopResponsivenessTimer)
 {

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -269 +269 @@
     void setAddsVisitedLinks(bool addsVisitedLinks) { m_addsVisitedLinks = addsVisitedLinks; }
 
+    void fullscreenMayReturnToInline();
+
 #if ENABLE(INSPECTOR)
     WebInspectorProxy* inspector();

trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h

@@ -66 +66 @@
     virtual void didExitFullscreen() override;
     virtual void didCleanupFullscreen() override;
+    virtual void fullscreenMayReturnToInline() override;
     
     // FullscreenModel

trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm

@@ -129 +129 @@
 }
     
+void WebVideoFullscreenManagerProxy::fullscreenMayReturnToInline()
+{
+    m_page->fullscreenMayReturnToInline();
+}
+
 void WebVideoFullscreenManagerProxy::requestExitFullscreen()
 {