Changeset 199951 in webkit


Ignore:
Timestamp:
Apr 23, 2016, 10:37:24 AM (9 years ago)
Author:
mitz@apple.com
Message:

<rdar://problem/25893246> WebKit2 has failed to build: error: use of undeclared identifier 'm_playbackSessionManager'

Fixed the non-AVKit build.

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _isShowingVideoPictureInPicture]):
(-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::fullScreenManager):
(WebKit::WebPageProxy::playbackSessionManager):

  • UIProcess/WebPageProxy.h:
  • UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::applicationDidBecomeActive):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::createScrollingCoordinator):
(WebKit::WebChromeClient::supportsVideoFullscreen):

  • WebProcess/WebCoreSupport/WebChromeClient.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::inspectorUI):
(WebKit::WebPage::playbackSessionManager):

  • WebProcess/WebPage/WebPage.h:
  • WebProcess/cocoa/WebVideoFullscreenManager.h:
  • WebProcess/cocoa/WebVideoFullscreenManager.mm:
Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r199919 r199951  
     12016-04-23  Dan Bernstein  <mitz@apple.com>
     2
     3        <rdar://problem/25893246> WebKit2 has failed to build: error: use of undeclared identifier 'm_playbackSessionManager'
     4
     5        Fixed the non-AVKit build.
     6
     7        * UIProcess/API/Cocoa/WKWebView.mm:
     8        (-[WKWebView _isShowingVideoPictureInPicture]):
     9        (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
     10        * UIProcess/WebPageProxy.cpp:
     11        (WebKit::WebPageProxy::fullScreenManager):
     12        (WebKit::WebPageProxy::playbackSessionManager):
     13        * UIProcess/WebPageProxy.h:
     14        * UIProcess/ios/WebPageProxyIOS.mm:
     15        (WebKit::WebPageProxy::applicationDidBecomeActive):
     16        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     17        (WebKit::WebChromeClient::createScrollingCoordinator):
     18        (WebKit::WebChromeClient::supportsVideoFullscreen):
     19        * WebProcess/WebCoreSupport/WebChromeClient.h:
     20        * WebProcess/WebPage/WebPage.cpp:
     21        (WebKit::WebPage::inspectorUI):
     22        (WebKit::WebPage::playbackSessionManager):
     23        * WebProcess/WebPage/WebPage.h:
     24        * WebProcess/cocoa/WebVideoFullscreenManager.h:
     25        * WebProcess/cocoa/WebVideoFullscreenManager.mm:
     26
    1272016-04-22  Ryan Haddad  <ryanhaddad@apple.com>
    228

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r199593 r199951  
    293293- (BOOL)_isShowingVideoPictureInPicture
    294294{
     295#if !HAVE(AVKIT)
     296    return false;
     297#else
    295298    if (!_page || !_page->videoFullscreenManager())
    296299        return false;
    297300   
    298301    return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
     302#endif
    299303}
    300304

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

    r199903 r199951  
    40454045#endif
    40464046   
    4047 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     4047#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    40484048WebPlaybackSessionManagerProxy* WebPageProxy::playbackSessionManager()
    40494049{

  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r199914 r199951  
    330330    WebFullScreenManagerProxy* fullScreenManager();
    331331#endif
    332 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     332#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    333333    WebPlaybackSessionManagerProxy* playbackSessionManager();
    334334    WebVideoFullscreenManagerProxy* videoFullscreenManager();

  • trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

    r199896 r199951  
    2727#import "WebPageProxy.h"
    2828
    29 #if PLATFORM(IOS) && HAVE(AVKIT)
     29#if PLATFORM(IOS)
    3030
    3131#import "APIUIClient.h"
    … …  
    653653void WebPageProxy::applicationDidBecomeActive()
    654654{
     655#if HAVE(AVKIT)
    655656    if (m_videoFullscreenManager)
    656657        m_videoFullscreenManager->applicationDidBecomeActive();
     658#endif
    657659    m_process->send(Messages::WebPage::ApplicationDidBecomeActive(), m_pageID);
    658660}

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r199839 r199951  
    851851#endif
    852852
    853 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     853#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    854854bool WebChromeClient::supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
    855855{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h

    r199593 r199951  
    243243#endif
    244244
    245 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     245#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    246246    bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) override;
    247247    void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) override;

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r199842 r199951  
    31963196}
    31973197
    3198 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     3198#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    31993199WebPlaybackSessionManager& WebPage::playbackSessionManager()
    32003200{

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r199593 r199951  
    13101310    RefPtr<WebInspector> m_inspector;
    13111311    RefPtr<WebInspectorUI> m_inspectorUI;
    1312 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     1312#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    13131313    RefPtr<WebPlaybackSessionManager> m_playbackSessionManager;
    13141314    RefPtr<WebVideoFullscreenManager> m_videoFullscreenManager;

  • trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h

    r199593 r199951  
    2626#define WebVideoFullscreenManager_h
    2727
    28 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     28#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    2929
    3030#include "MessageReceiver.h"

  • trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm

    r199593 r199951  
    2626#import "WebVideoFullscreenManager.h"
    2727
    28 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     28#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
    2929
    3030#import "Attachment.h"
Note: See TracChangeset for help on using the changeset viewer.