Title: [200595] trunk/Source
- Revision
- 200595
- Author
- [email protected]
- Date
- 2016-05-09 15:50:34 -0700 (Mon, 09 May 2016)
Log Message
Introduce WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() and use it in WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen()
https://bugs.webkit.org/show_bug.cgi?id=157493
Reviewed by Dan Bernstein.
Source/WebCore:
* platform/mac/WebVideoFullscreenInterfaceMac.h:
* platform/mac/WebVideoFullscreenInterfaceMac.mm:
(WebCore::WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen):
Source/WebKit2:
* UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
(WebKit::WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200594 => 200595)
--- trunk/Source/WebCore/ChangeLog 2016-05-09 22:01:30 UTC (rev 200594)
+++ trunk/Source/WebCore/ChangeLog 2016-05-09 22:50:34 UTC (rev 200595)
@@ -1,3 +1,14 @@
+2016-05-09 Ada Chan <[email protected]>
+
+ Introduce WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() and use it in WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen()
+ https://bugs.webkit.org/show_bug.cgi?id=157493
+
+ Reviewed by Dan Bernstein.
+
+ * platform/mac/WebVideoFullscreenInterfaceMac.h:
+ * platform/mac/WebVideoFullscreenInterfaceMac.mm:
+ (WebCore::WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen):
+
2016-05-09 Simon Fraser <[email protected]>
Clean up iOS text autosizing code
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h (200594 => 200595)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-05-09 22:01:30 UTC (rev 200594)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-05-09 22:50:34 UTC (rev 200595)
@@ -93,6 +93,8 @@
void setMode(HTMLMediaElementEnums::VideoFullscreenMode);
void clearMode(HTMLMediaElementEnums::VideoFullscreenMode);
+ bool isPlayingVideoInEnhancedFullscreen() const;
+
WEBCORE_EXPORT bool mayAutomaticallyShowVideoPictureInPicture() const { return false; }
void applicationDidBecomeActive() { }
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (200594 => 200595)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-05-09 22:01:30 UTC (rev 200594)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-05-09 22:50:34 UTC (rev 200595)
@@ -167,6 +167,11 @@
{
}
+bool WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() const
+{
+ return false;
+}
+
bool supportsPictureInPicture()
{
return false;
Modified: trunk/Source/WebKit2/ChangeLog (200594 => 200595)
--- trunk/Source/WebKit2/ChangeLog 2016-05-09 22:01:30 UTC (rev 200594)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-09 22:50:34 UTC (rev 200595)
@@ -1,3 +1,13 @@
+2016-05-09 Ada Chan <[email protected]>
+
+ Introduce WebVideoFullscreenInterfaceMac::isPlayingVideoInEnhancedFullscreen() and use it in WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen()
+ https://bugs.webkit.org/show_bug.cgi?id=157493
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm:
+ (WebKit::WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen):
+
2016-05-06 Ada Chan <[email protected]>
Add WKPageRef SPI to tell whether there's a video playing in enhanced fullscreen
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm (200594 => 200595)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-09 22:01:30 UTC (rev 200594)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebVideoFullscreenManagerProxy.mm 2016-05-09 22:50:34 UTC (rev 200595)
@@ -250,11 +250,12 @@
#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
bool WebVideoFullscreenManagerProxy::isPlayingVideoInEnhancedFullscreen() const
{
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebVideoFullscreenManagerProxyIsPlayingVideoInEnhancedFullscreenAdditions.mm>
-#else
+ for (auto& tuple : m_contextMap.values()) {
+ if (std::get<1>(tuple)->isPlayingVideoInEnhancedFullscreen())
+ return true;
+ }
+
return false;
-#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
