Title: [200592] trunk/Source/WebKit2
- Revision
- 200592
- Author
- adac...@apple.com
- Date
- 2016-05-09 14:53:43 -0700 (Mon, 09 May 2016)
Log Message
Add WKPageRef SPI to tell whether there's a video playing in enhanced fullscreen
https://bugs.webkit.org/show_bug.cgi?id=157434
Reviewed by Darin Adler.
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(WKPageIsPlayingVideoInEnhancedFullscreen):
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::isPlayingVideoInEnhancedFullscreen):
* UIProcess/WebPageProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (200591 => 200592)
--- trunk/Source/WebKit2/ChangeLog 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-09 21:53:43 UTC (rev 200592)
@@ -1,3 +1,20 @@
+2016-05-06 Ada Chan <adac...@apple.com>
+
+ Add WKPageRef SPI to tell whether there's a video playing in enhanced fullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=157434
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (WKPageIsPlayingVideoInEnhancedFullscreen):
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h:
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::isPlayingVideoInEnhancedFullscreen):
+ * UIProcess/WebPageProxy.h:
+
2016-05-09 Anders Carlsson <ander...@apple.com>
Add injected bundle SPI for getting favicon and touch icon URLs
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2016-05-09 21:53:43 UTC (rev 200592)
@@ -59,6 +59,10 @@
WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
WK_EXPORT bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url);
+#if TARGET_OS_MAC
+WK_EXPORT bool WKPageIsPlayingVideoInEnhancedFullscreen(WKPageRef page);
+#endif
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2016-05-09 21:53:43 UTC (rev 200592)
@@ -128,3 +128,10 @@
return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
}
+
+#if PLATFORM(MAC)
+bool WKPageIsPlayingVideoInEnhancedFullscreen(WKPageRef pageRef)
+{
+ return toImpl(pageRef)->isPlayingVideoInEnhancedFullscreen();
+}
+#endif
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.h 2016-05-09 21:53:43 UTC (rev 200592)
@@ -106,6 +106,10 @@
void applicationDidBecomeActive();
bool isVisible() const;
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ bool isPlayingVideoInEnhancedFullscreen() const;
+#endif
+
private:
friend class WebVideoFullscreenModelContext;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-09 21:53:43 UTC (rev 200592)
@@ -247,6 +247,17 @@
return false;
}
+#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+bool WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen() const
+{
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebVideoFullscreenManagerProxyIsPlayingVideoInEnhancedFullscreenAdditions.mm>
+#else
+ return false;
+#endif
+}
+#endif
+
void WebVideoFullscreenManagerProxy::applicationDidBecomeActive()
{
for (auto& tuple : m_contextMap.values())
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-05-09 21:53:43 UTC (rev 200592)
@@ -6068,7 +6068,16 @@
return false;
#endif
}
+
+bool WebPageProxy::isPlayingVideoInEnhancedFullscreen() const
+{
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+ return m_videoFullscreenManager && m_videoFullscreenManager->isPlayingVideoInEnhancedFullscreen();
+#else
+ return false;
#endif
+}
+#endif
#if ENABLE(MEDIA_SESSION)
void WebPageProxy::hasMediaSessionWithActiveMediaElementsDidChange(bool state)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (200591 => 200592)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-05-09 20:41:31 UTC (rev 200591)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-05-09 21:53:43 UTC (rev 200592)
@@ -1026,6 +1026,7 @@
#if PLATFORM(MAC)
void videoControlsManagerDidChange();
bool hasActiveVideoForControlsManager() const;
+ bool isPlayingVideoInEnhancedFullscreen() const;
#endif
#if ENABLE(MEDIA_SESSION)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
