Changeset 261203 in webkit


Ignore:
Timestamp:
May 5, 2020 3:37:36 PM (4 years ago)
Author:
Peng Liu
Message:

Update WebKitTestRunner to support running multiple video fullscreen and Picture-in-Picture tests simultaneously
​https://bugs.webkit.org/show_bug.cgi?id=203723

Reviewed by Jer Noble.

Source/WebCore:

Test: media/video-presentation-mode.html

Add a flag MockVideoPresentationModeEnabled to "internals" for video fullscreen
and picture-in-picture tests.

  • page/ChromeClient.h:

(WebCore::ChromeClient::setMockVideoPresentationModeEnabled):

  • testing/Internals.cpp:

(WebCore::Internals::setMockVideoPresentationModeEnabled):

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit:

When the flag MockVideoPresentationModeEnabled is true, the VideoFullscreenManagerProxy in the UI process
will mock the behavior of the VideoFullscreenInterface[Mac|AVKit].

  • UIProcess/Cocoa/VideoFullscreenManagerProxy.h:

(WebKit::VideoFullscreenManagerProxy::setMockVideoPresentationModeEnabled):

  • UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:

(WebKit::VideoFullscreenManagerProxy::requestHideAndExitFullscreen):
(WebKit::VideoFullscreenManagerProxy::applicationDidBecomeActive):
(WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
(WebKit::VideoFullscreenManagerProxy::setHasVideo):
(WebKit::VideoFullscreenManagerProxy::setVideoDimensions):
(WebKit::VideoFullscreenManagerProxy::enterFullscreen):
(WebKit::VideoFullscreenManagerProxy::exitFullscreen):
(WebKit::VideoFullscreenManagerProxy::exitFullscreenWithoutAnimationToMode):
(WebKit::VideoFullscreenManagerProxy::setInlineRect):
(WebKit::VideoFullscreenManagerProxy::setHasVideoContentLayer):
(WebKit::VideoFullscreenManagerProxy::cleanupFullscreen):
(WebKit::VideoFullscreenManagerProxy::preparedToReturnToInline):
(WebKit::VideoFullscreenManagerProxy::preparedToExitFullscreen):

  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didAttachToRunningProcess):
(WebKit::WebPageProxy::setMockVideoPresentationModeEnabled):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::setMockVideoPresentationModeEnabled):
(WebKit::WebChromeClient::setUpPlaybackControlsManager):
(WebKit::WebChromeClient::clearPlaybackControlsManager):

  • WebProcess/WebCoreSupport/WebChromeClient.h:
  • WebProcess/cocoa/VideoFullscreenManager.h:

Source/WebKitLegacy/mac:

When the flag MockVideoPresentationModeEnabled is true, WebView will ignore the requests to
WebVideoFullscreenController, so that the DumpRenderTree can run multiple video fullscreen
and picture-in-picture tests in parallel.

  • WebCoreSupport/WebChromeClient.h:
  • WebCoreSupport/WebChromeClient.mm:

(WebChromeClient::setMockVideoPresentationModeEnabled):

  • WebView/WebView.mm:
  • WebView/WebViewData.h:
  • WebView/WebViewInternal.h:

LayoutTests:

  • media/video-presentation-mode-expected.txt: Added.
  • media/video-presentation-mode.html: Added.
Location:
trunk
Files:
2 added
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r261193 r261203  
     12020-05-05  Peng Liu  <peng.liu6@apple.com>
     2
     3        Update WebKitTestRunner to support running multiple video fullscreen and Picture-in-Picture tests simultaneously
     4        https://bugs.webkit.org/show_bug.cgi?id=203723
     5
     6        Reviewed by Jer Noble.
     7
     8        * media/video-presentation-mode-expected.txt: Added.
     9        * media/video-presentation-mode.html: Added.
     10
    1112020-05-05  Said Abou-Hallawa  <sabouhallawa@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r261202 r261203  
     12020-05-05  Peng Liu  <peng.liu6@apple.com>
     2
     3        Update WebKitTestRunner to support running multiple video fullscreen and Picture-in-Picture tests simultaneously
     4        https://bugs.webkit.org/show_bug.cgi?id=203723
     5
     6        Reviewed by Jer Noble.
     7
     8        Test: media/video-presentation-mode.html
     9
     10        Add a flag MockVideoPresentationModeEnabled to "internals" for video fullscreen
     11        and picture-in-picture tests.
     12
     13        * page/ChromeClient.h:
     14        (WebCore::ChromeClient::setMockVideoPresentationModeEnabled):
     15        * testing/Internals.cpp:
     16        (WebCore::Internals::setMockVideoPresentationModeEnabled):
     17        * testing/Internals.h:
     18        * testing/Internals.idl:
     19
    1202020-05-05  Darin Adler  <darin@apple.com>
    221

  • trunk/Source/WebCore/page/ChromeClient.h

    r260182 r261203  
    379379#endif
    380380
     381#if ENABLE(VIDEO_PRESENTATION_MODE)
     382    virtual void setMockVideoPresentationModeEnabled(bool) { }
     383#endif
     384
    381385#if USE(COORDINATED_GRAPHICS)
    382386    virtual IntRect visibleRectForTiledBackingStore() const { return IntRect(); }

  • trunk/Source/WebCore/testing/Internals.cpp

    r261113 r261203  
    32763276}
    32773277
     3278#if ENABLE(VIDEO_PRESENTATION_MODE)
     3279void Internals::setMockVideoPresentationModeEnabled(bool enabled)
     3280{
     3281    Document* document = contextDocument();
     3282    if (!document || !document->page())
     3283        return;
     3284
     3285    document->page()->chrome().client().setMockVideoPresentationModeEnabled(enabled);
     3286}
     3287#endif
     3288
    32783289void Internals::setApplicationCacheOriginQuota(unsigned long long quota)
    32793290{

  • trunk/Source/WebCore/testing/Internals.h

    r261153 r261203  
    498498    void setFullscreenControlsHidden(bool);
    499499
     500#if ENABLE(VIDEO_PRESENTATION_MODE)
     501    void setMockVideoPresentationModeEnabled(bool);
     502#endif
     503
    500504    WEBCORE_TESTSUPPORT_EXPORT void setApplicationCacheOriginQuota(unsigned long long);
    501505

  • trunk/Source/WebCore/testing/Internals.idl

    r261113 r261203  
    534534    void setFullscreenControlsHidden(boolean hidden);
    535535
     536    [Conditional=VIDEO_PRESENTATION_MODE] void setMockVideoPresentationModeEnabled(boolean enabled);
     537
    536538    void setApplicationCacheOriginQuota(unsigned long long quota);
    537539

  • trunk/Source/WebKit/ChangeLog

    r261195 r261203  
     12020-05-05  Peng Liu  <peng.liu6@apple.com>
     2
     3        Update WebKitTestRunner to support running multiple video fullscreen and Picture-in-Picture tests simultaneously
     4        https://bugs.webkit.org/show_bug.cgi?id=203723
     5
     6        Reviewed by Jer Noble.
     7
     8        When the flag MockVideoPresentationModeEnabled is true, the VideoFullscreenManagerProxy in the UI process
     9        will mock the behavior of the VideoFullscreenInterface[Mac|AVKit].
     10
     11        * UIProcess/Cocoa/VideoFullscreenManagerProxy.h:
     12        (WebKit::VideoFullscreenManagerProxy::setMockVideoPresentationModeEnabled):
     13        * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
     14        (WebKit::VideoFullscreenManagerProxy::requestHideAndExitFullscreen):
     15        (WebKit::VideoFullscreenManagerProxy::applicationDidBecomeActive):
     16        (WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
     17        (WebKit::VideoFullscreenManagerProxy::setHasVideo):
     18        (WebKit::VideoFullscreenManagerProxy::setVideoDimensions):
     19        (WebKit::VideoFullscreenManagerProxy::enterFullscreen):
     20        (WebKit::VideoFullscreenManagerProxy::exitFullscreen):
     21        (WebKit::VideoFullscreenManagerProxy::exitFullscreenWithoutAnimationToMode):
     22        (WebKit::VideoFullscreenManagerProxy::setInlineRect):
     23        (WebKit::VideoFullscreenManagerProxy::setHasVideoContentLayer):
     24        (WebKit::VideoFullscreenManagerProxy::cleanupFullscreen):
     25        (WebKit::VideoFullscreenManagerProxy::preparedToReturnToInline):
     26        (WebKit::VideoFullscreenManagerProxy::preparedToExitFullscreen):
     27        * UIProcess/WebPageProxy.cpp:
     28        (WebKit::WebPageProxy::didAttachToRunningProcess):
     29        (WebKit::WebPageProxy::setMockVideoPresentationModeEnabled):
     30        * UIProcess/WebPageProxy.h:
     31        * UIProcess/WebPageProxy.messages.in:
     32        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     33        (WebKit::WebChromeClient::setMockVideoPresentationModeEnabled):
     34        (WebKit::WebChromeClient::setUpPlaybackControlsManager):
     35        (WebKit::WebChromeClient::clearPlaybackControlsManager):
     36        * WebProcess/WebCoreSupport/WebChromeClient.h:
     37        * WebProcess/cocoa/VideoFullscreenManager.h:
     38
    1392020-05-05  Per Arne Vollan  <pvollan@apple.com>
    240

  • trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.h

    r261001 r261203  
    131131    bool isVisible() const;
    132132
     133    void setMockVideoPresentationModeEnabled(bool enabled) { m_mockVideoPresentationModeEnabled = enabled; }
     134
    133135    void requestRouteSharingPolicyAndContextUID(uint64_t contextId, CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&&);
    134136
    … …  
    181183    void fullscreenMayReturnToInline(uint64_t contextId);
    182184
     185    bool m_mockVideoPresentationModeEnabled { false };
     186
    183187    WebPageProxy* m_page;
    184188    Ref<PlaybackSessionManagerProxy> m_playbackSessionManagerProxy;

  • trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm

    r261001 r261203  
    151151void VideoFullscreenManagerProxy::requestHideAndExitFullscreen()
    152152{
    153 
    154153}
    155154
    156155void VideoFullscreenManagerProxy::applicationDidBecomeActive()
    157156{
    158 
    159157}
    160158#else
    … …  
    498496    addClientForContext(contextId);
    499497
     498    if (m_mockVideoPresentationModeEnabled) {
     499#if PLATFORM(IOS_FAMILY)
     500        requestVideoContentLayer(contextId);
     501#else
     502        didSetupFullscreen(contextId);
     503#endif
     504        return;
     505    }
     506
    500507    RetainPtr<WKLayerHostView> view = static_cast<WKLayerHostView*>(model->layerHostView());
    501508    if (!view) {
    … …  
    528535{
    529536    MESSAGE_CHECK_CONTEXTID(contextId);
     537    if (m_mockVideoPresentationModeEnabled)
     538        return;
     539
    530540    ensureInterface(contextId).hasVideoChanged(hasVideo);
    531541}
    … …  
    534544{
    535545    MESSAGE_CHECK_CONTEXTID(contextId);
     546    if (m_mockVideoPresentationModeEnabled)
     547        return;
     548
    536549    ensureInterface(contextId).videoDimensionsChanged(videoDimensions);
    537550}
    … …  
    540553{
    541554    MESSAGE_CHECK_CONTEXTID(contextId);
     555    if (m_mockVideoPresentationModeEnabled) {
     556        didEnterFullscreen(contextId);
     557        return;
     558    }
    542559
    543560    auto& interface = ensureInterface(contextId);
    … …  
    564581        return;
    565582
    566 #if PLATFORM(IOS_FAMILY)
    567     ensureInterface(contextId).exitFullscreen(finalRect);
    568 #else
     583#if !PLATFORM(IOS_FAMILY)
    569584    IntRect finalWindowRect;
    570585    m_page->rootViewToWindow(finalRect, finalWindowRect);
     586#endif
     587
     588    if (m_mockVideoPresentationModeEnabled) {
     589#if PLATFORM(IOS_FAMILY)
     590        returnVideoContentLayer(contextId);
     591#else
     592        didExitFullscreen(contextId);
     593#endif
     594        return;
     595    }
     596
     597#if PLATFORM(IOS_FAMILY)
     598    ensureInterface(contextId).exitFullscreen(finalRect);
     599#else
    571600    ensureInterface(contextId).exitFullscreen(finalWindowRect, m_page->platformWindow());
    572601#endif
    … …  
    576605{
    577606    MESSAGE_CHECK_CONTEXTID(contextId);
     607    if (m_mockVideoPresentationModeEnabled)
     608        return;
     609
    578610#if PLATFORM(MAC)
    579611    ensureInterface(contextId).exitFullscreenWithoutAnimationToMode(targetMode);
    … …  
    593625{
    594626    MESSAGE_CHECK_CONTEXTID(contextId);
     627    if (m_mockVideoPresentationModeEnabled)
     628        return;
     629
    595630    ensureInterface(contextId).setInlineRect(inlineRect, visible);
    596631}
    … …  
    599634{
    600635    MESSAGE_CHECK_CONTEXTID(contextId);
     636    if (m_mockVideoPresentationModeEnabled) {
     637        if (value)
     638            didSetupFullscreen(contextId);
     639        else
     640            didExitFullscreen(contextId);
     641
     642        return;
     643    }
     644
    601645    ensureInterface(contextId).setHasVideoContentLayer(value);
    602646}
    … …  
    619663{
    620664    MESSAGE_CHECK_CONTEXTID(contextId);
     665    if (m_mockVideoPresentationModeEnabled) {
     666        didCleanupFullscreen(contextId);
     667        return;
     668    }
     669
    621670    ensureInterface(contextId).cleanupFullscreen();
    622671}
    … …  
    627676    m_page->fullscreenMayReturnToInline();
    628677
    629 #if PLATFORM(IOS_FAMILY)
    630     ensureInterface(contextId).preparedToReturnToInline(visible, inlineRect);
    631 #else
     678#if !PLATFORM(IOS_FAMILY)
    632679    IntRect inlineWindowRect;
    633680    m_page->rootViewToWindow(inlineRect, inlineWindowRect);
     681#endif
     682
     683    if (m_mockVideoPresentationModeEnabled)
     684        return;
     685
     686#if PLATFORM(IOS_FAMILY)
     687    ensureInterface(contextId).preparedToReturnToInline(visible, inlineRect);
     688#else
    634689    ensureInterface(contextId).preparedToReturnToInline(visible, inlineWindowRect, m_page->platformWindow());
    635690#endif
    … …  
    639694{
    640695    MESSAGE_CHECK_CONTEXTID(contextId);
     696    if (m_mockVideoPresentationModeEnabled)
     697        return;
     698
    641699    ensureInterface(contextId).preparedToExitFullscreen();
    642700}

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

    r261107 r261203  
    962962    ASSERT(!m_videoFullscreenManager);
    963963    m_videoFullscreenManager = VideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
     964    if (m_videoFullscreenManager)
     965        m_videoFullscreenManager->setMockVideoPresentationModeEnabled(m_mockVideoPresentationModeEnabled);
    964966#endif
    965967
    … …  
    62256227{
    62266228    return m_videoFullscreenManager.get();
     6229}
     6230
     6231void WebPageProxy::setMockVideoPresentationModeEnabled(bool enabled)
     6232{
     6233    m_mockVideoPresentationModeEnabled = enabled;
     6234    if (m_videoFullscreenManager)
     6235        m_videoFullscreenManager->setMockVideoPresentationModeEnabled(enabled);
    62276236}
    62286237#endif

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

    r261044 r261203  
    528528    PlaybackSessionManagerProxy* playbackSessionManager();
    529529    VideoFullscreenManagerProxy* videoFullscreenManager();
     530    void setMockVideoPresentationModeEnabled(bool);
    530531#endif
    531532
    … …  
    23852386    RefPtr<PlaybackSessionManagerProxy> m_playbackSessionManager;
    23862387    RefPtr<VideoFullscreenManagerProxy> m_videoFullscreenManager;
     2388    bool m_mockVideoPresentationModeEnabled { false };
    23872389#endif
    23882390

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r260752 r261203  
    509509#endif
    510510
     511#if ENABLE(VIDEO_PRESENTATION_MODE)
     512    SetMockVideoPresentationModeEnabled(bool enabled)
     513#endif
     514
    511515#if ENABLE(POINTER_LOCK)
    512516    RequestPointerLock()

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

    r261001 r261203  
    988988}
    989989
    990 void WebChromeClient::setUpPlaybackControlsManager(HTMLMediaElement& mediaElement)
    991 {
    992     m_page.playbackSessionManager().setUpPlaybackControlsManager(mediaElement);
    993 }
    994 
    995 void WebChromeClient::clearPlaybackControlsManager()
    996 {
    997     m_page.playbackSessionManager().clearPlaybackControlsManager();
     990void WebChromeClient::setMockVideoPresentationModeEnabled(bool enabled)
     991{
     992    m_page.send(Messages::WebPageProxy::SetMockVideoPresentationModeEnabled(enabled));
    998993}
    999994
    … …  
    10121007    m_page.videoFullscreenManager().exitVideoFullscreenForVideoElement(videoElement);
    10131008}
     1009
     1010void WebChromeClient::setUpPlaybackControlsManager(HTMLMediaElement& mediaElement)
     1011{
     1012    m_page.playbackSessionManager().setUpPlaybackControlsManager(mediaElement);
     1013}
     1014
     1015void WebChromeClient::clearPlaybackControlsManager()
     1016{
     1017    m_page.playbackSessionManager().clearPlaybackControlsManager();
     1018}
     1019
    10141020#endif
    10151021

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

    r261001 r261203  
    265265    bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
    266266    bool supportsVideoFullscreenStandby() final;
     267    void setMockVideoPresentationModeEnabled(bool) final;
     268    void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool standby) final;
     269    void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
    267270    void setUpPlaybackControlsManager(WebCore::HTMLMediaElement&) final;
    268271    void clearPlaybackControlsManager() final;
    269     void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool standby) final;
    270     void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
    271272#endif
    272273

  • trunk/Source/WebKit/WebProcess/cocoa/VideoFullscreenManager.h

    r260259 r261203  
    116116    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
    117117
    118     // Interface to ChromeClient
     118    // Interface to WebChromeClient
    119119    bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) const;
    120120    bool supportsVideoFullscreenStandby() const;

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r261168 r261203  
     12020-05-05  Peng Liu  <peng.liu6@apple.com>
     2
     3        Update WebKitTestRunner to support running multiple video fullscreen and Picture-in-Picture tests simultaneously
     4        https://bugs.webkit.org/show_bug.cgi?id=203723
     5
     6        Reviewed by Jer Noble.
     7
     8        When the flag MockVideoPresentationModeEnabled is true, WebView will ignore the requests to
     9        WebVideoFullscreenController, so that the DumpRenderTree can run multiple video fullscreen
     10        and picture-in-picture tests in parallel.
     11
     12        * WebCoreSupport/WebChromeClient.h:
     13        * WebCoreSupport/WebChromeClient.mm:
     14        (WebChromeClient::setMockVideoPresentationModeEnabled):
     15        * WebView/WebView.mm:
     16        * WebView/WebViewData.h:
     17        * WebView/WebViewInternal.h:
     18
    1192020-05-05  Darin Adler  <darin@apple.com>
    220

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.h

    r259330 r261203  
    194194#if ENABLE(VIDEO)
    195195    bool supportsVideoFullscreen(WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
     196#if ENABLE(VIDEO_PRESENTATION_MODE)
     197    void setMockVideoPresentationModeEnabled(bool) final;
    196198    void enterVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode, bool standby) final;
    197199    void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
    198200    void exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement&, WebCore::HTMLMediaElementEnums::VideoFullscreenMode) final;
     201#endif
    199202#endif
    200203

  • trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebChromeClient.mm

    r259843 r261203  
    966966}
    967967
     968#if ENABLE(VIDEO_PRESENTATION_MODE)
     969
     970void WebChromeClient::setMockVideoPresentationModeEnabled(bool enabled)
     971{
     972    [m_webView _setMockVideoPresentationModeEnabled:enabled];
     973}
     974
    968975void WebChromeClient::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode mode, bool standby)
    969976{
    … …  
    988995    END_BLOCK_OBJC_EXCEPTIONS;
    989996}
     997
     998#endif // ENABLE(VIDEO_PRESENTATION_MODE)
    990999
    9911000#endif // ENABLE(VIDEO)

  • trunk/Source/WebKitLegacy/mac/WebView/WebView.mm

    r261168 r261203  
    23522352    }
    23532353
    2354 #if ENABLE(VIDEO) && !PLATFORM(IOS_FAMILY)
     2354#if ENABLE(VIDEO_PRESENTATION_MODE) && !PLATFORM(IOS_FAMILY)
    23552355    [self _exitVideoFullscreen];
    23562356#endif
    … …  
    92609260
    92619261#if ENABLE(VIDEO)
     9262
     9263#if ENABLE(VIDEO_PRESENTATION_MODE)
     9264
     9265- (void)_setMockVideoPresentationModeEnabled:(BOOL)enabled
     9266{
     9267    _private->mockVideoPresentationModeEnabled = enabled;
     9268}
     9269
    92629270- (void)_enterVideoFullscreenForVideoElement:(NakedPtr<WebCore::HTMLVideoElement>)videoElement mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode
    92639271{
     9272    if (_private->mockVideoPresentationModeEnabled)
     9273        return;
     9274
    92649275    if (_private->fullscreenController) {
    92659276        if ([_private->fullscreenController videoElement] == videoElement) {
    … …  
    92909301- (void)_exitVideoFullscreen
    92919302{
     9303    if (_private->mockVideoPresentationModeEnabled)
     9304        return;
     9305
    92929306    if (!_private->fullscreenController && _private->fullscreenControllersExiting.isEmpty())
    92939307        return;
    … …  
    93079321}
    93089322
    9309 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
     9323#if PLATFORM(MAC)
    93109324- (BOOL)_hasActiveVideoForControlsInterface
    93119325{
    … …  
    93479361    [self updateTouchBar];
    93489362}
    9349 #endif // PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
     9363
     9364#endif // PLATFORM(MAC)
     9365
     9366#endif // ENABLE(VIDEO_PRESENTATION_MODE)
     9367
    93509368#endif // ENABLE(VIDEO)
    93519369

  • trunk/Source/WebKitLegacy/mac/WebView/WebViewData.h

    r259531 r261203  
    217217
    218218    BOOL allowsUndo;
    219        
     219
    220220    float zoomMultiplier;
    221221    BOOL zoomsTextOnly;
    … …  
    294294#endif
    295295
    296 
    297296#if !PLATFORM(IOS_FAMILY)
    298297    // WebKit has both a global plug-in database and a separate, per WebView plug-in database. Dashboard uses the per WebView database.
    … …  
    325324#endif
    326325
     326#if ENABLE(VIDEO_PRESENTATION_MODE)
     327    BOOL mockVideoPresentationModeEnabled;
     328#endif
     329
    327330#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
    328331    RefPtr<WebCore::PlaybackSessionModelMediaElement> playbackSessionModel;

  • trunk/Source/WebKitLegacy/mac/WebView/WebViewInternal.h

    r256834 r261203  
    274274
    275275#if ENABLE(VIDEO) && defined(__cplusplus)
     276#if ENABLE(VIDEO_PRESENTATION_MODE)
     277- (void)_setMockVideoPresentationModeEnabled:(BOOL)enabled;
    276278- (void)_enterVideoFullscreenForVideoElement:(NakedPtr<WebCore::HTMLVideoElement>)videoElement mode:(WebCore::HTMLMediaElementEnums::VideoFullscreenMode)mode;
    277279- (void)_exitVideoFullscreen;
    278 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
     280#if PLATFORM(MAC)
    279281- (BOOL)_hasActiveVideoForControlsInterface;
    280282- (void)_setUpPlaybackControlsManagerForMediaElement:(NakedRef<WebCore::HTMLMediaElement>)mediaElement;
    281283- (void)_clearPlaybackControlsManager;
     284#endif
    282285#endif
    283286#endif
Note: See TracChangeset for help on using the changeset viewer.