Skip to site navigation (Press enter)

[webkit-changes] [106280] trunk/Source/WebCore

jberlin Mon, 30 Jan 2012 13:08:56 -0800

Title: [106280] trunk/Source/WebCore

Revision: 106280
Author: [email protected]
Date: 2012-01-30 13:08:48 -0800 (Mon, 30 Jan 2012)

Log Message

WebCore build exceeds address space on 32-bit Windows builders (again).
https://bugs.webkit.org/show_bug.cgi?id=77357


Reviewed by Adam Roben.

Add an Inspector All-In-One file, but only use it in Release and Production builds.
This differs from our other All-In-One files, but it is a better approach because it makes
debugging possible in the Debug configuration (the symbols will be in the correct .obj file
for the original .cpp files).

* WebCore.vcproj/WebCore.vcproj:
Also, let VS have its way with the vcproj file.
* inspector/InspectorAllInOne.cpp: Added.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

Added Paths

trunk/Source/WebCore/inspector/InspectorAllInOne.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (106279 => 106280)


--- trunk/Source/WebCore/ChangeLog	2012-01-30 21:07:25 UTC (rev 106279)
+++ trunk/Source/WebCore/ChangeLog	2012-01-30 21:08:48 UTC (rev 106280)
@@ -1,3 +1,19 @@
+2012-01-30  Jessie Berlin  <[email protected]>
+
+        WebCore build exceeds address space on 32-bit Windows builders (again).
+        https://bugs.webkit.org/show_bug.cgi?id=77357
+
+        Reviewed by Adam Roben.
+
+        Add an Inspector All-In-One file, but only use it in Release and Production builds.
+        This differs from our other All-In-One files, but it is a better approach because it makes
+        debugging possible in the Debug configuration (the symbols will be in the correct .obj file
+        for the original .cpp files).
+
+        * WebCore.vcproj/WebCore.vcproj:
+        Also, let VS have its way with the vcproj file.
+        * inspector/InspectorAllInOne.cpp: Added.
+
 2012-01-28  Matthew Delaney  <[email protected]>
 
         Limit periodic flushing inside ImageBufferCG to just Lion

Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (106279 => 106280)


--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-01-30 21:07:25 UTC (rev 106279)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj	2012-01-30 21:08:48 UTC (rev 106280)
@@ -25834,19 +25834,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\loader\DocumentLoadTiming.cpp"
+				RelativePath="..\loader\DocumentLoader.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\loader\DocumentLoadTiming.h"
+				RelativePath="..\loader\DocumentLoader.h"
 				>
 			</File>
 			<File
-				RelativePath="..\loader\DocumentLoader.cpp"
+				RelativePath="..\loader\DocumentLoadTiming.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\loader\DocumentLoader.h"
+				RelativePath="..\loader\DocumentLoadTiming.h"
 				>
 			</File>
 			<File
@@ -26621,15 +26621,15 @@
 				RelativePath="..\platform\GeolocationService.h"
 				>
 			</File>
-            <File
-                RelativePath="..\platform\HistogramSupport.cpp"
-                >
-            </File>
-            <File
-                RelativePath="..\platform\HistogramSupport.h"
-                >
-            </File>
 			<File
+				RelativePath="..\platform\HistogramSupport.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\platform\HistogramSupport.h"
+				>
+			</File>
+			<File
 				RelativePath="..\platform\HostWindow.h"
 				>
 			</File>
@@ -32702,7 +32702,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\css\CSSBorderImageSliceValue.cpp"
+				RelativePath="..\css\CSSBorderImage.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -32754,11 +32754,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\css\CSSBorderImageSliceValue.h"
+				RelativePath="..\css\CSSBorderImage.h"
 				>
 			</File>
 			<File
-				RelativePath="..\css\CSSBorderImage.cpp"
+				RelativePath="..\css\CSSBorderImageSliceValue.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -32810,7 +32810,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\css\CSSBorderImage.h"
+				RelativePath="..\css\CSSBorderImageSliceValue.h"
 				>
 			</File>
 			<File
@@ -40754,7 +40754,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\rendering\RenderTableCell.cpp"
+				RelativePath="..\rendering\RenderTableCaption.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -40806,11 +40806,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\rendering\RenderTableCell.h"
+				RelativePath="..\rendering\RenderTableCaption.h"
 				>
 			</File>
 			<File
-				RelativePath="..\rendering\RenderTableCaption.cpp"
+				RelativePath="..\rendering\RenderTableCell.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -40862,7 +40862,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\rendering\RenderTableCaption.h"
+				RelativePath="..\rendering\RenderTableCell.h"
 				>
 			</File>
 			<File
