Changeset 195154 in webkit


Ignore:
Timestamp:
Jan 15, 2016 3:34:25 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Fix audio build with video disabled
​https://bugs.webkit.org/show_bug.cgi?id=153134

Patch by Olivier Blin <Olivier Blin> on 2016-01-15
Reviewed by Michael Catanzaro.

Build fails when WebAudio is enabled but VIDEO disabled.

No new tests since this is a build fix only.

  • platform/audio/PlatformMediaSession.cpp:
  • platform/audio/PlatformMediaSession.h:
  • platform/audio/PlatformMediaSessionManager.cpp:
  • testing/Internals.cpp:

(WebCore::Internals::setAudioContextRestrictions):

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r195153 r195154  
     12016-01-15  Olivier Blin  <olivier.blin@softathome.com>
     2
     3        Fix audio build with video disabled
     4        https://bugs.webkit.org/show_bug.cgi?id=153134
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Build fails when WebAudio is enabled but VIDEO disabled.
     9
     10        No new tests since this is a build fix only.
     11
     12        * platform/audio/PlatformMediaSession.cpp:
     13        * platform/audio/PlatformMediaSession.h:
     14        * platform/audio/PlatformMediaSessionManager.cpp:
     15        * testing/Internals.cpp:
     16        (WebCore::Internals::setAudioContextRestrictions):
     17
    1182016-01-15  Olivier Blin  <olivier.blin@softathome.com>
    219

  • trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp

    r192966 r195154  
    2727#include "PlatformMediaSession.h"
    2828
    29 #if ENABLE(VIDEO)
     29#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
    3030#include "HTMLMediaElement.h"
    3131#include "Logging.h"
    … …  
    206206}
    207207
     208#if ENABLE(VIDEO)
    208209String PlatformMediaSession::title() const
    209210{
    … …  
    220221    return m_client.mediaSessionCurrentTime();
    221222}
     223#endif
    222224   
    223225bool PlatformMediaSession::canReceiveRemoteControlCommands() const
    … …  
    300302}
    301303
     304#if ENABLE(VIDEO)
    302305String PlatformMediaSessionClient::mediaSessionTitle() const
    303306{
    … …  
    314317    return MediaPlayer::invalidTime();
    315318}
    316 
    317 }
    318 #endif
     319#endif
     320
     321}
     322#endif

  • trunk/Source/WebCore/platform/audio/PlatformMediaSession.h

    r192966 r195154  
    9898    void visibilityChanged();
    9999
     100#if ENABLE(VIDEO)
    100101    String title() const;
    101102    double duration() const;
    102103    double currentTime() const;
     104#endif
    103105
    104106    enum RemoteControlCommandType {
    … …  
    177179    virtual void suspendPlayback() = 0;
    178180
     181#if ENABLE(VIDEO)
    179182    virtual String mediaSessionTitle() const;
    180183    virtual double mediaSessionDuration() const;
    181184    virtual double mediaSessionCurrentTime() const;
     185#endif
    182186   
    183187    virtual bool canReceiveRemoteControlCommands() const = 0;

  • trunk/Source/WebCore/platform/audio/PlatformMediaSessionManager.cpp

    r192966 r195154  
    2727#include "PlatformMediaSessionManager.h"
    2828
    29 #if ENABLE(VIDEO)
     29#if ENABLE(VIDEO) || ENABLE(WEB_AUDIO)
    3030
    3131#include "AudioSession.h"

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

    r194706 r195154  
    29502950    context->removeBehaviorRestriction(restrictions);
    29512951
    2952     restrictions = MediaElementSession::NoRestrictions;
     2952    restrictions = AudioContext::NoRestrictions;
    29532953
    29542954    Vector<String> restrictionsArray;
Note: See TracChangeset for help on using the changeset viewer.