Changeset 260412 in webkit


Ignore:
Timestamp:
Apr 20, 2020 9:06:11 PM (4 years ago)
Author:
Peng Liu
Message:

Fix build failures when video fullscreen and picture-in-picture is disabled
​https://bugs.webkit.org/show_bug.cgi?id=210777

Reviewed by Eric Carlson.

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Wrap video fullscreen and picture-in-picture related code with "#if ENABLE(VIDEO_PRESENTATION_MODE)".

  • Configurations/FeatureDefines.xcconfig:
  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity):

  • platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h:
  • platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm:

(WebCore::VideoLayerManagerObjC::setVideoLayer):
(WebCore::VideoLayerManagerObjC::requiresTextTrackRepresentation const):
(WebCore::VideoLayerManagerObjC::syncTextTrackBounds):
(WebCore::VideoLayerManagerObjC::setTextTrackRepresentation):

Source/WebCore/PAL:

  • Configurations/FeatureDefines.xcconfig:

Source/WebKit:

Wrap video fullscreen and picture-in-picture related code with "#if ENABLE(VIDEO_PRESENTATION_MODE)".

  • Configurations/FeatureDefines.xcconfig:
  • GPUProcess/media/RemoteMediaPlayerProxy.cpp:

(WebKit::RemoteMediaPlayerProxy::setVideoFullscreenGravity):
(WebKit::RemoteMediaPlayerProxy::updateVideoFullscreenInlineImage):
(WebKit::RemoteMediaPlayerProxy::setVideoFullscreenMode):
(WebKit::RemoteMediaPlayerProxy::videoFullscreenStandbyChanged):
(WebKit::RemoteMediaPlayerProxy::setBufferingPolicy):

  • GPUProcess/media/RemoteMediaPlayerProxy.h:
  • GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
  • GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm:

(WebKit::RemoteMediaPlayerProxy::prepareForPlayback):

  • WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:

(WebKit::MediaPlayerPrivateRemote::prepareForPlayback):

Source/WebKitLegacy/mac:

  • Configurations/FeatureDefines.xcconfig:

Source/WTF:

  • wtf/PlatformEnable.h:

