Changeset 230446 in webkit


Ignore:
Timestamp:
Apr 9, 2018 10:58:57 AM (6 years ago)
Author:
Kocsen Chung
Message:

Cherry-pick r230265. rdar://problem/39179126

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):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@230265 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:
tags/Safari-606.1.12.1/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tags/Safari-606.1.12.1/Source/WebCore/ChangeLog

    r230281 r230446  
     12018-04-09  Kocsen Chung  <kocsen_chung@apple.com>
     2
     3        Cherry-pick r230265. rdar://problem/39179126
     4
     5    Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
     6    https://bugs.webkit.org/show_bug.cgi?id=184309
     7    -and corresponding-
     8    rdar://problem/39179126
     9   
     10    Reviewed by Jer Noble.
     11   
     12    * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     13    (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
     14    (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
     15   
     16   
     17   
     18    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230265 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     19
     20    2018-04-04  Beth Dakin  <bdakin@apple.com>
     21
     22            Fix the !HAVE(AVFOUNDATION_VIDEO_OUTPUT) build
     23            https://bugs.webkit.org/show_bug.cgi?id=184309
     24            -and corresponding-
     25            rdar://problem/39179126
     26
     27            Reviewed by Jer Noble.
     28
     29            * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     30            (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoFullscreenInlineImage):
     31            (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
     32
    1332018-04-04  Jason Marcell  <jmarcell@apple.com>
    234

  • tags/Safari-606.1.12.1/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r230194 r230446  
    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.