Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

10 files changed, 254 insertions, 92 deletions

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 240137114..ed0fadb17 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,148 @@
+2012-05-06  Eric Seidel  <eric@webkit.org>
+
+        Remove 3D_CANVAS define from vsprops files (it was renamed WEBGL many months ago)
+        https://bugs.webkit.org/show_bug.cgi?id=85743
+
+        Reviewed by Adam Barth.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-05-02  Eric Seidel  <eric@webkit.org>
+
+        Resort FeatureDefinesCairo.vcprops to actually be alphabetical (in preparation for autogeneration)
+        https://bugs.webkit.org/show_bug.cgi?id=85454
+
+        Reviewed by Adam Barth.
+
+        The PreprocessorDefinitions line is still not sorted, but I'll do that in a separate patch.
+        There is no functional change in this patch.  Just moving the defines around.
+        Its interesting to me that now that it's sorted and I can easily compare this with other
+        ports and found that a whole bunch of defines which should be on for Cairo are off,
+        likely due to Cairo simply being overlooked.  These oversights should be easy to avoid
+        in an autogenerated world.
+
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-05-02  Eric Seidel  <eric@webkit.org>
+
+        Fix tabs vs. space formating in FeatureDefines.vsprops and fix alphabetical sorting
+        https://bugs.webkit.org/show_bug.cgi?id=85445
+
+        Reviewed by Adam Barth.
+
+        I noticed this when comparing my auto-generated output for this file vs. the one
+        we have checked in.  Seems we might as well fix the checked in file to be
+        consistent in style with itself. :)
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2012-04-27  Gavin Peters  <gavinp@chromium.org>
+
+        Add new ENABLE_LINK_PRERENDER define to control the Prerendering API
+        https://bugs.webkit.org/show_bug.cgi?id=84871
+
+        Reviewed by Adam Barth.
+
+        Prerendering is currently covered by the ENABLE_LINK_PREFETCH macro, but the new Prerendering
+        API separates it from prefetching.  Having separate include guards lets ports enable prefetching,
+        a relatively easy change, without needing to build the infrastructure for prerendering, which
+        is considerably more complicated.
+
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-04-10  Adam Barth  <abarth@webkit.org>
+
+        Limit -apple- and -khtml- to ENABLE(DASHBOARD_SUPPORT)
+        https://bugs.webkit.org/show_bug.cgi?id=83256
+
+        Reviewed by Eric Seidel.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2012-04-09  Beth Dakin  <bdakin@apple.com>
+
+        <rdar://problem/11214796>
+
+        New WKSI will hopefully fix a common crash seen by the bots in libRIP.A.dylib: 
+        symmetric_convolve
+
+        Reviewed by Simon Fraser.
+
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
+2012-04-06  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10912476> HiDPI: Have canvas use a hidpi backing store, but downsample upon access
+
+        Reviewed by Sam Weinig.
+
+        * win/tools/vsprops/FeatureDefines.vsprops: Added ENABLE_HIGH_DPI_CANVAS.
+
+2012-04-03  Keishi Hattori  <keishi@webkit.org>
+
+        Disable ENABLE_DATALIST for now
+        https://bugs.webkit.org/show_bug.cgi?id=82871
+
+        Reviewed by Kent Tamura.
+
+        * win/tools/vsprops/FeatureDefines.vsprops: Disabled ENABLE_DATALIST.
+
+2012-03-30  Keishi Hattori  <keishi@webkit.org>
+
+        Change ENABLE_INPUT_COLOR to ENABLE_INPUT_TYPE_COLOR and enable it for chromium
+        https://bugs.webkit.org/show_bug.cgi?id=80972
+
+        Reviewed by Kent Tamura.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-03-20  Steve Falkenburg  <sfalken@apple.com>
+
+        Disable LTCG on Windows to avoid out of process space errors while linking
+        https://bugs.webkit.org/show_bug.cgi?id=81714
+
+        Reviewed by Jessie Berlin.
+
+        * win/tools/vsprops/production.vsprops:
+
+2012-03-14  Jer Noble  <jer.noble@apple.com>
+
+        Wrong icon to restore to windowed mode in full screen video panel
+        https://bugs.webkit.org/show_bug.cgi?id=70437
+
+        Reviewed by Eric Carlson.
+
+        * WebKitSystemInterface.h: Added WKMediaUIPartExitFullscreenButton.
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+
+2012-03-13  Adam Barth  <abarth@webkit.org> && Benjamin Poulain  <bpoulain@apple.com>
+
+        Always enable ENABLE(CLIENT_BASED_GEOLOCATION)
+        https://bugs.webkit.org/show_bug.cgi?id=78853
+
+        Reviewed by Adam Barth.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-03-12  Enrica Casucci  <enrica@apple.com>
+
+        WebKit2: remove NSPasteboard access for promised data from the WebProcess
+        https://bugs.webkit.org/show_bug.cgi?id=80073
+
+        * WebKitSystemInterface.h: Touched the file to make build system happy.
+        * libWebKitSystemInterfaceLeopard.a:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceSnowLeopard.a:
+
 2012-03-09  Jon Lee  <jonlee@apple.com>
 
         Add support for ENABLE(LEGACY_NOTIFICATIONS)
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index ef47e2a32..a67c8749f 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -276,6 +276,10 @@ typedef enum {
     WKMediaUIPartVolumeSliderThumb,
     WKMediaUIPartFullScreenVolumeSlider,
     WKMediaUIPartFullScreenVolumeSliderThumb,
+    WKMediaUIPartVolumeSliderMuteButton,
+    WKMediaUIPartTextTrackDisplayContainer,
+    WKMediaUIPartTextTrackDisplay,
+    WKMediaUIPartExitFullscreenButton,
 } WKMediaUIPart;
 
 typedef enum {
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
index 6c5bf407c..868149cfd 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLion.a b/WebKitLibraries/libWebKitSystemInterfaceLion.a
index 69cd4c3cb..add5b2fc7 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceLion.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceLion.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
index c33e96ce9..bf3fae34b 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 07636952b..33fab9f67 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -225,6 +225,10 @@ typedef enum {
     WKMediaUIPartVolumeSliderThumb,
     WKMediaUIPartFullScreenVolumeSlider,
     WKMediaUIPartFullScreenVolumeSliderThumb,
+    WKMediaUIPartVolumeSliderMuteButton,
+    WKMediaUIPartTextTrackDisplayContainer,
+    WKMediaUIPartTextTrackDisplay,
+    WKMediaUIPartExitFullscreenButton,
 } WKMediaUIPart;
 
 typedef enum {
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 08c7ccbfd..12ae42323 100644
--- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib
+++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
index c25fb6014..342adff1e 100644
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
@@ -9,17 +9,7 @@
 	>
   <Tool
 		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
-	/>
-  <UserMacro
-		Name="ENABLE_REQUEST_ANIMATION_FRAME"
-		Value="ENABLE_REQUEST_ANIMATION_FRAME"
-		PerformEnvironmentSet="true"
-	/>
-    <UserMacro
-		Name="ENABLE_3D_CANVAS"
-		Value=""
-		PerformEnvironmentSet="true"
+		PreprocessorDefinitions="$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
 	/>
   <UserMacro
 		Name="ENABLE_3D_RENDERING"
@@ -42,8 +32,8 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CLIENT_BASED_GEOLOCATION"
-		Value="ENABLE_CLIENT_BASED_GEOLOCATION"
+		Name="ENABLE_CSS_EXCLUSIONS"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
@@ -57,33 +47,23 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CSS_SHADERS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_CSS_REGIONS"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CSS_EXCLUSIONS"
+		Name="ENABLE_CSS_SHADERS"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_SQL_DATABASE"
-		Value="ENABLE_SQL_DATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_DATAGRID"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
 		Name="ENABLE_DATALIST"
-		Value="ENABLE_DATALIST"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
@@ -102,13 +82,8 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-        Name="ENABLE_DIRECTORY_UPLOAD"
-        Value=""
-        PerformEnvironmentSet="true"
-    />
-  <UserMacro
-		Name="ENABLE_FILTERS"
-		Value="ENABLE_FILTERS"
+		Name="ENABLE_DIRECTORY_UPLOAD"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
@@ -117,6 +92,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_FILTERS"
+		Value="ENABLE_FILTERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_FULLSCREEN_API"
 		Value="ENABLE_FULLSCREEN_API"
 		PerformEnvironmentSet="true"
@@ -132,6 +112,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_HIGH_DPI_CANVAS"
+		Value="ENABLE_HIGH_DPI_CANVAS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_ICONDATABASE"
 		Value="ENABLE_ICONDATABASE"
 		PerformEnvironmentSet="true"
@@ -142,12 +127,12 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_INPUT_COLOR"
+		Name="ENABLE_INPUT_SPEECH"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_INPUT_SPEECH"
+		Name="ENABLE_INPUT_TYPE_COLOR"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
@@ -186,22 +171,42 @@
 		Value="ENABLE_JAVASCRIPT_DEBUGGER"
 		PerformEnvironmentSet="true"
 	/>
-    <UserMacro
-  		Name="ENABLE_LEGACY_NOTIFICATIONS"
-  		Value=""
-  		PerformEnvironmentSet="true"
-  	/>
+  <UserMacro
+		Name="ENABLE_LEGACY_CSS_VENDOR_PREFIXES"
+		Value="ENABLE_LEGACY_CSS_VENDOR_PREFIXES"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_LEGACY_NOTIFICATIONS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
   <UserMacro
 		Name="ENABLE_LINK_PREFETCH"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_LINK_PRERENDER"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_MATHML"
 		Value="ENABLE_MATHML"
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_MEDIA_SOURCE"
+		Value="ENABLE_MEDIA_SOURCE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_MEDIA_STATISTICS"
+		Value="ENABLE_MEDIA_STATISTICS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_METER_TAG"
 		Value="ENABLE_METER_TAG"
 		PerformEnvironmentSet="true"
@@ -242,6 +247,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_REQUEST_ANIMATION_FRAME"
+		Value="ENABLE_REQUEST_ANIMATION_FRAME"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_SCRIPTED_SPEECH"
 		Value=""
 		PerformEnvironmentSet="true"
@@ -257,6 +267,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_SQL_DATABASE"
+		Value="ENABLE_SQL_DATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_STYLE_SCOPED"
 		Value=""
 		PerformEnvironmentSet="true"
@@ -282,16 +297,6 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_MEDIA_SOURCE"
-		Value="ENABLE_MEDIA_SOURCE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MEDIA_STATISTICS"
-		Value="ENABLE_MEDIA_STATISTICS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_WEB_AUDIO"
 		Value=""
 		PerformEnvironmentSet="true"
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
index 3ceac18c1..fad1f4c7a 100644
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
@@ -9,12 +9,7 @@
 	>
   <Tool
 		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
-	/>
-  <UserMacro
-		Name="ENABLE_3D_CANVAS"
-		Value=""
-		PerformEnvironmentSet="true"
+		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_TAG);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_TAG);$(ENABLE_QUOTA);$(ENABLE_REGISTER_PROTOCOL_HANDLER);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
 	/>
   <UserMacro
 		Name="ENABLE_3D_RENDERING"
