[Win] Compile fixes with video not enabled.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2014 19:04:20 +0000 (19:04 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 21 Mar 2014 19:04:20 +0000 (19:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=130597

Patch by Alex Christensen <achristensen@webkit.org> on 2014-03-21
Reviewed by Darin Adler.

Source/WebCore:

* DerivedSources.make:
Only generate UserAgentScripts.h if needed.
* platform/audio/MediaSession.cpp:
* platform/audio/MediaSessionManager.cpp:
Only compile if video is enabled.

Source/WebKit:

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Only include MediaSessionManager symbols if video is enabled.

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

Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/platform/audio/MediaSession.cpp
Source/WebCore/platform/audio/MediaSessionManager.cpp
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

index 82ddbd3..fa5373d 100644 (file)
@@ -1,3 +1,16 @@
+2014-03-21  Alex Christensen  <achristensen@webkit.org>
+
+        [Win] Compile fixes with video not enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=130597
+
+        Reviewed by Darin Adler.
+
+        * DerivedSources.make:
+        Only generate UserAgentScripts.h if needed.
+        * platform/audio/MediaSession.cpp:
+        * platform/audio/MediaSessionManager.cpp:
+        Only compile if video is enabled.
+
 2014-03-21  Adenilson Cavalcanti  <cavalcantii@gmail.com>
 
         Optimize FEGaussian blur
index 1104271..06605e8 100644 (file)
@@ -752,7 +752,6 @@ all : \
     SVGElementFactory.cpp \
     SVGNames.cpp \
     SelectorPseudoTypeMap.cpp \
-    UserAgentScripts.h \
     UserAgentStyleSheets.h \
     WebKitFontFamilyNames.cpp \
     WebKitFontFamilyNames.h \
@@ -914,6 +913,8 @@ ifeq ($(OS),MACOS)
 endif
 
 ifdef USER_AGENT_SCRIPTS
+all : UserAgentScripts.h
+
 UserAgentScripts.h : Scripts/make-js-file-arrays.py $(USER_AGENT_SCRIPTS)
        PYTHONPATH=$(InspectorScripts) python $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
 endif
index 8f27b0b..8f3943f 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "MediaSession.h"
 
+#if ENABLE(VIDEO)
 #include "HTMLMediaElement.h"
 #include "Logging.h"
 #include "MediaPlayer.h"
@@ -175,3 +176,4 @@ double MediaSessionClient::mediaSessionCurrentTime() const
 }
 
 }
+#endif
index 1c4522a..859965f 100644 (file)
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "MediaSessionManager.h"
 
+#if ENABLE(VIDEO)
+
 #include "Logging.h"
 #include "MediaSession.h"
 
@@ -300,3 +302,5 @@ void MediaSessionManager::removeClient(MediaSessionManagerClient* client)
 }
 
 }
+
+#endif
index fa27d3e..fb507a2 100644 (file)
@@ -1,3 +1,13 @@
+2014-03-21  Alex Christensen  <achristensen@webkit.org>
+
+        [Win] Compile fixes with video not enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=130597
+
+        Reviewed by Darin Adler.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+        Only include MediaSessionManager symbols if video is enabled.
+
 2014-03-21  Pratik Solanki  <psolanki@apple.com>
 
         Check for inappropriate macros in private headers
index dd60d6a..e0bfa05 100644 (file)
@@ -243,6 +243,7 @@ EXPORTS
         symbolWithPointer(?markerTextForListItem@WebCore@@YA?AVString@WTF@@PAVElement@1@@Z, ?markerTextForListItem@WebCore@@YA?AVString@WTF@@PEAVElement@1@@Z)
         symbolWithPointer(?length@StaticNodeList@WebCore@@UBEIXZ, ?length@StaticNodeList@WebCore@@UEBAIXZ)
         symbolWithPointer(?shadowRoot@Element@WebCore@@QBEPAVShadowRoot@2@XZ, ?shadowRoot@Element@WebCore@@QEBAPEAVShadowRoot@2@XZ)
+#if ENABLE(VIDEO)
         symbolWithPointer(?sharedManager@MediaSessionManager@WebCore@@SAAAV12@XZ, ?sharedManager@MediaSessionManager@WebCore@@SAAEAV12@XZ)
         symbolWithPointer(?beginInterruption@MediaSessionManager@WebCore@@QAEXXZ, ?beginInterruption@MediaSessionManager@WebCore@@QEAAXXZ)
         symbolWithPointer(?endInterruption@MediaSessionManager@WebCore@@QAEXW4EndInterruptionFlags@MediaSession@2@@Z, ?endInterruption@MediaSessionManager@WebCore@@QEAAXW4EndInterruptionFlags@MediaSession@2@@Z)
@@ -251,6 +252,7 @@ EXPORTS
         symbolWithPointer(?restrictions@MediaSessionManager@WebCore@@QAEIW4MediaType@MediaSession@2@@Z, ?restrictions@MediaSessionManager@WebCore@@QEAAIW4MediaType@MediaSession@2@@Z)
         symbolWithPointer(?applicationWillEnterForeground@MediaSessionManager@WebCore@@QBEXXZ, ?applicationWillEnterForeground@MediaSessionManager@WebCore@@QEBAXXZ)
         symbolWithPointer(?applicationWillEnterBackground@MediaSessionManager@WebCore@@QBEXXZ, ?applicationWillEnterBackground@MediaSessionManager@WebCore@@QEBAXXZ)
+ #endif
         ?localUserSpecificStorageDirectory@WebCore@@YA?AVString@WTF@@XZ
         symbolWithPointer(?namedItem@StaticNodeList@WebCore@@UBEPAVNode@2@ABVAtomicString@WTF@@@Z, ?namedItem@StaticNodeList@WebCore@@UEBAPEAVNode@2@AEBVAtomicString@WTF@@@Z)
         ?number@String@WTF@@SA?AV12@_J@Z