Changeset 229494 in webkit

Timestamp:

Mar 9, 2018 5:18:08 PM (6 years ago)

Author:

jer.noble@apple.com

Message:

Unconditionalize more methods in VideoFullscreenInterface (and related classes)
​https://bugs.webkit.org/show_bug.cgi?id=183501
<rdar://problem/38312038>

Unreviewed build fix; add correct pragmas to code referencing m_playbackSessionManager.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::hasActiveVideoForControlsManager const):
(WebKit::WebPageProxy::requestControlledElementID const):
(WebKit::WebPageProxy::isPlayingVideoInEnhancedFullscreen const):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-03-09  Jer Noble  <jer.noble@apple.com>
+
+        Unconditionalize more methods in VideoFullscreenInterface (and related classes)
+        https://bugs.webkit.org/show_bug.cgi?id=183501
+        <rdar://problem/38312038>
+
+        Unreviewed build fix; add correct pragmas to code referencing m_playbackSessionManager.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::hasActiveVideoForControlsManager const):
+        (WebKit::WebPageProxy::requestControlledElementID const):
+        (WebKit::WebPageProxy::isPlayingVideoInEnhancedFullscreen const):
+
 2018-03-09  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6815 +6815 @@
 bool WebPageProxy::hasActiveVideoForControlsManager() const
 {
-#if ENABLE(VIDEO_PRESENTATION_MODE)
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     return m_playbackSessionManager && m_playbackSessionManager->controlsManagerInterface();
 #else
@@ -6824 +6824 @@
 void WebPageProxy::requestControlledElementID() const
 {
-#if ENABLE(VIDEO_PRESENTATION_MODE)
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     if (m_playbackSessionManager)
         m_playbackSessionManager->requestControlledElementID();
@@ -6839 +6839 @@
 bool WebPageProxy::isPlayingVideoInEnhancedFullscreen() const
 {
-#if ENABLE(VIDEO_PRESENTATION_MODE)
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     return m_videoFullscreenManager && m_videoFullscreenManager->isPlayingVideoInEnhancedFullscreen();
 #else