@@ -37,8 +32,8 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CLIENT_BASED_GEOLOCATION"
-		Value="ENABLE_CLIENT_BASED_GEOLOCATION"
+		Name="ENABLE_CSS_EXCLUSIONS"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
@@ -52,26 +47,16 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CSS_SHADERS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_CSS_REGIONS"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_CSS_EXCLUSIONS"
+		Name="ENABLE_CSS_SHADERS"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_SQL_DATABASE"
-		Value="ENABLE_SQL_DATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_DATAGRID"
 		Value=""
 		PerformEnvironmentSet="true"
@@ -97,13 +82,8 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-        Name="ENABLE_DIRECTORY_UPLOAD"
-        Value=""
-        PerformEnvironmentSet="true"
-    />
-  <UserMacro
-		Name="ENABLE_FILTERS"
-		Value="ENABLE_FILTERS"
+		Name="ENABLE_DIRECTORY_UPLOAD"
+		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
@@ -112,6 +92,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_FILTERS"
+		Value="ENABLE_FILTERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_FULLSCREEN_API"
 		Value=""
 		PerformEnvironmentSet="true"
@@ -137,12 +122,12 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_INPUT_COLOR"
+		Name="ENABLE_INPUT_SPEECH"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_INPUT_SPEECH"
+		Name="ENABLE_INPUT_TYPE_COLOR"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
@@ -181,22 +166,37 @@
 		Value="ENABLE_JAVASCRIPT_DEBUGGER"
 		PerformEnvironmentSet="true"
 	/>
