Modified: trunk/Source/WebCore/ChangeLog (136897 => 136898)
--- trunk/Source/WebCore/ChangeLog 2012-12-06 22:56:26 UTC (rev 136897)
+++ trunk/Source/WebCore/ChangeLog 2012-12-06 23:02:11 UTC (rev 136898)
@@ -1,3 +1,14 @@
+2012-12-06 Brent Fulgham <bfulg...@webkit.org>
+
+ [Windows, WinCairo] Unreviewed build correction.
+
+ Exclude 'DocumentSharedObjectPool.cpp' from build, since it is
+ built as part of DOMAllInOne.cpp. The build (besides wasting
+ time) generates a bunch of build warnings for duplicate symbols.
+
+ * WebCore.vcproj/WebCore.vcproj: Mark DocumentSharedObjectPool.cpp
+ to not build independently of DOMAllInOne.cpp.
+
2012-12-06 David Grogan <dgro...@chromium.org>
IndexedDB: Abort transactions because of leveldb errors part 4
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (136897 => 136898)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-12-06 22:56:26 UTC (rev 136897)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-12-06 23:02:11 UTC (rev 136898)
@@ -32665,11 +32665,11 @@
>
</File>
<File
- RelativePath="..\platform\network\ParsedContentType.h"
+ RelativePath="..\platform\network\ParsedContentType.cpp"
>
</File>
<File
- RelativePath="..\platform\network\ParsedContentType.cpp"
+ RelativePath="..\platform\network\ParsedContentType.h"
>
</File>
<File
@@ -41158,7 +41158,7 @@
>
</File>
<File
- RelativePath="..\rendering\RenderMediaControls.cpp"
+ RelativePath="..\rendering\RenderMediaControlElements.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -41210,7 +41210,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\RenderMediaControls.h"
+ RelativePath="..\rendering\RenderMediaControlElements.h"
>
<FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
@@ -41230,7 +41230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\RenderMediaControlElements.cpp"
+ RelativePath="..\rendering\RenderMediaControls.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -41282,7 +41282,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\rendering\RenderMediaControlElements.h"
+ RelativePath="..\rendering\RenderMediaControls.h"
>
<FileConfiguration
Name="Debug_Cairo_CFLite|Win32"
@@ -45587,8 +45587,8 @@
>
</File>
<File
- RelativePath="..\rendering\style\ExclusionShapeValue.h"
- >
+ RelativePath="..\rendering\style\ExclusionShapeValue.h"
+ >
</File>
<File
RelativePath="..\rendering\style\FillLayer.cpp"
@@ -45651,6 +45651,10 @@
>
</File>
<File
+ RelativePath="..\rendering\style\GridTrackSize.h"
+ >
+ </File>
+ <File
RelativePath="..\rendering\style\KeyframeList.cpp"
>
<FileConfiguration
@@ -46931,10 +46935,6 @@
>
</File>
<File
- RelativePath="..\rendering\style\GridTrackSize.h"
- >
- </File>
- <File
RelativePath="..\rendering\style\SVGRenderStyle.cpp"
>
<FileConfiguration
@@ -50756,6 +50756,54 @@
<File
RelativePath="..\dom\DocumentSharedObjectPool.cpp"
>
+ <FileConfiguration
+ Name="Debug|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release_Cairo_CFLite|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug_All|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Production|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\dom\DocumentSharedObjectPool.h"
@@ -51229,7 +51277,7 @@
RelativePath="..\dom\DynamicNodeList.h"
>
</File>
- <File
+ <File
RelativePath="..\dom\Element.cpp"
>
<FileConfiguration
@@ -53914,7 +53962,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\dom\PseudoElement.h"
+ RelativePath="..\dom\PropertyNodeList.h"
>
</File>
<File
@@ -53970,7 +54018,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\dom\PropertyNodeList.h"
+ RelativePath="..\dom\PseudoElement.h"
>
</File>
<File
@@ -60738,14 +60786,6 @@
>
</File>
<File
- RelativePath="..\html\HTMLFormControlsCollection.cpp"
- >
- </File>
- <File
- RelativePath="..\html\HTMLFormControlsCollection.h"
- >
- </File>
- <File
RelativePath="..\html\HTMLFormControlElement.cpp"
>
<FileConfiguration
@@ -60858,6 +60898,14 @@
>
</File>
<File
+ RelativePath="..\html\HTMLFormControlsCollection.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\HTMLFormControlsCollection.h"
+ >
+ </File>
+ <File
RelativePath="..\html\HTMLFormElement.cpp"
>
<FileConfiguration
@@ -64193,15 +64241,15 @@
RelativePath="..\html\TimeRanges.h"
>
</File>
- <File
- RelativePath="..\html\TypeAhead.cpp"
- >
- </File>
- <File
- RelativePath="..\html\TypeAhead.h"
- >
- </File>
<File
+ RelativePath="..\html\TypeAhead.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\html\TypeAhead.h"
+ >
+ </File>
+ <File
RelativePath="..\html\URLInputType.cpp"
>
</File>
@@ -64609,19 +64657,19 @@
>
</File>
<File
- RelativePath="..\html\shadow\MediaControlElementTypes.cpp"
+ RelativePath="..\html\shadow\MediaControlElements.cpp"
>
</File>
<File
- RelativePath="..\html\shadow\MediaControlElementTypes.h"
+ RelativePath="..\html\shadow\MediaControlElements.h"
>
</File>
<File
- RelativePath="..\html\shadow\MediaControlElements.cpp"
+ RelativePath="..\html\shadow\MediaControlElementTypes.cpp"
>
</File>
<File
- RelativePath="..\html\shadow\MediaControlElements.h"
+ RelativePath="..\html\shadow\MediaControlElementTypes.h"
>
</File>
<File
@@ -76669,11 +76717,11 @@
>
</File>
<File
- RelativePath="..\inspector\front-end\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
>
</File>
<File
- RelativePath="..\inspector\front-end\UglifyJS\_javascript_Formatter.js"
+ RelativePath="..\inspector\front-end\_javascript_Formatter.js"
>
</File>
<File
