Changeset 197133 in webkit

Timestamp:

Feb 25, 2016, 2:37:15 PM (11 years ago)

Author:

adachan@apple.com

Message:

Hook up fullscreenMayReturnToInline() in WKPageUIClient
​https://bugs.webkit.org/show_bug.cgi?id=154661

Reviewed by Tim Horton.

• UIProcess/API/C/WKPage.cpp:

(WKPageSetPageUIClient):

• UIProcess/API/C/WKPageUIClient.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/API/C/WKPageUIClient.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-25  Ada Chan  <adachan@apple.com>
+
+        Hook up fullscreenMayReturnToInline() in WKPageUIClient
+        https://bugs.webkit.org/show_bug.cgi?id=154661
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageUIClient):
+        * UIProcess/API/C/WKPageUIClient.h:
+
 2016-02-25  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -1736 +1736 @@
         }
 
+        virtual void fullscreenMayReturnToInline(WebPageProxy* page) override
+        {
+            if (!m_client.fullscreenMayReturnToInline)
+                return;
+
+            m_client.fullscreenMayReturnToInline(toAPI(page), m_client.base.clientInfo);
+        }
+
         virtual void close(WebPageProxy* page) override
         {

trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h

@@ -103 +103 @@
 typedef void (*WKPageDidClickAutoFillButtonCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
 typedef void (*WKPageMediaSessionMetadataDidChangeCallback)(WKPageRef page, WKMediaSessionMetadataRef metadata, const void* clientInfo);
+typedef void (*WKFullscreenMayReturnToInlineCallback)(WKPageRef page, const void* clientInfo);
 
 // Deprecated
@@ -633 +634 @@
     // Version 7.
     WKPageRunBeforeUnloadConfirmPanelCallback                           runBeforeUnloadConfirmPanel;
+    WKFullscreenMayReturnToInlineCallback                               fullscreenMayReturnToInline;
 } WKPageUIClientV7;