-    <UserMacro
-  		Name="ENABLE_LEGACY_NOTIFICATIONS"
-  		Value=""
-  		PerformEnvironmentSet="true"
-  	/>
+  <UserMacro
+		Name="ENABLE_LEGACY_NOTIFICATIONS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
   <UserMacro
 		Name="ENABLE_LINK_PREFETCH"
 		Value=""
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_LINK_PRERENDER"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_MATHML"
 		Value="ENABLE_MATHML"
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_MEDIA_SOURCE"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_MEDIA_STATISTICS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_METER_TAG"
 		Value="ENABLE_METER_TAG"
 		PerformEnvironmentSet="true"
@@ -252,6 +252,11 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
+		Name="ENABLE_SQL_DATABASE"
+		Value="ENABLE_SQL_DATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
 		Name="ENABLE_STYLE_SCOPED"
 		Value=""
 		PerformEnvironmentSet="true"
@@ -277,16 +282,6 @@
 		PerformEnvironmentSet="true"
 	/>
   <UserMacro
-		Name="ENABLE_MEDIA_SOURCE"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MEDIA_STATISTICS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
 		Name="ENABLE_WEB_AUDIO"
 		Value=""
 		PerformEnvironmentSet="true"
diff --git a/WebKitLibraries/win/tools/vsprops/production.vsprops b/WebKitLibraries/win/tools/vsprops/production.vsprops
index cc5ba1c75..70e0694f0 100644
--- a/WebKitLibraries/win/tools/vsprops/production.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/production.vsprops
@@ -7,6 +7,15 @@
 	<Tool
 		Name="VCCLCompilerTool"
 		PreprocessorDefinitions="__PRODUCTION__=1"
+		WholeProgramOptimization="false"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		LinkTimeCodeGeneration="0"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		LinkTimeCodeGeneration="false"
 	/>
 	<Tool
 		Name="VCMIDLTool"