Title: [165084] trunk/Source/WebCore
- Revision
- 165084
- Author
- [email protected]
- Date
- 2014-03-04 16:33:54 -0800 (Tue, 04 Mar 2014)
Log Message
Fixed Windows build without MEDIA_CONTROLS_SCRIPT enabled.
https://bugs.webkit.org/show_bug.cgi?id=129701
Patch by Alex Christensen <[email protected]> on 2014-03-04
Reviewed by Jer Noble.
* WebCore.vcxproj/WebCore.vcxproj:
* DerivedSources.cpp:
Moved UserAgentScriptsData.cpp to DerivedSources.cpp to only be built if MEDIA_CONTROLS_SCRIPT is enabled.
* DerivedSources.make:
Only generate UserAgentScripts.cpp/h when USER_AGENT_SCRIPTS is non-empty.
* rendering/RenderThemeWin.cpp:
Only include UserAgentScripts.h when MEDIA_CONTROLS_SCRIPT is enabled.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165083 => 165084)
--- trunk/Source/WebCore/ChangeLog 2014-03-05 00:26:54 UTC (rev 165083)
+++ trunk/Source/WebCore/ChangeLog 2014-03-05 00:33:54 UTC (rev 165084)
@@ -1,3 +1,18 @@
+2014-03-04 Alex Christensen <[email protected]>
+
+ Fixed Windows build without MEDIA_CONTROLS_SCRIPT enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=129701
+
+ Reviewed by Jer Noble.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * DerivedSources.cpp:
+ Moved UserAgentScriptsData.cpp to DerivedSources.cpp to only be built if MEDIA_CONTROLS_SCRIPT is enabled.
+ * DerivedSources.make:
+ Only generate UserAgentScripts.cpp/h when USER_AGENT_SCRIPTS is non-empty.
+ * rendering/RenderThemeWin.cpp:
+ Only include UserAgentScripts.h when MEDIA_CONTROLS_SCRIPT is enabled.
+
2014-03-04 Simon Fraser <[email protected]>
Allow iOS DumpRenderTree crashes to show application-specific information
Modified: trunk/Source/WebCore/DerivedSources.cpp (165083 => 165084)
--- trunk/Source/WebCore/DerivedSources.cpp 2014-03-05 00:26:54 UTC (rev 165083)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-03-05 00:33:54 UTC (rev 165084)
@@ -247,6 +247,7 @@
#include "JSMediaController.cpp"
#if ENABLE(MEDIA_CONTROLS_SCRIPT)
#include "JSMediaControlsHost.cpp"
+#include "UserAgentScriptsData.cpp"
#endif
#include "JSMediaError.cpp"
#include "JSMediaList.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (165083 => 165084)
--- trunk/Source/WebCore/DerivedSources.make 2014-03-05 00:26:54 UTC (rev 165083)
+++ trunk/Source/WebCore/DerivedSources.make 2014-03-05 00:33:54 UTC (rev 165084)
@@ -901,8 +901,10 @@
USER_AGENT_SCRIPTS := $(USER_AGENT_SCRIPTS) $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js
endif
+ifdef USER_AGENT_SCRIPTS
UserAgentScripts.h : Scripts/make-js-file-arrays.py $(USER_AGENT_SCRIPTS)
PYTHONPATH=$(InspectorScripts) python $< $@ UserAgentScriptsData.cpp $(USER_AGENT_SCRIPTS)
+endif
# --------
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (165083 => 165084)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-05 00:26:54 UTC (rev 165083)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-03-05 00:33:54 UTC (rev 165084)
@@ -6437,7 +6437,20 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\MathMLNames.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGElementFactory.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SVGNames.cpp" />
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScriptsData.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentScriptsData.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\UserAgentStyleSheetsData.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (165083 => 165084)
--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-03-05 00:26:54 UTC (rev 165083)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2014-03-05 00:33:54 UTC (rev 165084)
@@ -36,10 +36,13 @@
#include "Settings.h"
#include "SoftLinking.h"
#include "SystemInfo.h"
-#include "UserAgentScripts.h"
#include "UserAgentStyleSheets.h"
#include <wtf/win/GDIObject.h>
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+#include "UserAgentScripts.h"
+#endif
+
#if ENABLE(VIDEO)
#include "RenderMediaControls.h"
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
