Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82

11 files changed, 418 insertions, 4 deletions

diff --git a/WebKitLibraries/win/bin/QuartzCoreInterface.dll b/WebKitLibraries/win/bin/QuartzCoreInterface.dll
new file mode 100755
index 0000000..0b64349
--- /dev/null
+++ b/WebKitLibraries/win/bin/QuartzCoreInterface.dll
diff --git a/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h b/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h
new file mode 100644
index 0000000..b3cef10
--- /dev/null
+++ b/WebKitLibraries/win/include/QuartzCoreInterface/QuartzCoreInterface.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ */
+
+#ifndef QuartzCoreInterface_h
+#define QuartzCoreInterface_h
+
+#ifdef QUARTZCOREINTERFACE_EXPORTS
+#define QUARTZCOREINTERFACE_API __declspec(dllexport)
+#else
+#define QUARTZCOREINTERFACE_API __declspec(dllimport)
+#endif
+
+// Interface to give access to QuartzCore data symbols.
+enum WKQCStringRefType { wkqckCACFLayer, wkqckCACFTransformLayer, wkqckCACFFilterLinear, wkqckCACFFilterNearest,
+                         wkqckCACFFilterTrilinear, wkqckCACFFilterLanczos, wkqckCACFGravityCenter, wkqckCACFGravityTop, 
+                         wkqckCACFGravityBottom, wkqckCACFGravityLeft, wkqckCACFGravityRight, wkqckCACFGravityTopLeft, 
+                         wkqckCACFGravityTopRight, wkqckCACFGravityBottomLeft, wkqckCACFGravityBottomRight, 
+                         wkqckCACFGravityResize, wkqckCACFGravityResizeAspect, wkqckCACFGravityResizeAspectFill };
+
+enum WKQCCARenderOGLCallbacksType { wkqckCARenderDX9Callbacks };
+
+typedef const struct __CFString * CFStringRef;
+typedef struct _CARenderOGLCallbacks CARenderOGLCallbacks;
+typedef struct CATransform3D CATransform3D;
+
+extern "C" {
+QUARTZCOREINTERFACE_API CFStringRef wkqcCFStringRef(WKQCStringRefType);
+QUARTZCOREINTERFACE_API const CARenderOGLCallbacks* wkqcCARenderOGLCallbacks(WKQCCARenderOGLCallbacksType);
+QUARTZCOREINTERFACE_API const CATransform3D& wkqcCATransform3DIdentity();
+}
+
+#endif // QuartzCoreInterface_h
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index e3feae6..824b44d 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -58,6 +58,7 @@ void wkRestoreFontSmoothingStyle(CGContextRef cg, uint32_t oldStyle);
 void wkSetCGContextFontRenderingStyle(CGContextRef, bool isSystemFont, bool isPrinterFont, bool usePlatformNativeGlyphs);
 void wkGetGlyphAdvances(CGFontRef, const CGAffineTransform&, bool isSystemFont, bool isPrinterFont, CGGlyph, CGSize& advance);
 void wkGetGlyphs(CGFontRef, const UChar[], CGGlyph[], size_t count);
+bool wkCanCreateCGFontWithLOGFONT();
 void wkSetFontPlatformInfo(CGFontRef, LOGFONT*, void(*)(void*));
 void wkSetUpFontCache(size_t s);
 void wkAddFontsInDirectory(CFStringRef);
@@ -68,6 +69,7 @@ CFPropertyListRef wkCreateFontsPlist();
 
 void wkSetPatternBaseCTM(CGContextRef, CGAffineTransform);
 void wkSetPatternPhaseInUserSpace(CGContextRef, CGPoint phasePoint);
+CGAffineTransform wkGetUserToBaseCTM(CGContextRef);
 
 void wkDrawFocusRing(CGContextRef, CGColorRef, float radius);
 
@@ -87,7 +89,7 @@ void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumber
 void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
 CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
 
-CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef);
+CFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace);
 
 CFStringRef wkCFNetworkErrorGetLocalizedDescription(CFIndex errorCode);
 
diff --git a/WebKitLibraries/win/lib/QuartzCoreInterface.lib b/WebKitLibraries/win/lib/QuartzCoreInterface.lib
new file mode 100755
index 0000000..0a556d3
--- /dev/null
+++ b/WebKitLibraries/win/lib/QuartzCoreInterface.lib
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 60d4e1e..f1857e7 100644
--- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib
+++ b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 56cbdcf..9722d97 100644
--- a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
+++ b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh
new file mode 100644
index 0000000..71c3a9b
--- /dev/null
+++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/bash
+
+# Copyright (C) 2010 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+
+if [ "$2" = "cairo" ]; then
+    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.vsprops
+else
+    FeatureDefines=$1/tools/vsprops/FeatureDefines.vsprops
+fi
+
+grep Value=\"ENABLE_ $FeatureDefines | sed 's/^.*Value\=\"/ /' | sed 's/\"//' | tr -d '\n'
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
new file mode 100644
index 0000000..45495a3
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Keep this list of features (not enabled/disabled state) in sync with FeatureDefines.xcconfig files in JavaScriptCore, WebCore, and WebKit. -->
+<!-- Add new features to both PreprocessorDefinitions and UserMacro sections. -->
+<!-- Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. -->
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="FeatureDefines"
+	>
+  <Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+	/>
+  <UserMacro
+		Name="ENABLE_3D_CANVAS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_3D_RENDERING"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_CHANNEL_MESSAGING"
+		Value="ENABLE_CHANNEL_MESSAGING"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_CLIENT_BASED_GEOLOCATION"
+		Value="ENABLE_CLIENT_BASED_GEOLOCATION"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATABASE"
+		Value="ENABLE_DATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATAGRID"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATALIST"
+		Value="ENABLE_DATALIST"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DOM_STORAGE"
+		Value="ENABLE_DOM_STORAGE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_EVENTSOURCE"
+		Value="ENABLE_EVENTSOURCE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_FILTERS"
+		Value="ENABLE_FILTERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_GEOLOCATION"
+		Value="ENABLE_GEOLOCATION"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_ICONDATABASE"
+		Value="ENABLE_ICONDATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_INDEXED_DATABASE"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_JAVASCRIPT_DEBUGGER"
+		Value="ENABLE_JAVASCRIPT_DEBUGGER"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_MATHML"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_NOTIFICATIONS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_OFFLINE_WEB_APPLICATIONS"
+		Value="ENABLE_OFFLINE_WEB_APPLICATIONS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SHARED_WORKERS"
+		Value="ENABLE_SHARED_WORKERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG"
+		Value="ENABLE_SVG"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_ANIMATION"
+		Value="ENABLE_SVG_ANIMATION"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_AS_IMAGE"
+		Value="ENABLE_SVG_AS_IMAGE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_DOM_OBJC_BINDINGS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_FONTS"
+		Value="ENABLE_SVG_FONTS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_FOREIGN_OBJECT"
+		Value="ENABLE_SVG_FOREIGN_OBJECT"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_USE"
+		Value="ENABLE_SVG_USE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_VIDEO"
+		Value="ENABLE_VIDEO"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WEB_SOCKETS"
+		Value="ENABLE_WEB_SOCKETS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WML"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WORKERS"
+		Value="ENABLE_WORKERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XHTMLMP"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XPATH"
+		Value="ENABLE_XPATH"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XSLT"
+		Value="ENABLE_XSLT"
+		PerformEnvironmentSet="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
new file mode 100644
index 0000000..1c16a9b
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<!-- Keep this list of features (not enabled/disabled state) in sync with FeatureDefines.xcconfig files in JavaScriptCore, WebCore, and WebKit. -->
+<!-- Add new features to both PreprocessorDefinitions and UserMacro sections. -->
+<!-- Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature. -->
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="FeatureDefines"
+	>
+  <Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="$(ENABLE_3D_CANVAS);$(ENABLE_3D_RENDERING);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CLIENT_BASED_GEOLOCATION);$(ENABLE_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST);$(ENABLE_DOM_STORAGE);$(ENABLE_EVENTSOURCE);$(ENABLE_FILTERS);$(ENABLE_GEOLOCATION);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_MATHML);$(ENABLE_NOTIFICATIONS);$(ENABLE_OFFLINE_WEB_APPLICATIONS);$(ENABLE_SHARED_WORKERS);$(ENABLE_SVG);$(ENABLE_SVG_ANIMATION);$(ENABLE_SVG_AS_IMAGE);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SVG_FOREIGN_OBJECT);$(ENABLE_SVG_USE);$(ENABLE_VIDEO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WML);$(ENABLE_WORKERS);$(ENABLE_XHTMLMP);$(ENABLE_XPATH);$(ENABLE_XSLT)"
+	/>
+  <UserMacro
+		Name="ENABLE_3D_CANVAS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_3D_RENDERING"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_CHANNEL_MESSAGING"
+		Value="ENABLE_CHANNEL_MESSAGING"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_CLIENT_BASED_GEOLOCATION"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATABASE"
+		Value="ENABLE_DATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATAGRID"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DATALIST"
+		Value="ENABLE_DATALIST"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_DOM_STORAGE"
+		Value="ENABLE_DOM_STORAGE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_EVENTSOURCE"
+		Value="ENABLE_EVENTSOURCE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_FILTERS"
+		Value="ENABLE_FILTERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_GEOLOCATION"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_ICONDATABASE"
+		Value="ENABLE_ICONDATABASE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_INDEXED_DATABASE"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_JAVASCRIPT_DEBUGGER"
+		Value="ENABLE_JAVASCRIPT_DEBUGGER"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_MATHML"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_NOTIFICATIONS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_OFFLINE_WEB_APPLICATIONS"
+		Value="ENABLE_OFFLINE_WEB_APPLICATIONS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SHARED_WORKERS"
+		Value="ENABLE_SHARED_WORKERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG"
+		Value="ENABLE_SVG"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_ANIMATION"
+		Value="ENABLE_SVG_ANIMATION"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_AS_IMAGE"
+		Value="ENABLE_SVG_AS_IMAGE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_DOM_OBJC_BINDINGS"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_FONTS"
+		Value="ENABLE_SVG_FONTS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_FOREIGN_OBJECT"
+		Value="ENABLE_SVG_FOREIGN_OBJECT"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_SVG_USE"
+		Value="ENABLE_SVG_USE"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_VIDEO"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WEB_SOCKETS"
+		Value="ENABLE_WEB_SOCKETS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WML"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_WORKERS"
+		Value="ENABLE_WORKERS"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XHTMLMP"
+		Value=""
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XPATH"
+		Value="ENABLE_XPATH"
+		PerformEnvironmentSet="true"
+	/>
+  <UserMacro
+		Name="ENABLE_XSLT"
+		Value="ENABLE_XSLT"
+		PerformEnvironmentSet="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
index 1a8f4b2..60873a3 100644
--- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
@@ -4,9 +4,9 @@
 	Version="8.00"

 	Name="WinCairo"

 	>

-	<Tool

+  <Tool

 		Name="VCCLCompilerTool"

-		PreprocessorDefinitions="WIN_CAIRO=1;ENABLE_FILTERS"

+		PreprocessorDefinitions="WIN_CAIRO=1"

 		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;"

 	/>

 	<Tool

diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 290db9a..8976ceb 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;4189;4244;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;4244;4251;4275;4291;4305;4344;4355;4389;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
 	/>
 	<Tool
 		Name="VCLibrarianTool"