[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit cf9f0e6580cf9c12b0944427bcd15fa1d93a7bb3
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 16:58:28 2010 +0000

    Fix linker warnings when building WebCore on Windows
    
    Rubber-stamped by Steve Falkenburg.
    
    * WebCore.vcproj/WebCore.vcproj: Exclude JSDOMFormData.cpp from the
    build, since it's already included in DerivedSources.cpp. Also let VS
    sort this file as it saw fit.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56069 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0001f4a..38881fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-16  Adam Roben  <aroben at apple.com>
+
+        Fix linker warnings when building WebCore on Windows
+
+        Rubber-stamped by Steve Falkenburg.
+
+        * WebCore.vcproj/WebCore.vcproj: Exclude JSDOMFormData.cpp from the
+        build, since it's already included in DerivedSources.cpp. Also let VS
+        sort this file as it saw fit.
+
 2010-03-15  Antti Koivisto  <koivisto at iki.fi>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index 2e1c177..6ac54fc 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -2907,6 +2907,54 @@
 			<File
 				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMFormData.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Internal|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_Cairo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release_Cairo|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug_All|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMFormData.h"
@@ -20861,23 +20909,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\page\GeolocationPositionCache.cpp"
+				RelativePath="..\page\GeolocationControllerClient.h"
 				>
 			</File>
 			<File
-				RelativePath="..\page\GeolocationPositionCache.h"
+				RelativePath="..\page\GeolocationError.h"
 				>
 			</File>
 			<File
-				RelativePath="..\page\GeolocationControllerClient.h"
+				RelativePath="..\page\GeolocationPosition.h"
 				>
 			</File>
 			<File
-				RelativePath="..\page\GeolocationError.h"
+				RelativePath="..\page\GeolocationPositionCache.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\page\GeolocationPosition.h"
+				RelativePath="..\page\GeolocationPositionCache.h"
 				>
 			</File>
 			<File
@@ -28649,19 +28697,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\dom\CDATASection.cpp"
+				RelativePath="..\dom\CanvasSurface.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\dom\CDATASection.h"
+				RelativePath="..\dom\CanvasSurface.h"
 				>
 			</File>
 			<File
-				RelativePath="..\dom\CanvasSurface.cpp"
+				RelativePath="..\dom\CDATASection.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\dom\CanvasSurface.h"
+				RelativePath="..\dom\CDATASection.h"
 				>
 			</File>
 			<File
@@ -35656,6 +35704,14 @@
 					</FileConfiguration>
 				</File>
 				<File
+					RelativePath="..\bindings\js\JSDebugWrapperSet.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDebugWrapperSet.h"
+					>
+				</File>
+				<File
 					RelativePath="..\bindings\js\JSDedicatedWorkerContextCustom.cpp"
 					>
 					<FileConfiguration
@@ -35916,14 +35972,6 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDebugWrapperSet.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDebugWrapperSet.h"
-					>
-				</File>
-				<File
 					RelativePath="..\bindings\js\JSDOMBinding.cpp"
 					>
 					<FileConfiguration
@@ -36152,14 +36200,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\bindings\js\JSDOMWrapper.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\bindings\js\JSDOMWrapper.h"
-					>
-				</File>
-				<File
 					RelativePath="..\bindings\js\JSDOMWindowShell.cpp"
 					>
 					<FileConfiguration
@@ -36216,6 +36256,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\bindings\js\JSDOMWrapper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\bindings\js\JSDOMWrapper.h"
+					>
+				</File>
+				<File
 					RelativePath="..\bindings\js\JSElementCustom.cpp"
 					>
 					<FileConfiguration
@@ -42669,14 +42717,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\bridge\c\CRuntimeObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\bridge\c\CRuntimeObject.h"
-				>
-			</File>
-			<File
 				RelativePath="..\bridge\c\c_class.cpp"
 				>
 			</File>
@@ -42709,6 +42749,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\bridge\c\CRuntimeObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\bridge\c\CRuntimeObject.h"
+				>
+			</File>
+			<File
 				RelativePath="..\bridge\IdentifierRep.cpp"
 				>
 			</File>

-- 
WebKit Debian packaging