@@ -44991,7 +44991,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\rendering\svg\SVGTextMetricsBuilder.cpp"
+					RelativePath="..\rendering\svg\SVGTextMetrics.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -45043,11 +45043,11 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\rendering\svg\SVGTextMetricsBuilder.h"
+					RelativePath="..\rendering\svg\SVGTextMetrics.h"
 					>
 				</File>
 				<File
-					RelativePath="..\rendering\svg\SVGTextMetrics.cpp"
+					RelativePath="..\rendering\svg\SVGTextMetricsBuilder.cpp"
 					>
 					<FileConfiguration
 						Name="Debug|Win32"
@@ -45099,7 +45099,7 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\rendering\svg\SVGTextMetrics.h"
+					RelativePath="..\rendering\svg\SVGTextMetricsBuilder.h"
 					>
 				</File>
 				<File
@@ -49553,63 +49553,63 @@
 				RelativePath="..\dom\MutationObserverInterestGroup.h"
 				>
 			</File>
-            <File
-                RelativePath="..\dom\MutationObserverRegistration.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\MutationObserverRegistration.h"
-                >
-            </File>
 			<File
+				RelativePath="..\dom\MutationObserverRegistration.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\MutationObserverRegistration.h"
+				>
+			</File>
+			<File
 				RelativePath="..\dom\MutationRecord.cpp"
 				>
 				<FileConfiguration
@@ -57317,63 +57317,63 @@
 				RelativePath="..\html\HTMLFormControlElement.h"
 				>
 			</File>
-                        <File
-                                RelativePath="..\html\HTMLFormControlElementWithState.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="..\html\HTMLFormControlElementWithState.h"
-                                >
-                        </File>
 			<File
+				RelativePath="..\html\HTMLFormControlElementWithState.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="..\html\HTMLFormControlElementWithState.h"
+				>
+			</File>
+			<File
 				RelativePath="..\html\HTMLFormElement.cpp"
 				>
 				<FileConfiguration
@@ -60933,19 +60933,19 @@
 				Name="shadow"
 				>
 				<File
-					RelativePath="..\html\shadow\ContentSelectorQuery.cpp"
+					RelativePath="..\html\shadow\ContentInclusionSelector.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\html\shadow\ContentSelectorQuery.h"
+					RelativePath="..\html\shadow\ContentInclusionSelector.h"
 					>
 				</File>
 				<File
-					RelativePath="..\html\shadow\ContentInclusionSelector.cpp"
+					RelativePath="..\html\shadow\ContentSelectorQuery.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\html\shadow\ContentInclusionSelector.h"
+					RelativePath="..\html\shadow\ContentSelectorQuery.h"
 					>
 				</File>
 				<File
@@ -70598,14 +70598,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\storage\DOMWindowSQLDatabase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\storage\DOMWindowSQLDatabase.h"
-				>
-			</File>
-			<File
 				RelativePath="..\storage\Database.cpp"
 				>
 			</File>
@@ -70658,6 +70650,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\storage\DOMWindowSQLDatabase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\storage\DOMWindowSQLDatabase.h"
+				>
+			</File>
+			<File
 				RelativePath="..\storage\IDBAny.cpp"
 				>
 			</File>
@@ -71264,14 +71264,82 @@
 			<File
 				RelativePath="..\inspector\InspectorAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorAgent.h"
 				>
 			</File>
 			<File
+				RelativePath="..\inspector\InspectorAllInOne.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|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>
+			</File>
+			<File
 				RelativePath="..\inspector\InspectorApplicationCacheAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorApplicationCacheAgent.h"
@@ -71280,6 +71348,22 @@
 			<File
 				RelativePath="..\inspector\InspectorBaseAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorBaseAgent.h"
@@ -71288,6 +71372,22 @@
 			<File
 				RelativePath="..\inspector\InspectorClient.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorClient.h"
@@ -71296,6 +71396,22 @@
 			<File
 				RelativePath="..\inspector\InspectorConsoleAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorConsoleAgent.h"
@@ -71308,6 +71424,22 @@
 			<File
 				RelativePath="..\inspector\InspectorController.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorController.h"
@@ -71316,6 +71448,22 @@
 			<File
 				RelativePath="..\inspector\InspectorCSSAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorCSSAgent.h"
@@ -71324,6 +71472,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDatabaseAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDatabaseAgent.h"
@@ -71336,6 +71500,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDatabaseResource.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDatabaseResource.h"
@@ -71344,6 +71524,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDebuggerAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDebuggerAgent.h"
@@ -71352,6 +71548,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDOMAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDOMAgent.h"
@@ -71360,6 +71572,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDOMDebuggerAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDOMDebuggerAgent.h"
@@ -71368,6 +71596,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDOMStorageAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDOMStorageAgent.h"
@@ -71376,6 +71620,22 @@
 			<File
 				RelativePath="..\inspector\InspectorDOMStorageResource.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorDOMStorageResource.h"