Tools:

  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r260411 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-04-20  Ross Kirsling  <ross.kirsling@sony.com>
    211

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

  • trunk/Source/WTF/ChangeLog

    r260409 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        * wtf/PlatformEnable.h:
     9
    1102020-04-20  Yusuke Suzuki  <ysuzuki@apple.com>
    211

  • trunk/Source/WTF/wtf/PlatformEnable.h

    r260259 r260412  
    271271#endif
    272272
    273 #if (PLATFORM(IOS_FAMILY) && HAVE(AVKIT)) || PLATFORM(MAC)
     273#if ((PLATFORM(IOS) || PLATFORM(WATCHOS)) && HAVE(AVKIT)) || PLATFORM(MAC)
     274#if !defined(ENABLE_VIDEO_PRESENTATION_MODE)
    274275#define ENABLE_VIDEO_PRESENTATION_MODE 1
    275 #else
    276 #define ENABLE_VIDEO_PRESENTATION_MODE 0
     276#endif
    277277#endif
    278278

  • trunk/Source/WebCore/ChangeLog

    r260407 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        Wrap video fullscreen and picture-in-picture related code with "#if ENABLE(VIDEO_PRESENTATION_MODE)".
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     12        (WebCore::MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity):
     13        * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h:
     14        * platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm:
     15        (WebCore::VideoLayerManagerObjC::setVideoLayer):
     16        (WebCore::VideoLayerManagerObjC::requiresTextTrackRepresentation const):
     17        (WebCore::VideoLayerManagerObjC::syncTextTrackBounds):
     18        (WebCore::VideoLayerManagerObjC::setTextTrackRepresentation):
     19
    1202020-04-20  Nikos Mouchtaris  <nmouchtaris@apple.com>
    221

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

  • trunk/Source/WebCore/PAL/ChangeLog

    r260366 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-04-20  Darin Adler  <darin@apple.com>
    211

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r260366 r260412  
    18061806        return;
    18071807
     1808#if ENABLE(VIDEO_PRESENTATION_MODE)
    18081809    // Do not attempt to change the video gravity while in full screen mode.
    18091810    // See setVideoFullscreenGravity().
    18101811    if (m_videoLayerManager->videoFullscreenLayer())
    18111812        return;
     1813#endif
    18121814
    18131815    [CATransaction begin];

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/VideoLayerManagerObjC.h

    r256721 r260412  
    4747
    4848    PlatformLayer *videoInlineLayer() const { return m_videoInlineLayer.get(); }
     49    void setVideoLayer(PlatformLayer *, IntSize contentSize);
     50
     51#if ENABLE(VIDEO_PRESENTATION_MODE)
    4952    PlatformLayer *videoFullscreenLayer() const { return m_videoFullscreenLayer.get(); }
    5053    FloatRect videoFullscreenFrame() const { return m_videoFullscreenFrame; }
    51 
    52     void setVideoLayer(PlatformLayer *, IntSize contentSize);
    5354    void setVideoFullscreenLayer(PlatformLayer *, WTF::Function<void()>&& completionHandler, NativeImagePtr);
    5455    void updateVideoFullscreenInlineImage(NativeImagePtr);
    5556    void setVideoFullscreenFrame(FloatRect);
     57#endif
     58
    5659    void didDestroyVideoLayer();
    5760
    … …  
    7174    RetainPtr<PlatformLayer> m_textTrackRepresentationLayer;
    7275    RetainPtr<WebVideoContainerLayer> m_videoInlineLayer;
     76    FloatRect m_videoInlineFrame;
     77#if ENABLE(VIDEO_PRESENTATION_MODE)
    7378    RetainPtr<PlatformLayer> m_videoFullscreenLayer;
     79    FloatRect m_videoFullscreenFrame;
     80#endif
    7481    RetainPtr<PlatformLayer> m_videoLayer;
    75     FloatRect m_videoFullscreenFrame;
    76     FloatRect m_videoInlineFrame;
    7782};
    7883

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

    r260366 r260412  
    6767        [m_videoInlineLayer setPlayerLayer:(AVPlayerLayer *)videoLayer];
    6868
     69#if ENABLE(VIDEO_PRESENTATION_MODE)
    6970    if (m_videoFullscreenLayer) {
    7071        [m_videoLayer setFrame:CGRectMake(0, 0, m_videoFullscreenFrame.width(), m_videoFullscreenFrame.height())];
    7172        [m_videoFullscreenLayer insertSublayer:m_videoLayer.get() atIndex:0];
    72     } else {
     73    } else
     74#endif
     75    {
    7376        [m_videoInlineLayer insertSublayer:m_videoLayer.get() atIndex:0];
    7477        [m_videoLayer setFrame:m_videoInlineLayer.get().bounds];
    7578    }
    7679}
     80
     81#if ENABLE(VIDEO_PRESENTATION_MODE)
    7782
    7883void VideoLayerManagerObjC::updateVideoFullscreenInlineImage(NativeImagePtr image)
    … …  
    141146}
    142147
     148#endif
     149
    143150void VideoLayerManagerObjC::didDestroyVideoLayer()
    144151{
    … …  
    153160bool VideoLayerManagerObjC::requiresTextTrackRepresentation() const
    154161{
     162#if ENABLE(VIDEO_PRESENTATION_MODE)
    155163    return m_videoFullscreenLayer;
     164#else
     165    return false;
     166#endif
    156167}
    157168
    158169void VideoLayerManagerObjC::syncTextTrackBounds()
    159170{
     171#if ENABLE(VIDEO_PRESENTATION_MODE)
    160172    if (!m_videoFullscreenLayer || !m_textTrackRepresentationLayer)
    161173        return;
    … …  
    170182
    171183    [CATransaction commit];
     184#endif
    172185}
    173186
    174187void VideoLayerManagerObjC::setTextTrackRepresentation(TextTrackRepresentation* representation)
    175188{
     189#if !ENABLE(VIDEO_PRESENTATION_MODE)
     190    UNUSED_PARAM(representation);
     191#else
    176192    ALWAYS_LOG(LOGIDENTIFIER);
    177193
    … …  
    196212
    197213    [CATransaction commit];
     214#endif
    198215}
    199216

  • trunk/Source/WebKit/ChangeLog

    r260410 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        Wrap video fullscreen and picture-in-picture related code with "#if ENABLE(VIDEO_PRESENTATION_MODE)".
     9
     10        * Configurations/FeatureDefines.xcconfig:
     11        * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
     12        (WebKit::RemoteMediaPlayerProxy::setVideoFullscreenGravity):
     13        (WebKit::RemoteMediaPlayerProxy::updateVideoFullscreenInlineImage):
     14        (WebKit::RemoteMediaPlayerProxy::setVideoFullscreenMode):
     15        (WebKit::RemoteMediaPlayerProxy::videoFullscreenStandbyChanged):
     16        (WebKit::RemoteMediaPlayerProxy::setBufferingPolicy):
     17        * GPUProcess/media/RemoteMediaPlayerProxy.h:
     18        * GPUProcess/media/RemoteMediaPlayerProxy.messages.in:
     19        * GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm:
     20        (WebKit::RemoteMediaPlayerProxy::prepareForPlayback):
     21        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
     22        (WebKit::MediaPlayerPrivateRemote::prepareForPlayback):
     23
    1242020-04-20  Alex Christensen  <achristensen@webkit.org>
    225

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

  • trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp

    r260259 r260412  
    202202}
    203203
     204#if ENABLE(VIDEO_PRESENTATION_MODE)
    204205void RemoteMediaPlayerProxy::setVideoFullscreenGravity(WebCore::MediaPlayerEnums::VideoGravity gravity)
    205206{
    206 #if ENABLE(VIDEO_PRESENTATION_MODE)
    207207    m_player->setVideoFullscreenGravity(gravity);
    208 #endif
    209 }
     208}
     209#endif
    210210
    211211void RemoteMediaPlayerProxy::acceleratedRenderingStateChanged(bool renderingCanBeAccelerated)
    … …  
    245245
    246246// MediaPlayerClient
     247#if ENABLE(VIDEO_PRESENTATION_MODE)
    247248void RemoteMediaPlayerProxy::updateVideoFullscreenInlineImage()
    248249{
    249 #if ENABLE(VIDEO_PRESENTATION_MODE)
    250250    m_player->updateVideoFullscreenInlineImage();
    251 #endif
    252251}
    253252
    254253void RemoteMediaPlayerProxy::setVideoFullscreenMode(MediaPlayer::VideoFullscreenMode mode)
    255254{
    256 #if ENABLE(VIDEO_PRESENTATION_MODE)
    257255    m_player->setVideoFullscreenMode(mode);
    258 #endif
    259 }
     256
     257}
     258
     259void RemoteMediaPlayerProxy::videoFullscreenStandbyChanged()
     260{
     261    m_player->videoFullscreenStandbyChanged();
     262}
     263#endif
    260264
    261265void RemoteMediaPlayerProxy::setBufferingPolicy(MediaPlayer::BufferingPolicy policy)
    262266{
    263267    m_player->setBufferingPolicy(policy);
    264 }
    265 
    266 void RemoteMediaPlayerProxy::videoFullscreenStandbyChanged()
    267 {
    268 #if ENABLE(VIDEO_PRESENTATION_MODE)
    269     m_player->videoFullscreenStandbyChanged();
    270 #endif
    271268}
    272269
    … …  
    678675}
    679676
     677#if ENABLE(VIDEO_PRESENTATION_MODE)
    680678MediaPlayerEnums::VideoFullscreenMode RemoteMediaPlayerProxy::mediaPlayerFullscreenMode() const
    681679{
    … …  
    689687    return false;
    690688}
     689#endif
    691690
    692691bool RemoteMediaPlayerProxy::mediaPlayerShouldDisableSleep() const

  • trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h

    r258253 r260412  
    8383    void invalidate();
    8484
     85#if ENABLE(VIDEO_PRESENTATION_MODE)
    8586    void updateVideoFullscreenInlineImage();
    8687    void setVideoFullscreenMode(WebCore::MediaPlayer::VideoFullscreenMode);
     88    void videoFullscreenStandbyChanged();
     89#endif
    8790
    8891    void setBufferingPolicy(WebCore::MediaPlayer::BufferingPolicy);
    89 
    90     void videoFullscreenStandbyChanged();
    9192
    9293#if PLATFORM(IOS_FAMILY)
    … …  
    123124    void setVisible(bool);
    124125    void setShouldMaintainAspectRatio(bool);
     126#if ENABLE(VIDEO_PRESENTATION_MODE)
    125127    void enterFullscreen(CompletionHandler<void()>&&);
    126128    void exitFullscreen(CompletionHandler<void()>&&);
    127129    void setVideoFullscreenGravity(WebCore::MediaPlayerEnums::VideoGravity);
     130#endif
    128131    void acceleratedRenderingStateChanged(bool);
    129132    void setShouldDisableSleep(bool);
    … …  
    136139#if PLATFORM(COCOA)
    137140    void setVideoInlineSizeFenced(const WebCore::IntSize&, const WTF::MachSendRight&);
     141#if ENABLE(VIDEO_PRESENTATION_MODE)
    138142    void setVideoFullscreenFrameFenced(const WebCore::FloatRect&, const WTF::MachSendRight&);
     143#endif
    139144#endif
    140145
    … …  
    253258
    254259    double mediaPlayerRequestedPlaybackRate() const final;
     260#if ENABLE(VIDEO_PRESENTATION_MODE)
    255261    WebCore::MediaPlayerEnums::VideoFullscreenMode mediaPlayerFullscreenMode() const final;
    256262    bool mediaPlayerIsVideoFullscreenStandby() const final;
     263#endif
    257264    Vector<String> mediaPlayerPreferredAudioCharacteristics() const final;
    258265
    … …  
    280287    RefPtr<WebCore::MediaPlayer> m_player;
    281288    std::unique_ptr<LayerHostingContext> m_inlineLayerHostingContext;
     289#if ENABLE(VIDEO_PRESENTATION_MODE)
    282290    std::unique_ptr<LayerHostingContext> m_fullscreenLayerHostingContext;
     291#endif
    283292    RemoteMediaPlayerManagerProxy& m_manager;
    284293    WebCore::MediaPlayerEnums::MediaEngineIdentifier m_engineIdentifier;

  • trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in

    r258253 r260412  
    4848    SetVisible(bool visible)
    4949    SetShouldMaintainAspectRatio(bool maintainAspectRatio)
     50#if ENABLE(VIDEO_PRESENTATION_MODE)
    5051    SetVideoFullscreenGravity(enum:uint8_t WebCore::MediaPlayerEnums::VideoGravity gravity)
     52#endif
    5153    AcceleratedRenderingStateChanged(bool canBeAccelerated)
    5254    SetShouldDisableSleep(bool disable)
    5355    SetRate(double rate)
    5456
     57#if ENABLE(VIDEO_PRESENTATION_MODE)
    5558    UpdateVideoFullscreenInlineImage()
    5659    SetVideoFullscreenMode(WebCore::MediaPlayer::VideoFullscreenMode mode)
    5760    VideoFullscreenStandbyChanged()
     61#endif
    5862
    5963    SetBufferingPolicy(WebCore::MediaPlayer::BufferingPolicy policy)
    … …  
    6569#if PLATFORM(COCOA)
    6670    SetVideoInlineSizeFenced(WebCore::IntSize size, MachSendRight machSendRight)
     71#if ENABLE(VIDEO_PRESENTATION_MODE)
    6772    SetVideoFullscreenFrameFenced(WebCore::FloatRect rect, MachSendRight machSendRight)
    6873#endif
     74#endif
    6975
     76#if ENABLE(VIDEO_PRESENTATION_MODE)
    7077    EnterFullscreen() -> () Async
    7178    ExitFullscreen() -> () Async
     79#endif
    7280
    7381    # Paint

  • trunk/Source/WebKit/GPUProcess/media/cocoa/RemoteMediaPlayerProxyCocoa.mm

    r257680 r260412  
    4646    if (!m_inlineLayerHostingContext)
    4747        m_inlineLayerHostingContext = LayerHostingContext::createForExternalHostingProcess();
     48#if ENABLE(VIDEO_PRESENTATION_MODE)
    4849    if (!m_fullscreenLayerHostingContext)
    4950        m_fullscreenLayerHostingContext = LayerHostingContext::createForExternalHostingProcess();
    5051    completionHandler(m_inlineLayerHostingContext->contextID(), m_fullscreenLayerHostingContext->contextID());
     52#endif
    5153}
    5254
    … …  
    7375}
    7476
     77#if ENABLE(VIDEO_PRESENTATION_MODE)
    7578void RemoteMediaPlayerProxy::enterFullscreen(CompletionHandler<void()>&& completionHandler)
    7679{
    … …  
    9497    m_player->setVideoFullscreenFrame(rect);
    9598}
     99#endif
    96100
    97101} // namespace WebKit

  • trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp

    r260259 r260412  
    130130
    131131        m_videoInlineLayer = createVideoLayerRemote(this, inlineLayerHostingContextId.value());
    132 
     132#if ENABLE(VIDEO_PRESENTATION_MODE)
    133133        m_fullscreenLayerHostingContextId = fullscreenLayerHostingContextId;
     134#endif
    134135    }, m_id);
    135136}

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r260366 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        * Configurations/FeatureDefines.xcconfig:
     9
    1102020-04-20  Darin Adler  <darin@apple.com>
    211

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

  • trunk/Tools/ChangeLog

    r260410 r260412  
     12020-04-20  Peng Liu  <peng.liu6@apple.com>
     2
     3        Fix build failures when video fullscreen and picture-in-picture is disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=210777
     5
     6        Reviewed by Eric Carlson.
     7
     8        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
     9
    1102020-04-20  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r259762 r260412  
    373373ENABLE_VIDEO = ENABLE_VIDEO;
    374374
    375 ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
     375ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
     376ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
     377ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
     378ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
    376379
    377380ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Note: See TracChangeset for help on using the changeset viewer.