Title: [197133] trunk/Source/WebKit2
- Revision
- 197133
- Author
- adac...@apple.com
- Date
- 2016-02-25 14:37:15 -0800 (Thu, 25 Feb 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197132 => 197133)
--- trunk/Source/WebKit2/ChangeLog 2016-02-25 22:24:32 UTC (rev 197132)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-25 22:37:15 UTC (rev 197133)
@@ -1,3 +1,14 @@
+2016-02-25 Ada Chan <adac...@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 <barraclo...@apple.com>
Should template RefCounter instead of RefCounter::Token
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (197132 => 197133)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-02-25 22:24:32 UTC (rev 197132)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-02-25 22:37:15 UTC (rev 197133)
@@ -1735,6 +1735,14 @@
m_client.showPage(toAPI(page), m_client.base.clientInfo);
}
+ 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
{
if (!m_client.close)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (197132 => 197133)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2016-02-25 22:24:32 UTC (rev 197132)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2016-02-25 22:37:15 UTC (rev 197133)
@@ -102,6 +102,7 @@
typedef void (*WKCheckUserMediaPermissionCallback)(WKPageRef page, WKFrameRef frame, WKSecurityOriginRef userMediaDocumentOrigin, WKSecurityOriginRef topLevelDocumentOrigin, WKUserMediaPermissionCheckRef devicesRequest, const void *clientInfo);
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
typedef WKPageRef (*WKPageCreateNewPageCallback_deprecatedForUseWithV0)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
@@ -632,6 +633,7 @@
// Version 7.
WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
+ WKFullscreenMayReturnToInlineCallback fullscreenMayReturnToInline;
} WKPageUIClientV7;
#ifdef __cplusplus
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
