Bug 153134 – Fix audio build with video disabled

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Audio

[Olivier Blin]

Build and link fails when WebAudio is enabled but VIDEO disabled.

WebKit/Source/WebCore/testing/Internals.cpp: In member function ‘void WebCore::Internals::setAudioContextRestrictions(WebCore::AudioContext*, const WTF::String&, WebCore::ExceptionCode&)’:
WebKit/Source/WebCore/testing/Internals.cpp:2952:20: error: ‘MediaElementSession’ has not been declared
     restrictions = MediaElementSession::NoRestrictions;

Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::AudioContext(WebCore::Document&): error: undefined reference to 'WebCore::PlatformMediaSession::create(WebCore::PlatformMediaSessionClient&)'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::AudioContext(WebCore::Document&, unsigned int, unsigned long, float): error: undefined reference to 'WebCore::PlatformMediaSession::create(WebCore::PlatformMediaSessionClient&)'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::constructCommon(): error: undefined reference to 'WebCore::PlatformMediaSession::setCanProduceAudio(bool)'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::willBeginPlayback(): error: undefined reference to 'WebCore::PlatformMediaSession::clientWillBeginPlayback()'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:function WebCore::AudioContext::willPausePlayback(): error: undefined reference to 'WebCore::PlatformMediaSession::clientWillPausePlayback()'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionTitle() const'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionDuration() const'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/AudioContext.cpp.o):AudioContext.cpp:vtable for WebCore::AudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime() const'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionTitle() const'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionDuration() const'
../../lib/libWebCoreGTK.a(../../lib/../Source/WebCore/CMakeFiles/WebCore.dir/Modules/webaudio/OfflineAudioContext.cpp.o):OfflineAudioContext.cpp:vtable for WebCore::OfflineAudioContext: error: undefined reference to 'WebCore::PlatformMediaSessionClient::mediaSessionCurrentTime() const'
collect2: error: ld returned 1 exit status

[Olivier Blin]

Created attachment 269065 [details]
Patch

[Olivier Blin]

You may prefer guarding the method implementation instead of their whole declaration.

Though, MediaPlayer::invalidTime() would not be available when video is disabled.

[Michael Catanzaro]

Comment on attachment 269065 [details]
Patch

Thanks for your patch. If you don't have commit access, please set the cq? flag to request commit-queue.

[Olivier Blin]

Created attachment 269101 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 269101 [details]
Patch

Clearing flags on attachment: 269101

Committed r195154: <http://trac.webkit.org/changeset/195154>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.