@@ -71384,6 +71644,22 @@
 			<File
 				RelativePath="..\inspector\InspectorFileSystemAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorFileSystemAgent.h"
@@ -71404,6 +71680,22 @@
 			<File
 				RelativePath="..\inspector\InspectorFrontendClientLocal.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorFrontendClientLocal.h"
@@ -71412,6 +71704,22 @@
 			<File
 				RelativePath="..\inspector\InspectorFrontendHost.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorFrontendHost.h"
@@ -71420,6 +71728,22 @@
 			<File
 				RelativePath="..\inspector\InspectorIndexedDBAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorIndexedDBAgent.h"
@@ -71428,6 +71752,22 @@
 			<File
 				RelativePath="..\inspector\InspectorInstrumentation.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorInstrumentation.h"
@@ -71436,6 +71776,22 @@
 			<File
 				RelativePath="..\inspector\InspectorMemoryAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorMemoryAgent.h"
@@ -71444,6 +71800,22 @@
 			<File
 				RelativePath="..\inspector\InspectorPageAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorPageAgent.h"
@@ -71452,6 +71824,22 @@
 			<File
 				RelativePath="..\inspector\InspectorProfilerAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorProfilerAgent.h"
@@ -71460,6 +71848,22 @@
 			<File
 				RelativePath="..\inspector\InspectorResourceAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorResourceAgent.h"
@@ -71468,6 +71872,22 @@
 			<File
 				RelativePath="..\inspector\InspectorRuntimeAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorRuntimeAgent.h"
@@ -71476,6 +71896,22 @@
 			<File
 				RelativePath="..\inspector\InspectorState.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorState.h"
@@ -71488,6 +71924,22 @@
 			<File
 				RelativePath="..\inspector\InspectorStyleSheet.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorStyleSheet.h"
@@ -71496,6 +71948,22 @@
 			<File
 				RelativePath="..\inspector\InspectorStyleTextEditor.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorStyleTextEditor.h"
@@ -71504,6 +71972,22 @@
 			<File
 				RelativePath="..\inspector\InspectorTimelineAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorTimelineAgent.h"
@@ -71512,6 +71996,22 @@
 			<File
 				RelativePath="..\inspector\InspectorValues.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorValues.h"
@@ -71520,6 +72020,22 @@
 			<File
 				RelativePath="..\inspector\InspectorWorkerAgent.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Production|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\inspector\InspectorWorkerAgent.h"
@@ -71881,11 +72397,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\inspector\front-end\FilteredItemSelectionDialog.js"
+					RelativePath="..\inspector\front-end\filteredItemSelectionDialog.css"
 					>
 				</File>
 				<File
-					RelativePath="..\inspector\front-end\filteredItemSelectionDialog.css"
+					RelativePath="..\inspector\front-end\FilteredItemSelectionDialog.js"
 					>
 				</File>
 				<File

Added: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (0 => 106280)


--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp	                        (rev 0)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp	2012-01-30 21:08:48 UTC (rev 106280)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2012 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// This all-in-one cpp file cuts down on template bloat to allow us to build our Windows release build.
+
+#include "InspectorAgent.cpp"
+#include "InspectorApplicationCacheAgent.cpp"
+#include "InspectorBaseAgent.cpp"
+#include "InspectorCSSAgent.cpp"
+#include "InspectorClient.cpp"
+#include "InspectorConsoleAgent.cpp"
+#include "InspectorController.cpp"
+#include "InspectorDOMAgent.cpp"
+#include "InspectorDOMDebuggerAgent.cpp"
+#include "InspectorDOMStorageAgent.cpp"
+#include "InspectorDOMStorageResource.cpp"
+#include "InspectorDatabaseAgent.cpp"
+#include "InspectorDatabaseResource.cpp"
+#include "InspectorDebuggerAgent.cpp"
+#include "InspectorFileSystemAgent.cpp"
+#include "InspectorFrontendClientLocal.cpp"
+#include "InspectorFrontendHost.cpp"
+#include "InspectorIndexedDBAgent.cpp"
+#include "InspectorInstrumentation.cpp"
+#include "InspectorMemoryAgent.cpp"
+#include "InspectorPageAgent.cpp"
+#include "InspectorProfilerAgent.cpp"
+#include "InspectorResourceAgent.cpp"
+#include "InspectorRuntimeAgent.cpp"
+#include "InspectorState.cpp"
+#include "InspectorStyleSheet.cpp"
+#include "InspectorStyleTextEditor.cpp"
+#include "InspectorTimelineAgent.cpp"
+#include "InspectorValues.cpp"
+#include "InspectorWorkerAgent.cpp"

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes