Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

6 files changed, 59 insertions, 2 deletions

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 68cd1c4..0939954 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,61 @@
+2010-07-12  Mark Rowe  <mrowe@apple.com>
+
+        Rubber-stamped by Sam Weinig.
+
+        Update WebKitSystemInterface.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2010-07-12  Adam Roben  <aroben@apple.com>
+
+        Stop generating stripped symbols for Release builds
+
+        It turns out we can strip the symbols after-the-fact using PDBCopy.
+
+        Fixes <http://webkit.org/b/42085>.
+
+        Reviewed by Steve Falkenburg.
+
+        * win/tools/vsprops/release.vsprops: Removed the StripPrivateSymbols
+        attribute, which caused link.exe to generate a stripped PDB file for
+        each project.
+
+2010-07-08  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Update WebKitSystemInterface.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * libWebKitSystemInterfaceTiger.a:
+
+2010-07-07  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Adam Roben.
+
+        Disable MSVC warning 4288.
+        https://bugs.webkit.org/show_bug.cgi?id=41804
+
+        MSVC has a non-standard extension that allows variables declared
+        in for-loops to remain visible in the same scope even after
+        exiting the for-loop
+        (http://msdn.microsoft.com/en-us/library/bk5hc10s.aspx). The /Ze
+        option (turned on by default) enables all MSVC extensions, and
+        /Zc:forScope- tells the compiler to issue a C4288 warning when the
+        same variable is declared in the for-loop and re-declared later in
+        the same scope.
+
+        There seems to be a bug in VS2005 that erroneously enables
+        /Zc:forScope- even when that option is not specified
+        (http://connect.microsoft.com/VisualStudio/feedback/details/338010/bogus-compiler-warning-c4288). Looks
+        like our build got hit by that bug, so we need to disable warning
+        4288 to fix it.
+
+        * win/tools/vsprops/common.vsprops:
+
 2010-07-01  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 3b4061c..76c174a 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index 5d3106c..6423601 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceTiger.a b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
index a3743e4..abf266d 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceTiger.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceTiger.a
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 28dfb67..b9c710c 100644
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -15,7 +15,7 @@
 		WarningLevel="4"
 		WarnAsError="true"
 		DebugInformationFormat="3"
-		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
+		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
 	/>
 	<Tool
 		Name="VCLibrarianTool"
diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops
index 109176d..8b38b73 100644
--- a/WebKitLibraries/win/tools/vsprops/release.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/release.vsprops
@@ -13,7 +13,6 @@
 	<Tool
 		Name="VCLinkerTool"
 		LinkIncremental="1"
-		StripPrivateSymbols="$(WebKitOutputDir)\public\sym\$(TargetName).pdb"
 		OptimizeReferences="2"
 		EnableCOMDATFolding="2"
 		OptimizeForWindows98="1"