Changeset 230265 in webkit


Ignore:
Timestamp:
Apr 4, 2018 10:43:55 AM (6 years ago)
Author:
Beth Dakin
Message:

Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
​https://bugs.webkit.org/show_bug.cgi?id=184309
-and corresponding-
rdar://problem/39179126

Reviewed by Jer Noble.

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r230262 r230265  
     12018-04-04  Beth Dakin  <bdakin@apple.com>
     2
     3        Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
     4        https://bugs.webkit.org/show_bug.cgi?id=184309
     5        -and corresponding-
     6        rdar://problem/39179126
     7
     8        Reviewed by Jer Noble.
     9
     10        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     11        (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
     12        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
     13
    1142018-04-04  Youenn Fablet  <youenn@apple.com>
    215

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r230194 r230265  
    11691169void MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage()
    11701170{
     1171#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
    11711172    updateLastImage(UpdateType::UpdateSynchronously);
    11721173    m_videoFullscreenLayerManager->updateVideoFullscreenInlineImage(m_lastImage);
     1174#endif
    11731175}
    11741176
    11751177void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer(PlatformLayer* videoFullscreenLayer, Function<void()>&& completionHandler)
    11761178{
     1179#if HAVE(AVFOUNDATION_VIDEO_OUTPUT)
    11771180    updateLastImage(UpdateType::UpdateSynchronously);
    11781181    m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), m_lastImage);
     1182#else
     1183    m_videoFullscreenLayerManager->setVideoFullscreenLayer(videoFullscreenLayer, WTFMove(completionHandler), nil);
     1184#endif
    11791185    updateDisableExternalPlayback();
    11801186}
Note: See TracChangeset for help on using the changeset viewer.