Changeset 237203 in webkit


Ignore:
Timestamp:
Oct 16, 2018 2:33:25 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Remove superfluous VIDEO build guard
​https://bugs.webkit.org/show_bug.cgi?id=190624

Patch by Rob Buis <​rbuis@igalia.com> on 2018-10-16
Reviewed by Michael Catanzaro.

Remove some instances where the VIDEO build guard is included within another VIDEO build guard.

No new tests. No change in behavior.

  • platform/graphics/MediaPlayer.cpp:

(WebCore::buildMediaEnginesVector):

  • platform/graphics/MediaPlayer.h:
  • platform/graphics/MediaPlayerPrivate.h:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r237202 r237203  
     12018-10-16  Rob Buis  <rbuis@igalia.com>
     2
     3        Remove superfluous VIDEO build guard
     4        https://bugs.webkit.org/show_bug.cgi?id=190624
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Remove some instances where the VIDEO build guard is included within another VIDEO build guard.
     9
     10        No new tests. No change in behavior.
     11
     12        * platform/graphics/MediaPlayer.cpp:
     13        (WebCore::buildMediaEnginesVector):
     14        * platform/graphics/MediaPlayer.h:
     15        * platform/graphics/MediaPlayerPrivate.h:
     16
    1172018-10-16  Youenn Fablet  <youenn@apple.com>
    218

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r237067 r237203  
    5555#include "MediaPlayerPrivateGStreamer.h"
    5656#define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
    57 #if ENABLE(VIDEO) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
     57#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
    5858#include "MediaPlayerPrivateGStreamerMSE.h"
    5959#endif
    … …  
    251251#endif
    252252
    253 #if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
     253#if USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
    254254    if (DeprecatedGlobalSettings::isGStreamerEnabled())
    255255        MediaPlayerPrivateGStreamerMSE::registerMediaEngine(addMediaEngine);
    … …  
    15291529}
    15301530
    1531 #if ENABLE(VIDEO) && USE(AVFOUNDATION)
     1531#if USE(AVFOUNDATION)
    15321532
    15331533AVPlayer* MediaPlayer::objCAVFoundationAVPlayer() const

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.h

    r236875 r237203  
    568568    void applicationDidBecomeActive();
    569569
    570 #if ENABLE(VIDEO) && USE(AVFOUNDATION)
     570#if USE(AVFOUNDATION)
    571571    WEBCORE_EXPORT AVPlayer *objCAVFoundationAVPlayer() const;
    572572#endif

  • trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

    r236875 r237203  
    279279    virtual void applicationDidBecomeActive() { }
    280280
    281 #if ENABLE(VIDEO) && USE(AVFOUNDATION)
     281#if USE(AVFOUNDATION)
    282282    virtual AVPlayer *objCAVFoundationAVPlayer() const { return nullptr; }
    283283#endif
Note: See TracChangeset for help on using the changeset viewer.