Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
author: Allan Sandfeld Jensen <allan.jensen@digia.com> 2013-09-13 12:51:20 +0200
committer: The Qt Project <gerrit-noreply@qt-project.org> 2013-09-19 20:50:05 +0200
commit: d441d6f39bb846989d95bcf5caf387b42414718d (patch)
tree: e367e64a75991c554930278175d403c072de6bb8 /WebKitLibraries
parent: 0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
32 files changed, 2128 insertions, 1145 deletions
diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index bc819602c..c67ada560 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,844 @@
+2013-07-18  Roger Fong  <roger_fong@apple.com>
+
+        Make sure to link against _debug binaries when appropriate.
+        <rdar://problem/14473010>.
+
+        * win/tools/vsprops/debugsuffix.props:
+
+2013-07-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r152233.
+        http://trac.webkit.org/changeset/152233
+        https://bugs.webkit.org/show_bug.cgi?id=118304
+
+        hopeful attempt to restore windows buildage (Requested by
+        kling on #webkit).
+
+        * win/tools/vsprops/debugsuffix.props:
+
+2013-07-01  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] Unreviewed correction to DEBUG_ALL target.  Target was undefining DEBUG_ALL and DEBUG_INTERNAL,
+        which prevented proper build operation.
+
+        * win/tools/vsprops/debugsuffix.props: We should DEFINE (not UNDEFINE) the DEBUG_ALL and DEBUG_INTERNAL
+        macros when building with 'debugsuffix' target.
+
+2013-06-18  Roger Fong  <roger_fong@apple.com>
+
+        Replace tools32 folder with tools and update WebKit Windows solution accordingly.
+        <rdar://problem/14118143>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * win/tools: Copied from win/tools32.
+        * win/tools/WinTools.make:
+        * win/tools/scripts/auto-version.sh:
+        * win/tools/scripts/feature-defines.sh:
+        * win/tools32: Removed.
+        * win/tools32/WinTools.make: Removed.
+        * win/tools32/scripts: Removed.
+        * win/tools32/scripts/COPYRIGHT-END-YEAR: Removed.
+        * win/tools32/scripts/VERSION: Removed.
+        * win/tools32/scripts/auto-version.sh: Removed.
+        * win/tools32/scripts/feature-defines.sh: Removed.
+        * win/tools32/vsprops: Removed.
+        * win/tools32/vsprops/FeatureDefines.props: Removed.
+        * win/tools32/vsprops/FeatureDefines.vsprops: Removed.
+        * win/tools32/vsprops/FeatureDefinesCairo.props: Removed.
+        * win/tools32/vsprops/FeatureDefinesCairo.vsprops: Removed.
+        * win/tools32/vsprops/WinCairo.props: Removed.
+        * win/tools32/vsprops/WinCairo.vsprops: Removed.
+        * win/tools32/vsprops/cURL.props: Removed.
+        * win/tools32/vsprops/cURL.vsprops: Removed.
+        * win/tools32/vsprops/common.props: Removed.
+        * win/tools32/vsprops/common.vsprops: Removed.
+        * win/tools32/vsprops/debug.props: Removed.
+        * win/tools32/vsprops/debug.vsprops: Removed.
+        * win/tools32/vsprops/debug_all.vsprops: Removed.
+        * win/tools32/vsprops/debug_wincairo.props: Removed.
+        * win/tools32/vsprops/debug_wincairo.vsprops: Removed.
+        * win/tools32/vsprops/debugsuffix.props: Removed.
+        * win/tools32/vsprops/production.props: Removed.
+        * win/tools32/vsprops/production.vsprops: Removed.
+        * win/tools32/vsprops/release.props: Removed.
+        * win/tools32/vsprops/release.vsprops: Removed.
+        * win/tools32/vsprops/releaseproduction.vsprops: Removed.
+
+2013-06-12  Brent Fulgham  <bfulgham@webkit.org>
+
+        [WinCairo] Unreviewed build correction.
+
+        * win/tools32/vsprops/WinCairo.props: Switch from using the
+          $WebKitLibraries environment variable to the newer
+          $WebKit_Libraries.
+        * win/tools32/vsprops/debug_wincairo.props: Ditto.
+
+2013-06-11  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Another part of rollout of r151408.
+
+        * win/tools64: Removed.
+        * win/tools64/scripts: Removed.
+        * win/tools64/vsprops: Removed.
+
+2013-06-11  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. WinTools makefile fix.
+
+        * win/tools32/WinTools.make:
+
+2013-06-11  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r151408.
+        http://trac.webkit.org/changeset/151408
+        https://bugs.webkit.org/show_bug.cgi?id=117519
+
+        Opting for a different approach (Requested by rfong on
+        #webkit).
+
+        * win/WinTools.make: Removed.
+        * win/tools32/WinTools.make: Renamed from WebKitLibraries/win/tools64/WinTools.make.
+        * win/tools64/scripts/COPYRIGHT-END-YEAR: Removed.
+        * win/tools64/scripts/VERSION: Removed.
+        * win/tools64/scripts/auto-version.sh: Removed.
+        * win/tools64/scripts/feature-defines.sh: Removed.
+        * win/tools64/vsprops/FeatureDefines.props: Removed.
+        * win/tools64/vsprops/FeatureDefines.vsprops: Removed.
+        * win/tools64/vsprops/FeatureDefinesCairo.props: Removed.
+        * win/tools64/vsprops/FeatureDefinesCairo.vsprops: Removed.
+        * win/tools64/vsprops/WinCairo.props: Removed.
+        * win/tools64/vsprops/WinCairo.vsprops: Removed.
+        * win/tools64/vsprops/cURL.props: Removed.
+        * win/tools64/vsprops/cURL.vsprops: Removed.
+        * win/tools64/vsprops/common.props: Removed.
+        * win/tools64/vsprops/common.vsprops: Removed.
+        * win/tools64/vsprops/debug.props: Removed.
+        * win/tools64/vsprops/debug.vsprops: Removed.
+        * win/tools64/vsprops/debug_all.vsprops: Removed.
+        * win/tools64/vsprops/debug_wincairo.props: Removed.
+        * win/tools64/vsprops/debug_wincairo.vsprops: Removed.
+        * win/tools64/vsprops/debugsuffix.props: Removed.
+        * win/tools64/vsprops/production.props: Removed.
+        * win/tools64/vsprops/production.vsprops: Removed.
+        * win/tools64/vsprops/release.props: Removed.
+        * win/tools64/vsprops/release.vsprops: Removed.
+        * win/tools64/vsprops/releaseproduction.vsprops: Removed.
+
+2013-06-10  Roger Fong  <roger_fong@apple.com>
+
+        Change WebKitLibraries/win folder structure around.
+        <rdar://problem/14097829>
+
+        Reviewed by Lucas Forschler.
+
+        * win/WinTools.make: Copied from win/tools32/WinTools.make.
+        * win/tools32/WinTools.make: Removed.
+        * win/tools64: Copied from win/tools32.
+
+2013-06-05  Bear Travis  <betravis@adobe.com>
+
+        [CSS Exclusions][CSS Shapes] Split CSS Exclusions & Shapes compile & runtime flags
+        https://bugs.webkit.org/show_bug.cgi?id=117172
+
+        Reviewed by Alexandru Chiculita.
+
+        Adding the CSS_SHAPES compile flag.
+
+        * win/tools32/vsprops/FeatureDefines.vsprops:
+        * win/tools32/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-06-03  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Some AppleWin VS2010 house cleaning.
+
+        * win/tools32/scripts/auto-version.sh: Replaced with win/tools32/scripts/auto-version2010.sh.
+        * win/tools32/scripts/auto-version2010.sh: Removed.
+        * win/tools32/scripts/feature-defines.sh: Replaced with win/tools32/scripts/feature-defines2010.sh.
+        * win/tools32/scripts/feature-defines2010.sh: Removed.
+
+2013-06-03  Roger Fong  <roger_fong@apple.com>
+
+        Nuke VS2005 files from the tree.
+        <rdar://problem/14042021>.
+
+        Rubberstamped by Brent Fulgham.
+
+        * win/lib: Removed.
+        * win/lib/WebKitSystemInterface.lib: Removed.
+        * win/tools: Removed.
+        * win/tools/WinTools.make: Removed.
+        * win/tools/scripts: Removed.
+        * win/tools/scripts/COPYRIGHT-END-YEAR: Removed.
+        * win/tools/scripts/VERSION: Removed.
+        * win/tools/scripts/auto-version.sh: Removed.
+        * win/tools/scripts/auto-version2010.sh: Removed.
+        * win/tools/scripts/feature-defines.sh: Removed.
+        * win/tools/scripts/feature-defines2010.sh: Removed.
+        * win/tools/vsprops: Removed.
+        * win/tools/vsprops/FeatureDefines.props: Removed.
+        * win/tools/vsprops/FeatureDefines.vsprops: Removed.
+        * win/tools/vsprops/FeatureDefinesCairo.props: Removed.
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops: Removed.
+        * win/tools/vsprops/WinCairo.props: Removed.
+        * win/tools/vsprops/WinCairo.vsprops: Removed.
+        * win/tools/vsprops/cURL.props: Removed.
+        * win/tools/vsprops/cURL.vsprops: Removed.
+        * win/tools/vsprops/common.props: Removed.
+        * win/tools/vsprops/common.vsprops: Removed.
+        * win/tools/vsprops/debug.props: Removed.
+        * win/tools/vsprops/debug.vsprops: Removed.
+        * win/tools/vsprops/debug_all.vsprops: Removed.
+        * win/tools/vsprops/debug_wincairo.props: Removed.
+        * win/tools/vsprops/debug_wincairo.vsprops: Removed.
+        * win/tools/vsprops/debugsuffix.props: Removed.
+        * win/tools/vsprops/production.props: Removed.
+        * win/tools/vsprops/production.vsprops: Removed.
+        * win/tools/vsprops/release.props: Removed.
+        * win/tools/vsprops/release.vsprops: Removed.
+        * win/tools/vsprops/releaseproduction.vsprops: Removed.
+
+2013-05-29  Jeffrey Pfau  <jpfau@apple.com>
+
+        [Mac] Enable cache partitioning and the public suffix list on 10.8
+        <rdar://problem/13679019>
+
+        Rubber-stamped by David Kilzer.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-05-14  Beth Dakin  <bdakin@apple.com>
+
+        Printing in 1Password app is broken with screen fonts disabled
+        https://bugs.webkit.org/show_bug.cgi?id=116133
+        -and corresponding-
+        <rdar://problem/13162981>
+
+        Reviewed by Anders Carlsson.
+
+        Need WKExecutableWasLinkedOnOrBeforeMountainLion() for this quirk.
+
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-05-08  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Update WebKitLibraries/win to handle different architectures properly.
+
+        * win/lib32: Copied from win/lib.
+        * win/tools/WinTools.make:
+
+2013-05-02  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed Windows build fix.
+
+        * win/lib/WebKitSystemInterface.lib:
+
+2013-05-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Update WebKitSystemInterface.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-04-29  Chris Fleizach  <cfleizach@apple.com>
+
+        WEB SPEECH: need to identify the default voice per language
+        https://bugs.webkit.org/show_bug.cgi?id=115366
+
+        Reviewed by Simon Fraser.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-04-29  Roger Fong  <roger_fong@apple.com>
+
+        Need a tools32 folder for VS2010 builds. 
+        tools folder will be nuked when we nuke VS2005.
+
+        * win/tools32: Copied from WebKitLibraries/win/tools.
+
+2013-04-26  Roger Fong  <roger_fong@apple.com>
+
+        Disable sub-pixel-layout on Apple Windows port, VS2005 edition.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-04-26  Roger Fong  <roger_fong@apple.com>
+
+        Disable sub-pixel-layout on Apple Windows port.
+
+        * win/tools/vsprops/FeatureDefines.props:
+
+2013-04-26  Roger Fong  <roger_fong@apple.com>
+
+        Make Apple Windows VS2010 build results into and get dependencies from __32 suffixed folders.
+        Make the DebugSuffix configuration use _debug dependencies.
+
+        * win/tools/WinTools.make:
+        * win/tools/scripts/auto-version2010.sh:
+        * win/tools/scripts/feature-defines2010.sh:
+        * win/tools/vsprops/common.props:
+        * win/tools/vsprops/debugsuffix.props:
+
+2013-04-25  Chris Fleizach  <cfleizach@apple.com>
+
+        WEB SPEECH: language support does not work as expected
+        https://bugs.webkit.org/show_bug.cgi?id=115119
+
+        Reviewed by Alexey Proskuryakov.
+
+        * WebKitSystemInterface.h:
+
+2013-04-24  Roger Fong  <roger_fong@apple.com>
+
+        Have VS2010 WebKit solution look in WebKit_Libraries/lib32 for dependencies.
+
+        * win/tools/vsprops/common.props:
+
+2013-04-23  Antoine Quint  <graouts@apple.com>
+
+        Initial advance of text runs should be taken into account
+        https://bugs.webkit.org/show_bug.cgi?id=114949
+
+        Reviewed by Darin Adler.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-04-12  Jeffrey Pfau  <jpfau@apple.com>
+
+        Query directly for cache partition names
+        https://bugs.webkit.org/show_bug.cgi?id=114538
+
+        Reviewed by David Kilzer.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-04-08  Roger Fong  <roger_fong@apple.com>
+
+        Build fix.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+
+2013-04-11  Alexey Proskuryakov  <ap@apple.com>
+
+        <rdar://problem/10416316> [Mac] WebSocket doesn't work with authenticating proxies
+        https://bugs.webkit.org/show_bug.cgi?id=114464
+
+        Update WebKitSystemInterface.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-04-10  Benjamin Poulain  <bpoulain@apple.com>
+
+        Mass remove all the empty directories
+
+        Rubberstamped by Ryosuke Niwa.
+
+        * win/bin: Removed.
+        * win/lib/WebKitSystemInterface: Removed.
+
+2013-04-05  Roger Fong  <roger_fong@apple.com>
+
+        More VS2010 solution makefile fixes.
+        <rdar://problem/13588964>
+
+        * win/tools/WinTools.make:
+
+2013-04-03  Brent Fulgham  <bfulgham@webkit.org>
+
+        [Windows, WinCairo] Unreviewed VS2010 Build Correction
+
+        * win/tools/scripts/auto-version2010.sh: Added properties svn:eol-style and svn:executable.
+        * win/tools/scripts/feature-defines2010.sh: Added properties svn:eol-style and svn:executable.
+
+2013-04-01  Roger Fong  <roger_fong@apple.com>
+
+        Update FEATURE_DEFINES string generation for VS2010 solution.
+        https://bugs.webkit.org/show_bug.cgi?id=113737.
+
+        Reviewed by Timothy Horton.
+
+        * win/tools/scripts/feature-defines2010.sh: Added.
+
+2013-03-29  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Rollout r146818.
+
+        * win/tools/vsprops/FeatureDefines.props:
+
+2013-03-25  Kent Tamura  <tkent@chromium.org>
+
+        Rename ENABLE_INPUT_TYPE_DATETIME
+        https://bugs.webkit.org/show_bug.cgi?id=113254
+
+        Reviewed by Kentaro Hara.
+
+        Rename ENABLE_INPUT_TYPE_DATETIME to ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE.
+        Actually I'd like to remove the code, but we shouldn't remove it yet
+        because we shipped products with it on some platforms.
+
+        * win/tools/vsprops/FeatureDefines.props:
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.props:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-03-25  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r146816, r146821, and r146830.
+        http://trac.webkit.org/changeset/146816
+        http://trac.webkit.org/changeset/146821
+        http://trac.webkit.org/changeset/146830
+        https://bugs.webkit.org/show_bug.cgi?id=113262
+
+        Broke all the Windows tests (Requested by rfong on #webkit).
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-03-25  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Also enable CSS_REGIONS and EXCLUSIONS for VS2010 solution.
+
+        * win/tools/vsprops/FeatureDefines.props:
+
+2013-03-25  Roger Fong  <roger_fong@apple.com>
+
+        Enable CSS_REGIONS and CSS_EXCLUSIONS.
+        https://bugs.webkit.org/show_bug.cgi?id=87519
+
+        Reviewed by Timothy Horton.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-03-21  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Move common props files for VS2010 solution to WebKitLibraries folder and update all projects accordingly.
+
+        * win/tools/vsprops/FeatureDefines.props: Copied from ../Source/WebKit/WebKit.vcxproj/FeatureDefines.props.
+        * win/tools/vsprops/FeatureDefinesCairo.props: Copied from ../Source/WebKit/WebKit.vcxproj/FeatureDefinesCairo.props.
+        * win/tools/vsprops/WinCairo.props: Copied from ../Source/WebKit/WebKit.vcxproj/WinCairo.props.
+        * win/tools/vsprops/cURL.props: Copied from ../Source/WebKit/WebKit.vcxproj/WebKit/cURL.props.
+        * win/tools/vsprops/common.props: Copied from ../Source/WebKit/WebKit.vcxproj/common.props.
+        * win/tools/vsprops/debug.props: Copied from ../Source/WebKit/WebKit.vcxproj/debug.props.
+        * win/tools/vsprops/debug_wincairo.props: Copied from ../Source/WebKit/WebKit.vcxproj/debug_wincairo.props.
+        * win/tools/vsprops/debugsuffix.props: Copied from ../Source/WebKit/WebKit.vcxproj/debugsuffix.props.
+        * win/tools/vsprops/production.props: Copied from ../Source/WebKit/WebKit.vcxproj/production.props.
+        * win/tools/vsprops/release.props: Copied from ../Source/WebKit/WebKit.vcxproj/release.props.
+
+2013-03-19  Brent Fulgham  <bfulgham@webkit.org>
+
+        [WinCairo] Unreviewed build fix.
+
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops: This file was out
+        of sync with the main Windows build, and the VS2010 version of the
+        WinCairo port, preventing consistent builds.
+
+2013-03-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Threaded HTML Parser is missing feature define flags in all but Chromium port's build files
+        https://bugs.webkit.org/show_bug.cgi?id=112277
+
+        Reviewed by Adam Barth.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-03-06  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed roll-out of r145011.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-03-06  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix.  Add ENABLE_CURSOR_VISIBILITY to the list of FEATURE_DEFINES for
+        (non-Cairo) Windows builds.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-03-05  Kiran Muppala  <cmuppala@apple.com>
+
+        Remove deprecated process suppression assertion SPI from WebKitSystemInterface
+        https://bugs.webkit.org/show_bug.cgi?id=111501
+
+        Reviewed by Alexey Proskuryakov.
+
+        https://bugs.webkit.org/show_bug.cgi?id=111387 replaced all usage of
+        WKNSProcessInfoProcessAssertionWithTypes() with
+        -[NSProcessInfo beginSuspensionOfSystemBehaviors:].  Hence, remove
+        the now deprecated SPI.
+
+        * WebKitSystemInterface.h: Remove
+        WKNSProcessInfoProcessAssertionWithTypes and associated declarations.
+
+2013-03-05  Kiran Muppala  <cmuppala@apple.com>
+
+        Use new assertion API for process suppression on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=111387
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add WKProcessSuppressionSystemBehaviors constant for use in WebKit2 to
+        take a process suppression assertion.
+
+        * WebKitSystemInterface.h:
+
+2013-03-05  Jeffrey Pfau  <jpfau@apple.com>
+
+        Clear associated cache partitions when deleting origins' cache
+        https://bugs.webkit.org/show_bug.cgi?id=111383
+
+        Reviewed by Maciej Stachowiak.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-03-04  Kunihiko Sakamoto  <ksakamoto@chromium.org>
+
+        Add build flag for FontLoader
+        https://bugs.webkit.org/show_bug.cgi?id=111289
+
+        Reviewed by Benjamin Poulain.
+
+        Add ENABLE_FONT_LOAD_EVENTS build flag (disabled by default).
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-02-27  Glenn Adams  <glenn@skynav.com>
+
+        Add ENABLE_CSS3_TEXT_LINE_BREAK flag.
+        https://bugs.webkit.org/show_bug.cgi?id=110944
+
+        Reviewed by Dean Jackson.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-02-21  Jeffrey Pfau  <jpfau@apple.com>
+
+        Optionally partition cache to prevent using cache for tracking
+        https://bugs.webkit.org/show_bug.cgi?id=110269
+
+        Reviewed by Maciej Stachowiak.
+
+        Update WKSI bindings.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-02-22  Aaron Colwell  <acolwell@chromium.org>
+
+        Disable MediaSource on Apple Windows port
+        https://bugs.webkit.org/show_bug.cgi?id=110494
+
+        Reviewed by Tim Horton.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2013-02-22  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. Make WinTools.make stop copying vsprops into nested vsprops folders.
+
+        * win/tools/WinTools.make:
+
+2013-02-14  Anders Carlsson  <andersca@apple.com>
+
+        Add WKContextIsPlugInUpdateAvailable
+        https://bugs.webkit.org/show_bug.cgi?id=109862
+        <rdar://problem/13173140>
+
+        Reviewed by Sam Weinig.
+
+        Roll WebKitSystemInterface DEPS.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-02-13  Roger Fong  <roger_fong@apple.com>
+
+        Move all .props files from WebKitLibraries folder to WebKit Source folder.
+        https://bugs.webkit.org/show_bug.cgi?id=109761
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/vsprops/FeatureDefines.props: Removed.
+        * win/tools/vsprops/common.props: Removed.
+        * win/tools/vsprops/debug.props: Removed.
+        * win/tools/vsprops/release.props: Removed.
+        * win/tools/vsprops/releaseproduction.props: Removed.
+
+2013-02-07  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. More VS2010 WebKit solution touchups.
+        Move an ignored warning from a project to common properties.
+
+        * win/tools/vsprops/common.props:
+
+2013-02-06  Mike West  <mkwst@chromium.org>
+
+        Add an ENABLE_NOSNIFF feature flag.
+        https://bugs.webkit.org/show_bug.cgi?id=109029
+
+        Reviewed by Jochen Eisinger.
+
+        This new flag will control the behavior of 'X-Content-Type-Options: nosniff'
+        when processing script and other resource types.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-02-01  Alexis Menard  <alexis@webkit.org>
+
+        Enable unprefixed CSS transitions by default.
+        https://bugs.webkit.org/show_bug.cgi?id=108216
+
+        Reviewed by Dean Jackson.
+
+        Rename the flag CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED
+        to CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED which will be used later to 
+        guard the unprefixing work for CSS Transforms and animations.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-01-30  Alexey Proskuryakov  <ap@apple.com>
+
+        Update WebKitSystemInterface for <rdar://problem/13111288>.
+
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+        * WebKitSystemInterface.h: Removed WKEnterPluginSandbox, which has been unused now.
+
+2013-01-28  Kiran Muppala  <cmuppala@apple.com>
+
+        Add window occlusion criteria to determine page visibility on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=107494
+
+        Reviewed by Simon Fraser.
+
+        Add enum constants to specify window occlusion notification type to
+        notification registration/unregistration methods.  Add typedef for
+        window ID data passed to the window occlusion notification handler.
+        Add method to enable occlusion notifications for a particular window.
+
+        * WebKitSystemInterface.h: Add
+        WKOcclusionNotificationTypeWindowBecameVisible,
+        WKOcclusionNotificationTypeWindowBecameOccluded,
+        WKWindowID,
+        WKEnableWindowOcclusionNotifications().
+
+2013-01-25  Andy Estes  <aestes@apple.com>
+
+        Update WKSI header and libraries after r140875.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-01-24  Brent Fulgham  <bfulgham@webkit.org>
+
+        Get WTF compiling in VS2010 (32bit)
+        https://bugs.webkit.org/show_bug.cgi?id=106986
+
+        Reviewed by Tim Horton.
+
+        If you do not have Cygwin in the overall operating system
+        PATH, the project will not build.  In VS2005 we had logic
+        in the build system to guard against this.  We should
+        retain this in the VS2010 work.
+
+        Furthermore, VS2010 has a nasty bug where to Visual Studio
+        tools path is not defined when performing a 'clean' phase
+        on an NMAKE-based build.  This is corrected here as well.
+
+        * win/tools/vsprops/common.props: Revise environment setup
+        to ensure proper tools are in path during build.
+
+2013-01-19  Roger Fong  <roger_fong@apple.com>
+
+        Add WebKitLibraries property sheets for compiling WebKit in VS2010.
+        https://bugs.webkit.org/show_bug.cgi?id=106949
+
+        Reviewed by Brent Fulgham.
+
+        * win/tools/vsprops/FeatureDefines.props: Added.
+        * win/tools/vsprops/common.props: Added.
+        * win/tools/vsprops/debug.props: Added.
+        * win/tools/vsprops/release.props: Added.
+        * win/tools/vsprops/releaseproduction.props: Added.
+
+2013-01-21  Dirk Schulze  <dschulze@adobe.com>
+
+        Add build flag for Canvas's Path object (disabled by default)
+        https://bugs.webkit.org/show_bug.cgi?id=107473
+
+        Reviewed by Dean Jackson.
+
+        Add CANVAS_PATH build flag to build systems.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-01-10  Roger Fong  <roger_fong@apple.com>
+
+        Update WebkitSystemInterface lib for Windows port.
+        This hasn't been done in a while and the current one is out of date.
+        In addition I believe it will fix:
+        <rdar://problem/12990844>
+
+        Rubberstamped by Timothy Horton.
+
+        * win/lib/WebKitSystemInterface.lib:
+
+2013-01-08  Kiran Muppala  <cmuppala@apple.com>
+
+        Add WebKitSystemInterface needed for overriding system proxies on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=106410
+
+        Reviewed by Stephanie Lewis.
+
+        This patch is in anticipation of the fix for https://bugs.webkit.org/show_bug.cgi?id=104197,
+        Add user defaults to override system proxy settings for NetworkProcess on Mac, which
+        is awaiting the approval of a WebKit2 committer.  Commiting the WKSI portion separately,
+        so that the internal repository commit for generating the WKSI libraries does not have to
+        be rolled back every time the rest of the patch changes.
+
+        Add WKCFNetworkSetOverrideSystemProxySettings(), needed by NetworkProcess to set
+        custom proxies during initialization.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
+2013-01-04  Adam Klein  <adamk@chromium.org>
+
+        Remove ENABLE_MUTATION_OBSERVERS #define
+        https://bugs.webkit.org/show_bug.cgi?id=105459
+
+        Reviewed by Ryosuke Niwa.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2013-01-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/12942239> Update copyright strings
+
+        Reviewed by Sam Weinig.
+
+        * win/tools/scripts/COPYRIGHT-END-YEAR:
+
+2012-12-28  Mark Rowe  <mrowe@apple.com>
+
+        Move logic for extracting the OS X marketing version in to WebCore
+        <http://webkit.org/b/105841> / <rdar://problem/10736041>
+
+        Reviewed by Dan Bernstein.
+
+        * WebKitSystemInterface.h:
+
+2012-12-19  Kiran Muppala  <cmuppala@apple.com>
+
+        Adopt new assertion SPI for process suppression on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=105378
+
+        Reviewed by Mark Rowe.
+
+        Add WKNSProcessInfoProcessAssertionWithTypes().
+
+        * WebKitSystemInterface.h:
+
+2012-12-19  Alexis Menard  <alexis@webkit.org>
+
+        Implement CSS parsing for CSS transitions unprefixed.
+        https://bugs.webkit.org/show_bug.cgi?id=104804
+
+        Reviewed by Dean Jackson.
+
+        Add a new flag ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED
+        to cover the work of unprefixing Transforms, Animations and 
+        Transitions. It will let the possibility of each ports to turn it off 
+        in their release branches until we're confident that these CSS 
+        properties are ready to be unprefixed.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-12-12  Roger Fong  <roger_fong@apple.com>
+
+        Enable VIDEO_TRACK on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=104706.
+
+        Reviewed by Timothy Horton.
+
+        Enable VIDEO_TRACK on Windows and update project property files.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2012-12-12  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r137491.
+        http://trac.webkit.org/changeset/137491
+        https://bugs.webkit.org/show_bug.cgi?id=104828
+
+        broke the builtd (Requested by rfong on #webkit).
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2012-12-11  Roger Fong  <roger_fong@apple.com>
+
+        Enable VIDEO_TRACK on Windows.
+        https://bugs.webkit.org/show_bug.cgi?id=104706.
+
+        Reviewed by Timothy Horton.
+
+        Enable VIDEO_TRACK on Windows and update project property files.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+
+2012-12-10  Alexis Menard  <alexis@webkit.org>
+
+        [CSS3 Backgrounds and Borders] Remove CSS3_BACKGROUND feature flag.
+        https://bugs.webkit.org/show_bug.cgi?id=104539
+
+        Reviewed by Antonio Gomes.
+
+        As discussed on webkit-dev it is not needed to keep this feature flag 
+        as support for <position> type is a small feature that is already 
+        implemented by three other UAs. It was useful while landing this 
+        feature as partial bits were landed one after one.
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
+2012-12-06  Rick Byers  <rbyers@chromium.org>
+
+        CSS cursor property should support webkit-image-set
+        https://bugs.webkit.org/show_bug.cgi?id=99493
+
+        Reviewed by Beth Dakin.
+
+        Add ENABLE_MOUSE_CURSOR_SCALE - disabled by default
+
+        * win/tools/vsprops/FeatureDefines.vsprops:
+        * win/tools/vsprops/FeatureDefinesCairo.vsprops:
+
 2012-11-26  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. ENABLE_ACCELERATED_OVERFLOW_SCROLLING not enabled on Windows.
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h
index 4b01bf8a9..37f1e89e4 100644
--- a/WebKitLibraries/WebKitSystemInterface.h
+++ b/WebKitLibraries/WebKitSystemInterface.h
@@ -1,6 +1,6 @@
 /*      
     WebKitSystemInterface.h
-    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+    Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
 
     Public header file.
 */
@@ -60,16 +60,14 @@ OSType WKCarbonWindowPropertyCreator(void);
 OSType WKCarbonWindowPropertyTag(void);
 #endif
 
-typedef id WKNSURLConnectionDelegateProxyPtr;
-
-WKNSURLConnectionDelegateProxyPtr WKCreateNSURLConnectionDelegateProxy(void);
-
 void WKDisableCGDeferredUpdates(void);
 
 Class WKNSURLProtocolClassForRequest(NSURLRequest *request);
 void WKSetNSURLRequestShouldContentSniff(NSMutableURLRequest *request, BOOL shouldContentSniff);
 
+#ifndef __LP64__
 unsigned WKGetNSAutoreleasePoolCount(void);
+#endif
 
 void WKAdvanceDefaultButtonPulseAnimation(NSButtonCell *button);
 
@@ -88,8 +86,12 @@ CFTypeRef WKCopyAXTextMarkerRangeEnd(CFTypeRef range);
 void WKAccessibilityHandleFocusChanged(void);
 AXUIElementRef WKCreateAXUIElementRef(id element);
 void WKUnregisterUniqueIdForElement(id element);
-
+    
+NSArray *WKSpeechSynthesisGetVoiceIdentifiers(void);
+NSString *WKSpeechSynthesisGetDefaultVoiceIdentifierForLocale(NSLocale*);
+    
 BOOL WKShouldBlockPlugin(NSString *bundleIdentifier, NSString *bundleVersionString);
+BOOL WKIsPluginUpdateAvailable(NSString *bundleIdentifier);
 
 // Remote Accessibility API.
 void WKAXRegisterRemoteApp(void);
@@ -166,6 +168,8 @@ bool WKCTFontTransformGlyphs(CTFontRef font, CGGlyph glyphs[], CGSize advances[]
 
 CTTypesetterRef WKCreateCTTypesetterWithUniCharProviderAndOptions(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void*), void (*dispose)(const UniChar* chars, void*), void*, CFDictionaryRef options);
 
+CGSize WKCTRunGetInitialAdvance(CTRunRef);
+
 CGContextRef WKIOSurfaceContextCreate(IOSurfaceRef, unsigned width, unsigned height, CGColorSpaceRef);
 CGImageRef WKIOSurfaceContextCreateImage(CGContextRef context);
 
@@ -238,8 +242,8 @@ CFStringRef WKCopyFoundationCacheDirectory(void);
 
 typedef const struct __CFURLStorageSession* CFURLStorageSessionRef;
 CFURLStorageSessionRef WKCreatePrivateStorageSession(CFStringRef);
-NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest*);
-NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest*);
+NSURLRequest *WKCopyRequestWithStorageSession(CFURLStorageSessionRef, NSURLRequest *);
+NSCachedURLResponse *WKCachedResponseForRequest(CFURLStorageSessionRef, NSURLRequest *);
 void WKSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef);
 
 typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
@@ -259,6 +263,7 @@ CFArrayRef WKCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
 void WKCFURLRequestSetHTTPRequestBodyParts(CFMutableURLRequestRef, CFArrayRef bodyParts);
 
 void WKSetVisibleApplicationName(CFStringRef);
+void WKSetApplicationInformationItem(CFStringRef key, CFTypeRef value);
 
 CFURLRef WKCopyBundleURLForExecutableURL(CFURLRef);
 
@@ -340,14 +345,6 @@ WKSoftwareCARendererRef WKSoftwareCARendererCreate(uint32_t contextID);
 void WKSoftwareCARendererDestroy(WKSoftwareCARendererRef);
 void WKSoftwareCARendererRender(WKSoftwareCARendererRef, CGContextRef, CGRect);
 
-typedef struct __WKCARemoteLayerClientRef *WKCARemoteLayerClientRef;
-
-WKCARemoteLayerClientRef WKCARemoteLayerClientMakeWithServerPort(mach_port_t port);
-void WKCARemoteLayerClientInvalidate(WKCARemoteLayerClientRef);
-uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef);
-void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *);
-CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef);
-
 typedef struct __WKCAContextRef *WKCAContextRef;
 
 WKCAContextRef WKCAContextMakeRemoteWithServerPort(mach_port_t port);
@@ -358,6 +355,7 @@ void WKCAContextSetLayer(WKCAContextRef, CALayer *);
 CALayer *WKCAContextGetLayer(WKCAContextRef);
 void WKCAContextSetColorSpace(WKCAContextRef, CGColorSpaceRef);
 CGColorSpaceRef WKCAContextGetColorSpace(WKCAContextRef);
+void WKDestroyRenderingResources(void);
 
 void WKCALayerEnumerateRectsBeingDrawnWithBlock(CALayer *layer, CGContextRef context, void (^block)(CGRect rect));
 
@@ -393,7 +391,7 @@ void WKSetHTTPPipeliningMinimumFastLanePriority(int priority);
 
 void WKSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
 void WKSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
-CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
+CFHTTPMessageRef WKCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
 
 void WKWindowSetAlpha(NSWindow *window, float alphaValue);
 void WKWindowSetScaledFrame(NSWindow *window, NSRect scaleFrame, NSRect nonScaledFrame);
@@ -425,7 +423,6 @@ CIFormat WKCIGetRGBA8Format(void);
 
 typedef enum {
     WKSandboxExtensionTypeReadOnly,
-    WKSandboxExtensionTypeWriteOnly,    
     WKSandboxExtensionTypeReadWrite,
 } WKSandboxExtensionType;
 typedef struct __WKSandboxExtension *WKSandboxExtensionRef;
@@ -441,8 +438,6 @@ WKSandboxExtensionRef WKSandboxExtensionCreateFromSerializedFormat(const char* s
 
 OSStatus WKEnableSandboxStyleFileQuarantine(void);
 
-bool WKEnterPluginSandbox(const char* profile, const char* parameters[], const char* readOnlyPaths[], const char* readWritePaths[]);
-
 int WKRecommendedScrollerStyle(void);
 
 bool WKExecutableWasLinkedOnOrBeforeSnowLeopard(void);
@@ -462,10 +457,13 @@ NSCursor *WKCursor(const char *name);
 dispatch_source_t WKCreateVMPressureDispatchOnMainQueue(void);
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-NSString *WKGetMacOSXVersionString(void);
 bool WKExecutableWasLinkedOnOrBeforeLion(void);
 #endif
 
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+bool WKExecutableWasLinkedOnOrBeforeMountainLion(void);
+#endif
+
 void WKCGPathAddRoundedRect(CGMutablePathRef path, const CGAffineTransform* matrix, CGRect rect, CGFloat cornerWidth, CGFloat cornerHeight);
 
 void WKCFURLRequestAllowAllPostCaching(CFURLRequestRef);
@@ -475,66 +473,51 @@ void WKCFURLRequestAllowAllPostCaching(CFURLRequestRef);
 
 BOOL WKFilterIsManagedSession(void);
 WebFilterEvaluator *WKFilterCreateInstance(NSURLResponse *);
-void WKFilterRelease(WebFilterEvaluator *);
+BOOL WKFilterIsBuffering(WebFilterEvaluator *);
 BOOL WKFilterWasBlocked(WebFilterEvaluator *);
-const char* WKFilterAddData(WebFilterEvaluator *, const char* data, int* length);
-const char* WKFilterDataComplete(WebFilterEvaluator *, int* length);
+NSData *WKFilterAddData(WebFilterEvaluator *, NSData *);
+NSData *WKFilterDataComplete(WebFilterEvaluator *);
 
 CGFloat WKNSElasticDeltaForTimeDelta(CGFloat initialPosition, CGFloat initialVelocity, CGFloat elapsedTime);
 CGFloat WKNSElasticDeltaForReboundDelta(CGFloat delta);
 CGFloat WKNSReboundDeltaForElasticDelta(CGFloat delta);
 #endif
 
-typedef enum {
-    WKCaptionFontStyleDefault = 0,
-    WKCaptionFontStyleMonospacedWithSerif,
-    WKCaptionFontStyleProportionalWithSerif,
-    WKCaptionFontStyleMonospacedWithoutSerif,
-    WKCaptionFontStyleProportionalWithoutSerif,
-    WKCaptionFontStyleCasual,
-    WKCaptionFontStyleCursive,
-    WKCaptionFontStyleSmallCapital,
-    WKCaptionFontStyleMax
-} WKCaptionFontStyle;
-
-typedef enum {
-    WKCaptionTextEdgeStyleUndefined = 0,
-    WKCaptionTextEdgeStyleNone,
-    WKCaptionTextEdgeStyleRaised,
-    WKCaptionTextEdgeStyleDepressed,
-    WKCaptionTextEdgeStyleUniform,
-    WKCaptionTextEdgeStyleDropShadow,
-    WKCaptionTextEdgeStyleMax
-} WKCaptionTextEdgeStyle;
-
-bool WKCaptionAppearanceHasUserPreferences(void);
-bool WKCaptionAppearanceShowCaptionsWhenAvailable(void);
-CGColorRef WKCaptionAppearanceCopyForegroundColor(void);
-CGColorRef WKCaptionAppearanceCopyBackgroundColor(void);
-CGColorRef WKCaptionAppearanceCopyWindowColor(void);
-bool WKCaptionAppearanceGetForegroundOpacity(CGFloat*);
-bool WKCaptionAppearanceGetBackgroundOpacity(CGFloat*);
-bool WKCaptionAppearanceGetWindowOpacity(CGFloat*);
-CGFontRef WKCaptionAppearanceCopyFontForStyle(int fontStyle);
-bool WKCaptionAppearanceGetRelativeCharacterSize(CGFloat*);
-int WKCaptionAppearanceGetTextEdgeStyle(void);
-CFStringRef WKCaptionAppearanceGetSettingsChangedNotification(void);
-
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 typedef enum {
     WKOcclusionNotificationTypeApplicationBecameVisible,
-    WKOcclusionNotificationTypeApplicationBecameOccluded
+    WKOcclusionNotificationTypeApplicationBecameOccluded,
+    WKOcclusionNotificationTypeApplicationWindowModificationsStarted,
+    WKOcclusionNotificationTypeApplicationWindowModificationsStopped,
+    WKOcclusionNotificationTypeWindowBecameVisible,
+    WKOcclusionNotificationTypeWindowBecameOccluded,
 } WKOcclusionNotificationType;
 
-typedef void (*WKOcclusionNotificationHandler)(uint32_t, void*, uint32_t, void*, uint32_t);
+typedef uint32_t WKWindowID;
+
+typedef void (*WKOcclusionNotificationHandler)(uint32_t, void* data, uint32_t dataLength, void*, uint32_t);
 
 bool WKRegisterOcclusionNotificationHandler(WKOcclusionNotificationType, WKOcclusionNotificationHandler);
 bool WKUnregisterOcclusionNotificationHandler(WKOcclusionNotificationType, WKOcclusionNotificationHandler);
+bool WKEnableWindowOcclusionNotifications(NSInteger windowID, bool *outCurrentOcclusionState);
 #endif
 
 bool WKIsJavaPlugInActive(void);
 void WKActivateJavaPlugIn(void);
 
+void WKCFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+bool WKIsPublicSuffix(NSString *domain);
+
+CFArrayRef WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFStringRef partition);
+typedef void (^CFURLCacheCopyAllPartitionNamesResultsNotification)(CFArrayRef partitionNames);
+
+void WKCFURLCacheDeleteHostNamesInPersistentStoreForPartition(CFArrayRef hostArray, CFStringRef partition);
+CFStringRef WKCachePartitionKey(void);
+void WKCFURLCacheCopyAllPartitionNames(CFURLCacheCopyAllPartitionNamesResultsNotification resultsBlock);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/WebKitLibraries/libWebKitSystemInterfaceLion.a b/WebKitLibraries/libWebKitSystemInterfaceLion.a
index 12d704893..68b44735e 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceLion.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceLion.a
diff --git a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
index 0e8dfeb67..a3473e7fd 100644
--- a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
+++ b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 33fab9f67..a5fc08d5c 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -118,7 +118,7 @@ void wkSetHTTPPipeliningPriority(CFURLRequestRef, int priority);
 
 void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
 void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);
-CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL);
+CFHTTPMessageRef wkCopyCONNECTProxyResponse(CFReadStreamRef, CFURLRef responseURL, CFStringRef proxyHost, CFNumberRef proxyPort);
 
 WKCFURLCredentialRef wkCopyCredentialFromCFPersistentStorage(CFURLProtectionSpaceRef protectionSpace);
 
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
deleted file mode 100644
index 12ae42323..000000000
--- a/WebKitLibraries/win/lib/WebKitSystemInterface.lib
+++ /dev/null
diff --git a/WebKitLibraries/win/lib32/WebKitSystemInterface.lib b/WebKitLibraries/win/lib32/WebKitSystemInterface.lib
new file mode 100644
index 000000000..3aec393dc
--- /dev/null
+++ b/WebKitLibraries/win/lib32/WebKitSystemInterface.lib
diff --git a/WebKitLibraries/win/tools/WinTools.make b/WebKitLibraries/win/tools/WinTools.make
index 3e99ae570..46263b112 100755
--- a/WebKitLibraries/win/tools/WinTools.make
+++ b/WebKitLibraries/win/tools/WinTools.make
@@ -1,3 +1,3 @@
 install:
-    xcopy "$(SRCROOT)\vsprops\*.vsprops" "$(DSTROOT)\AppleInternal\tools\vsprops\OpenSource\WebKitLibraries\win\tools\vsprops" /e/v/i/h/y
-    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+    xcopy "$(SRCROOT)\vsprops\*.props" "$(DSTROOT)\AppleInternal\tools\vsprops" /e/v/i/h/y
+    xcopy "$(SRCROOT)\scripts\*" "$(DSTROOT)\AppleInternal\tools\scripts" /e/v/i/h/y
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
index a43b7bf66..e355f6dc2 100644
--- a/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
+++ b/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR
@@ -1 +1 @@
-2012
+2013
diff --git a/WebKitLibraries/win/tools/scripts/auto-version.sh b/WebKitLibraries/win/tools/scripts/auto-version.sh
index acb1c6125..b5c25f353 100755
--- a/WebKitLibraries/win/tools/scripts/auto-version.sh
+++ b/WebKitLibraries/win/tools/scripts/auto-version.sh
@@ -32,11 +32,11 @@ chomp()
     eval $1=\$value;
 }
 
-if [[ -n "$WEBKITLIBRARIESDIR" ]]; then
-    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\VERSION"`
+if [[ -n "$WEBKIT_LIBRARIES" ]]; then
+    FALLBACK_VERSION_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\VERSION"`
     FALLBACK_VERSION=$(cat "$FALLBACK_VERSION_PATH");
 
-    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKITLIBRARIESDIR\\tools\\scripts\\COPYRIGHT-END-YEAR"`
+    COPYRIGHT_END_YEAR_PATH=`cygpath -u "$WEBKIT_LIBRARIES\\tools\\scripts\\COPYRIGHT-END-YEAR"`
     COPYRIGHT_END_YEAR=$(cat "$COPYRIGHT_END_YEAR_PATH");
     chomp COPYRIGHT_END_YEAR
 fi
diff --git a/WebKitLibraries/win/tools/scripts/feature-defines.sh b/WebKitLibraries/win/tools/scripts/feature-defines.sh
index 71c3a9b22..a6fdcaa36 100755
--- a/WebKitLibraries/win/tools/scripts/feature-defines.sh
+++ b/WebKitLibraries/win/tools/scripts/feature-defines.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-# Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2013 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -23,9 +23,10 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 if [ "$2" = "cairo" ]; then
-    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.vsprops
+    FeatureDefines=$1/tools/vsprops/FeatureDefinesCairo.props
 else
-    FeatureDefines=$1/tools/vsprops/FeatureDefines.vsprops
+    FeatureDefines=$1/tools/vsprops/FeatureDefines.props
 fi
 
-grep Value=\"ENABLE_ $FeatureDefines | sed 's/^.*Value\=\"/ /' | sed 's/\"//' | tr -d '\n'
+grep "<ENABLE_" $FeatureDefines | sed '/\/>/d' | sed 's/<\/.*>//' | sed 's/<.*>//' | tr -d '\n'
+
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.props b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
new file mode 100644
index 000000000..6de781c90
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefines.props
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <ENABLE_3D_RENDERING>ENABLE_3D_RENDERING</ENABLE_3D_RENDERING>
+    <ENABLE_ACCELERATED_2D_CANVAS />
+    <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
+    <ENABLE_BLOB />
+    <ENABLE_CANVAS_PROXY />
+    <ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
+    <ENABLE_CSP_NEXT />
+    <ENABLE_CSS3_CONDITIONAL_RULES />
+    <ENABLE_CSS3_TEXT />
+    <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
+    <ENABLE_CSS_COMPOSITING />
+    <ENABLE_CSS_EXCLUSIONS />
+    <ENABLE_CSS_FILTERS>ENABLE_CSS_FILTERS</ENABLE_CSS_FILTERS>
+    <ENABLE_CSS_GRID_LAYOUT />
+    <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
+    <ENABLE_CSS_SHADERS />
+    <ENABLE_CSS_STICKY_POSITION>ENABLE_CSS_STICKY_POSITION</ENABLE_CSS_STICKY_POSITION>
+    <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
+    <ENABLE_CUSTOM_SCHEME_HANDLER />
+    <ENABLE_DATAGRID />
+    <ENABLE_DATALIST_ELEMENT />
+    <ENABLE_DATA_TRANSFER_ITEMS />
+    <ENABLE_DETAILS_ELEMENT>ENABLE_DETAILS_ELEMENT</ENABLE_DETAILS_ELEMENT>
+    <ENABLE_DEVICE_ORIENTATION />
+    <ENABLE_DIRECTORY_UPLOAD />
+    <ENABLE_FILE_SYSTEM />
+    <ENABLE_FILTERS>ENABLE_FILTERS</ENABLE_FILTERS>
+    <ENABLE_FULLSCREEN_API>ENABLE_FULLSCREEN_API</ENABLE_FULLSCREEN_API>
+    <ENABLE_GAMEPAD />
+    <ENABLE_GEOLOCATION>ENABLE_GEOLOCATION</ENABLE_GEOLOCATION>
+    <ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING />
+    <ENABLE_HIGH_DPI_CANVAS>ENABLE_HIGH_DPI_CANVAS</ENABLE_HIGH_DPI_CANVAS>
+    <ENABLE_ICONDATABASE>ENABLE_ICONDATABASE</ENABLE_ICONDATABASE>
+    <ENABLE_IFRAME_SEAMLESS>ENABLE_IFRAME_SEAMLESS</ENABLE_IFRAME_SEAMLESS>
+    <ENABLE_INDEXED_DATABASE />
+    <ENABLE_INPUT_SPEECH />
+    <ENABLE_INPUT_TYPE_COLOR />
+    <ENABLE_INPUT_TYPE_DATE />
+    <ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE />
+    <ENABLE_INPUT_TYPE_DATETIMELOCAL />
+    <ENABLE_INPUT_TYPE_MONTH />
+    <ENABLE_INPUT_TYPE_TIME />
+    <ENABLE_INPUT_TYPE_WEEK />
+    <ENABLE_JAVASCRIPT_DEBUGGER>ENABLE_JAVASCRIPT_DEBUGGER</ENABLE_JAVASCRIPT_DEBUGGER>
+    <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
+    <ENABLE_LEGACY_NOTIFICATIONS />
+    <ENABLE_LINK_PREFETCH />
+    <ENABLE_LINK_PRERENDER />
+    <ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
+    <ENABLE_MEDIA_SOURCE />
+    <ENABLE_MEDIA_STATISTICS>ENABLE_MEDIA_STATISTICS</ENABLE_MEDIA_STATISTICS>
+    <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
+    <ENABLE_MICRODATA />
+    <ENABLE_MOUSE_CURSOR_SCALE />
+    <ENABLE_NOTIFICATIONS />
+    <ENABLE_PAGE_VISIBILITY_API />
+    <ENABLE_PROGRESS_ELEMENT />
+    <ENABLE_PROXIMITY_EVENTS />
+    <ENABLE_QUOTA />
+    <ENABLE_REGISTER_PROTOCOL_HANDLER />
+    <ENABLE_REQUEST_ANIMATION_FRAME>ENABLE_REQUEST_ANIMATION_FRAME</ENABLE_REQUEST_ANIMATION_FRAME>
+    <ENABLE_SCRIPTED_SPEECH />
+    <ENABLE_SHADOW_DOM />
+    <ENABLE_SHARED_WORKERS>ENABLE_SHARED_WORKERS</ENABLE_SHARED_WORKERS>
+    <ENABLE_SQL_DATABASE>ENABLE_SQL_DATABASE</ENABLE_SQL_DATABASE>
+    <ENABLE_STYLE_SCOPED />
+    <ENABLE_SUBPIXEL_LAYOUT></ENABLE_SUBPIXEL_LAYOUT>
+    <ENABLE_SVG>ENABLE_SVG</ENABLE_SVG>
+    <ENABLE_SVG_DOM_OBJC_BINDINGS />
+    <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
+    <ENABLE_TEXT_AUTOSIZING />
+    <ENABLE_UNDO_MANAGER />
+    <ENABLE_VIDEO>ENABLE_VIDEO</ENABLE_VIDEO>
+    <ENABLE_VIDEO_TRACK>ENABLE_VIDEO_TRACK</ENABLE_VIDEO_TRACK>
+    <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
+    <ENABLE_WEB_AUDIO />
+    <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
+    <ENABLE_WEB_TIMING />
+    <ENABLE_WORKERS>ENABLE_WORKERS</ENABLE_WORKERS>
+    <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
+    <ENABLE_XSLT>ENABLE_XSLT</ENABLE_XSLT>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(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_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(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_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="ENABLE_3D_RENDERING">
+      <Value>$(ENABLE_3D_RENDERING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
+      <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ACCELERATED_OVERFLOW_SCROLLING">
+      <Value>$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_BLOB">
+      <Value>$(ENABLE_BLOB)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CANVAS_PROXY">
+      <Value>$(ENABLE_CANVAS_PROXY)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CHANNEL_MESSAGING">
+      <Value>$(ENABLE_CHANNEL_MESSAGING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSP_NEXT">
+      <Value>$(ENABLE_CSP_NEXT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS3_CONDITIONAL_RULES">
+      <Value>$(ENABLE_CSS3_CONDITIONAL_RULES)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS3_TEXT">
+      <Value>$(ENABLE_CSS3_TEXT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_BOX_DECORATION_BREAK">
+      <Value>$(ENABLE_CSS_BOX_DECORATION_BREAK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_COMPOSITING">
+      <Value>$(ENABLE_CSS_COMPOSITING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_EXCLUSIONS">
+      <Value>$(ENABLE_CSS_EXCLUSIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_FILTERS">
+      <Value>$(ENABLE_CSS_FILTERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_GRID_LAYOUT">
+      <Value>$(ENABLE_CSS_GRID_LAYOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_REGIONS">
+      <Value>$(ENABLE_CSS_REGIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_SHADERS">
+      <Value>$(ENABLE_CSS_SHADERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_STICKY_POSITION">
+      <Value>$(ENABLE_CSS_STICKY_POSITION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED">
+      <Value>$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CUSTOM_SCHEME_HANDLER">
+      <Value>$(ENABLE_CUSTOM_SCHEME_HANDLER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATAGRID">
+      <Value>$(ENABLE_DATAGRID)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATALIST_ELEMENT">
+      <Value>$(ENABLE_DATALIST_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATA_TRANSFER_ITEMS">
+      <Value>$(ENABLE_DATA_TRANSFER_ITEMS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DETAILS_ELEMENT">
+      <Value>$(ENABLE_DETAILS_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DEVICE_ORIENTATION">
+      <Value>$(ENABLE_DEVICE_ORIENTATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DIRECTORY_UPLOAD">
+      <Value>$(ENABLE_DIRECTORY_UPLOAD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FILE_SYSTEM">
+      <Value>$(ENABLE_FILE_SYSTEM)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FILTERS">
+      <Value>$(ENABLE_FILTERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FULLSCREEN_API">
+      <Value>$(ENABLE_FULLSCREEN_API)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_GAMEPAD">
+      <Value>$(ENABLE_GAMEPAD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_GEOLOCATION">
+      <Value>$(ENABLE_GEOLOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING">
+      <Value>$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_HIGH_DPI_CANVAS">
+      <Value>$(ENABLE_HIGH_DPI_CANVAS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ICONDATABASE">
+      <Value>$(ENABLE_ICONDATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_IFRAME_SEAMLESS">
+      <Value>$(ENABLE_IFRAME_SEAMLESS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INDEXED_DATABASE">
+      <Value>$(ENABLE_INDEXED_DATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_SPEECH">
+      <Value>$(ENABLE_INPUT_SPEECH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_COLOR">
+      <Value>$(ENABLE_INPUT_TYPE_COLOR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATE">
+      <Value>$(ENABLE_INPUT_TYPE_DATE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE">
+      <Value>$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATETIMELOCAL">
+      <Value>$(ENABLE_INPUT_TYPE_DATETIMELOCAL)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_MONTH">
+      <Value>$(ENABLE_INPUT_TYPE_MONTH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_TIME">
+      <Value>$(ENABLE_INPUT_TYPE_TIME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_WEEK">
+      <Value>$(ENABLE_INPUT_TYPE_WEEK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_JAVASCRIPT_DEBUGGER">
+      <Value>$(ENABLE_JAVASCRIPT_DEBUGGER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LEGACY_CSS_VENDOR_PREFIXES">
+      <Value>$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LEGACY_NOTIFICATIONS">
+      <Value>$(ENABLE_LEGACY_NOTIFICATIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LINK_PREFETCH">
+      <Value>$(ENABLE_LINK_PREFETCH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LINK_PRERENDER">
+      <Value>$(ENABLE_LINK_PRERENDER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MATHML">
+      <Value>$(ENABLE_MATHML)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MEDIA_SOURCE">
+      <Value>$(ENABLE_MEDIA_SOURCE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MEDIA_STATISTICS">
+      <Value>$(ENABLE_MEDIA_STATISTICS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_METER_ELEMENT">
+      <Value>$(ENABLE_METER_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MICRODATA">
+      <Value>$(ENABLE_MICRODATA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MOUSE_CURSOR_SCALE">
+      <Value>$(ENABLE_MOUSE_CURSOR_SCALE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_NOTIFICATIONS">
+      <Value>$(ENABLE_NOTIFICATIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PAGE_VISIBILITY_API">
+      <Value>$(ENABLE_PAGE_VISIBILITY_API)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PROGRESS_ELEMENT">
+      <Value>$(ENABLE_PROGRESS_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PROXIMITY_EVENTS">
+      <Value>$(ENABLE_PROXIMITY_EVENTS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_QUOTA">
+      <Value>$(ENABLE_QUOTA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_REGISTER_PROTOCOL_HANDLER">
+      <Value>$(ENABLE_REGISTER_PROTOCOL_HANDLER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_REQUEST_ANIMATION_FRAME">
+      <Value>$(ENABLE_REQUEST_ANIMATION_FRAME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SCRIPTED_SPEECH">
+      <Value>$(ENABLE_SCRIPTED_SPEECH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SHADOW_DOM">
+      <Value>$(ENABLE_SHADOW_DOM)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SHARED_WORKERS">
+      <Value>$(ENABLE_SHARED_WORKERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SQL_DATABASE">
+      <Value>$(ENABLE_SQL_DATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_STYLE_SCOPED">
+      <Value>$(ENABLE_STYLE_SCOPED)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SUBPIXEL_LAYOUT">
+      <Value>$(ENABLE_SUBPIXEL_LAYOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG">
+      <Value>$(ENABLE_SVG)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG_DOM_OBJC_BINDINGS">
+      <Value>$(ENABLE_SVG_DOM_OBJC_BINDINGS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG_FONTS">
+      <Value>$(ENABLE_SVG_FONTS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_TEXT_AUTOSIZING">
+      <Value>$(ENABLE_TEXT_AUTOSIZING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_UNDO_MANAGER">
+      <Value>$(ENABLE_UNDO_MANAGER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIDEO">
+      <Value>$(ENABLE_VIDEO)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIDEO_TRACK">
+      <Value>$(ENABLE_VIDEO_TRACK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIEW_MODE_CSS_MEDIA">
+      <Value>$(ENABLE_VIEW_MODE_CSS_MEDIA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>    
+    <BuildMacro Include="ENABLE_WEB_AUDIO">
+      <Value>$(ENABLE_WEB_AUDIO)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WEB_SOCKETS">
+      <Value>$(ENABLE_WEB_SOCKETS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WEB_TIMING">
+      <Value>$(ENABLE_WEB_TIMING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WORKERS">
+      <Value>$(ENABLE_WORKERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_XHR_TIMEOUT">
+      <Value>$(ENABLE_XHR_TIMEOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_XSLT">
+      <Value>$(ENABLE_XSLT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
deleted file mode 100644
index 17079c877..000000000
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops
+++ /dev/null
@@ -1,404 +0,0 @@
-<?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_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_BACKGROUND);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(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_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(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_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
-	/>
-  <UserMacro
-		Name="ENABLE_3D_RENDERING"
-		Value="ENABLE_3D_RENDERING"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_ACCELERATED_2D_CANVAS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_ACCELERATED_OVERFLOW_SCROLLING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_BLOB"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CHANNEL_MESSAGING"
-		Value="ENABLE_CHANNEL_MESSAGING"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSP_NEXT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_BACKGROUND"
-		Value=""
-		PerformEnvironmentSet="false"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_CONDITIONAL_RULES"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_TEXT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_BOX_DECORATION_BREAK"
-		Value="ENABLE_CSS_BOX_DECORATION_BREAK"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_COMPOSITING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_EXCLUSIONS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_FILTERS"
-		Value="ENABLE_CSS_FILTERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_GRID_LAYOUT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_REGIONS"
-		Value="ENABLE_CSS_REGIONS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_SHADERS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_STICKY_POSITION"
-		Value="ENABLE_CSS_STICKY_POSITION"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CUSTOM_SCHEME_HANDLER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATAGRID"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATALIST_ELEMENT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATA_TRANSFER_ITEMS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DETAILS_ELEMENT"
-		Value="ENABLE_DETAILS_ELEMENT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DEVICE_ORIENTATION"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DIRECTORY_UPLOAD"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FILE_SYSTEM"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FILTERS"
-		Value="ENABLE_FILTERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FULLSCREEN_API"
-		Value="ENABLE_FULLSCREEN_API"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_GAMEPAD"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_GEOLOCATION"
-		Value="ENABLE_GEOLOCATION"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_HIGH_DPI_CANVAS"
-		Value="ENABLE_HIGH_DPI_CANVAS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_ICONDATABASE"
-		Value="ENABLE_ICONDATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_IFRAME_SEAMLESS"
-		Value="ENABLE_IFRAME_SEAMLESS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INDEXED_DATABASE"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_SPEECH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_COLOR"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATE"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATETIME"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATETIMELOCAL"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_MONTH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_TIME"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_WEEK"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_JAVASCRIPT_DEBUGGER"
-		Value="ENABLE_JAVASCRIPT_DEBUGGER"
-		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_ELEMENT"
-		Value="ENABLE_METER_ELEMENT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MICRODATA"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MUTATION_OBSERVERS"
-		Value="ENABLE_MUTATION_OBSERVERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_NOTIFICATIONS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PAGE_VISIBILITY_API"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PROGRESS_ELEMENT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PROXIMITY_EVENTS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_QUOTA"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_REGISTER_PROTOCOL_HANDLER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_REQUEST_ANIMATION_FRAME"
-		Value="ENABLE_REQUEST_ANIMATION_FRAME"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SCRIPTED_SPEECH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SHADOW_DOM"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SHARED_WORKERS"
-		Value="ENABLE_SHARED_WORKERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SQL_DATABASE"
-		Value="ENABLE_SQL_DATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_STYLE_SCOPED"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SUBPIXEL_LAYOUT"
-		Value="ENABLE_SUBPIXEL_LAYOUT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SVG"
-		Value="ENABLE_SVG"
-		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_TEXT_AUTOSIZING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_UNDO_MANAGER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_VIDEO"
-		Value="ENABLE_VIDEO"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_AUDIO"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_SOCKETS"
-		Value="ENABLE_WEB_SOCKETS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_TIMING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WORKERS"
-		Value="ENABLE_WORKERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_XHR_TIMEOUT"
-		Value="ENABLE_XHR_TIMEOUT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_XSLT"
-		Value="ENABLE_XSLT"
-		PerformEnvironmentSet="true"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
new file mode 100644
index 000000000..39da48a83
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <ENABLE_3D_RENDERING />
+    <ENABLE_ACCELERATED_2D_CANVAS />
+    <ENABLE_ACCELERATED_OVERFLOW_SCROLLING />
+    <ENABLE_BLOB />
+    <ENABLE_CANVAS_PROXY />
+    <ENABLE_CHANNEL_MESSAGING>ENABLE_CHANNEL_MESSAGING</ENABLE_CHANNEL_MESSAGING>
+    <ENABLE_CSP_NEXT />
+    <ENABLE_CSS3_CONDITIONAL_RULES />
+    <ENABLE_CSS3_TEXT />
+    <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
+    <ENABLE_CSS_COMPOSITING />
+    <ENABLE_CSS_EXCLUSIONS />
+    <ENABLE_CSS_FILTERS></ENABLE_CSS_FILTERS>
+    <ENABLE_CSS_GRID_LAYOUT />
+    <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
+    <ENABLE_CSS_SHADERS />
+    <ENABLE_CSS_STICKY_POSITION>ENABLE_CSS_STICKY_POSITION</ENABLE_CSS_STICKY_POSITION>
+    <ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED</ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED>
+    <ENABLE_CUSTOM_SCHEME_HANDLER />
+    <ENABLE_DATAGRID />
+    <ENABLE_DATALIST_ELEMENT />
+    <ENABLE_DATA_TRANSFER_ITEMS />
+    <ENABLE_DETAILS_ELEMENT>ENABLE_DETAILS_ELEMENT</ENABLE_DETAILS_ELEMENT>
+    <ENABLE_DEVICE_ORIENTATION />
+    <ENABLE_DIRECTORY_UPLOAD />
+    <ENABLE_FILE_SYSTEM />
+    <ENABLE_FILTERS>ENABLE_FILTERS</ENABLE_FILTERS>
+    <ENABLE_FULLSCREEN_API />
+    <ENABLE_GAMEPAD />
+    <ENABLE_GEOLOCATION>ENABLE_GEOLOCATION</ENABLE_GEOLOCATION>
+    <ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING />
+    <ENABLE_HIGH_DPI_CANVAS>ENABLE_HIGH_DPI_CANVAS</ENABLE_HIGH_DPI_CANVAS>
+    <ENABLE_ICONDATABASE>ENABLE_ICONDATABASE</ENABLE_ICONDATABASE>
+    <ENABLE_IFRAME_SEAMLESS>ENABLE_IFRAME_SEAMLESS</ENABLE_IFRAME_SEAMLESS>
+    <ENABLE_INDEXED_DATABASE />
+    <ENABLE_INPUT_SPEECH />
+    <ENABLE_INPUT_TYPE_COLOR />
+    <ENABLE_INPUT_TYPE_DATE />
+    <ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE />
+    <ENABLE_INPUT_TYPE_DATETIMELOCAL />
+    <ENABLE_INPUT_TYPE_MONTH />
+    <ENABLE_INPUT_TYPE_TIME />
+    <ENABLE_INPUT_TYPE_WEEK />
+    <ENABLE_JAVASCRIPT_DEBUGGER>ENABLE_JAVASCRIPT_DEBUGGER</ENABLE_JAVASCRIPT_DEBUGGER>
+    <ENABLE_LEGACY_CSS_VENDOR_PREFIXES>ENABLE_LEGACY_CSS_VENDOR_PREFIXES</ENABLE_LEGACY_CSS_VENDOR_PREFIXES>
+    <ENABLE_LEGACY_NOTIFICATIONS />
+    <ENABLE_LINK_PREFETCH />
+    <ENABLE_LINK_PRERENDER />
+    <ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
+    <ENABLE_MEDIA_SOURCE />
+    <ENABLE_MEDIA_STATISTICS />
+    <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
+    <ENABLE_MICRODATA />
+    <ENABLE_MOUSE_CURSOR_SCALE />
+    <ENABLE_NOTIFICATIONS />
+    <ENABLE_PAGE_VISIBILITY_API />
+    <ENABLE_PROGRESS_ELEMENT />
+    <ENABLE_PROXIMITY_EVENTS />
+    <ENABLE_QUOTA />
+    <ENABLE_REGISTER_PROTOCOL_HANDLER />
+    <ENABLE_REQUEST_ANIMATION_FRAME />
+    <ENABLE_SCRIPTED_SPEECH />
+    <ENABLE_SHADOW_DOM />
+    <ENABLE_SHARED_WORKERS>ENABLE_SHARED_WORKERS</ENABLE_SHARED_WORKERS>
+    <ENABLE_SQL_DATABASE>ENABLE_SQL_DATABASE</ENABLE_SQL_DATABASE>
+    <ENABLE_STYLE_SCOPED />
+    <ENABLE_SUBPIXEL_LAYOUT>ENABLE_SUBPIXEL_LAYOUT</ENABLE_SUBPIXEL_LAYOUT>
+    <ENABLE_SVG>ENABLE_SVG</ENABLE_SVG>
+    <ENABLE_SVG_DOM_OBJC_BINDINGS />
+    <ENABLE_SVG_FONTS>ENABLE_SVG_FONTS</ENABLE_SVG_FONTS>
+    <ENABLE_TEXT_AUTOSIZING />
+    <ENABLE_UNDO_MANAGER />
+    <ENABLE_VIDEO />
+    <ENABLE_VIDEO_TRACK />
+    <ENABLE_VIEW_MODE_CSS_MEDIA />
+    <ENABLE_WEB_AUDIO />
+    <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
+    <ENABLE_WEB_TIMING />
+    <ENABLE_WORKERS>ENABLE_WORKERS</ENABLE_WORKERS>
+    <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
+    <ENABLE_XSLT>ENABLE_XSLT</ENABLE_XSLT>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(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_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(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_SUBPIXEL_LAYOUT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="ENABLE_3D_RENDERING">
+      <Value>$(ENABLE_3D_RENDERING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ACCELERATED_2D_CANVAS">
+      <Value>$(ENABLE_ACCELERATED_2D_CANVAS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ACCELERATED_OVERFLOW_SCROLLING">
+      <Value>$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_BLOB">
+      <Value>$(ENABLE_BLOB)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CANVAS_PROXY">
+      <Value>$(ENABLE_CANVAS_PROXY)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CHANNEL_MESSAGING">
+      <Value>$(ENABLE_CHANNEL_MESSAGING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSP_NEXT">
+      <Value>$(ENABLE_CSP_NEXT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS3_CONDITIONAL_RULES">
+      <Value>$(ENABLE_CSS3_CONDITIONAL_RULES)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS3_TEXT">
+      <Value>$(ENABLE_CSS3_TEXT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_BOX_DECORATION_BREAK">
+      <Value>$(ENABLE_CSS_BOX_DECORATION_BREAK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_COMPOSITING">
+      <Value>$(ENABLE_CSS_COMPOSITING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_EXCLUSIONS">
+      <Value>$(ENABLE_CSS_EXCLUSIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_FILTERS">
+      <Value>$(ENABLE_CSS_FILTERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_GRID_LAYOUT">
+      <Value>$(ENABLE_CSS_GRID_LAYOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_REGIONS">
+      <Value>$(ENABLE_CSS_REGIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_SHADERS">
+      <Value>$(ENABLE_CSS_SHADERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_STICKY_POSITION">
+      <Value>$(ENABLE_CSS_STICKY_POSITION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED">
+      <Value>$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_CUSTOM_SCHEME_HANDLER">
+      <Value>$(ENABLE_CUSTOM_SCHEME_HANDLER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATAGRID">
+      <Value>$(ENABLE_DATAGRID)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATALIST_ELEMENT">
+      <Value>$(ENABLE_DATALIST_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DATA_TRANSFER_ITEMS">
+      <Value>$(ENABLE_DATA_TRANSFER_ITEMS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DETAILS_ELEMENT">
+      <Value>$(ENABLE_DETAILS_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DEVICE_ORIENTATION">
+      <Value>$(ENABLE_DEVICE_ORIENTATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_DIRECTORY_UPLOAD">
+      <Value>$(ENABLE_DIRECTORY_UPLOAD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FILE_SYSTEM">
+      <Value>$(ENABLE_FILE_SYSTEM)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FILTERS">
+      <Value>$(ENABLE_FILTERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_FULLSCREEN_API">
+      <Value>$(ENABLE_FULLSCREEN_API)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_GAMEPAD">
+      <Value>$(ENABLE_GAMEPAD)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_GEOLOCATION">
+      <Value>$(ENABLE_GEOLOCATION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING">
+      <Value>$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_HIGH_DPI_CANVAS">
+      <Value>$(ENABLE_HIGH_DPI_CANVAS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_ICONDATABASE">
+      <Value>$(ENABLE_ICONDATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_IFRAME_SEAMLESS">
+      <Value>$(ENABLE_IFRAME_SEAMLESS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INDEXED_DATABASE">
+      <Value>$(ENABLE_INDEXED_DATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_SPEECH">
+      <Value>$(ENABLE_INPUT_SPEECH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_COLOR">
+      <Value>$(ENABLE_INPUT_TYPE_COLOR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATE">
+      <Value>$(ENABLE_INPUT_TYPE_DATE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE">
+      <Value>$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_DATETIMELOCAL">
+      <Value>$(ENABLE_INPUT_TYPE_DATETIMELOCAL)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_MONTH">
+      <Value>$(ENABLE_INPUT_TYPE_MONTH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_TIME">
+      <Value>$(ENABLE_INPUT_TYPE_TIME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_INPUT_TYPE_WEEK">
+      <Value>$(ENABLE_INPUT_TYPE_WEEK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_JAVASCRIPT_DEBUGGER">
+      <Value>$(ENABLE_JAVASCRIPT_DEBUGGER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LEGACY_CSS_VENDOR_PREFIXES">
+      <Value>$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LEGACY_NOTIFICATIONS">
+      <Value>$(ENABLE_LEGACY_NOTIFICATIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LINK_PREFETCH">
+      <Value>$(ENABLE_LINK_PREFETCH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_LINK_PRERENDER">
+      <Value>$(ENABLE_LINK_PRERENDER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MATHML">
+      <Value>$(ENABLE_MATHML)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MEDIA_SOURCE">
+      <Value>$(ENABLE_MEDIA_SOURCE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MEDIA_STATISTICS">
+      <Value>$(ENABLE_MEDIA_STATISTICS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_METER_ELEMENT">
+      <Value>$(ENABLE_METER_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MICRODATA">
+      <Value>$(ENABLE_MICRODATA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_MOUSE_CURSOR_SCALE">
+      <Value>$(ENABLE_MOUSE_CURSOR_SCALE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_NOTIFICATIONS">
+      <Value>$(ENABLE_NOTIFICATIONS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PAGE_VISIBILITY_API">
+      <Value>$(ENABLE_PAGE_VISIBILITY_API)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PROGRESS_ELEMENT">
+      <Value>$(ENABLE_PROGRESS_ELEMENT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_PROXIMITY_EVENTS">
+      <Value>$(ENABLE_PROXIMITY_EVENTS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_QUOTA">
+      <Value>$(ENABLE_QUOTA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_REGISTER_PROTOCOL_HANDLER">
+      <Value>$(ENABLE_REGISTER_PROTOCOL_HANDLER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_REQUEST_ANIMATION_FRAME">
+      <Value>$(ENABLE_REQUEST_ANIMATION_FRAME)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SCRIPTED_SPEECH">
+      <Value>$(ENABLE_SCRIPTED_SPEECH)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SHADOW_DOM">
+      <Value>$(ENABLE_SHADOW_DOM)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SHARED_WORKERS">
+      <Value>$(ENABLE_SHARED_WORKERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SQL_DATABASE">
+      <Value>$(ENABLE_SQL_DATABASE)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_STYLE_SCOPED">
+      <Value>$(ENABLE_STYLE_SCOPED)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SUBPIXEL_LAYOUT">
+      <Value>$(ENABLE_SUBPIXEL_LAYOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG">
+      <Value>$(ENABLE_SVG)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG_DOM_OBJC_BINDINGS">
+      <Value>$(ENABLE_SVG_DOM_OBJC_BINDINGS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_SVG_FONTS">
+      <Value>$(ENABLE_SVG_FONTS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_TEXT_AUTOSIZING">
+      <Value>$(ENABLE_TEXT_AUTOSIZING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_UNDO_MANAGER">
+      <Value>$(ENABLE_UNDO_MANAGER)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIDEO">
+      <Value>$(ENABLE_VIDEO)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIDEO_TRACK">
+      <Value>$(ENABLE_VIDEO_TRACK)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_VIEW_MODE_CSS_MEDIA">
+      <Value>$(ENABLE_VIEW_MODE_CSS_MEDIA)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>    
+    <BuildMacro Include="ENABLE_WEB_AUDIO">
+      <Value>$(ENABLE_WEB_AUDIO)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WEB_SOCKETS">
+      <Value>$(ENABLE_WEB_SOCKETS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WEB_TIMING">
+      <Value>$(ENABLE_WEB_TIMING)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_WORKERS">
+      <Value>$(ENABLE_WORKERS)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_XHR_TIMEOUT">
+      <Value>$(ENABLE_XHR_TIMEOUT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="ENABLE_XSLT">
+      <Value>$(ENABLE_XSLT)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops b/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
deleted file mode 100644
index f303d47b7..000000000
--- a/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops
+++ /dev/null
@@ -1,389 +0,0 @@
-<?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="FeatureDefinesCairo"
-	>
-  <Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_BLOB);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_BACKGROUND);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(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_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MUTATION_OBSERVERS);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(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_TEXT_AUTOSIZING);$(ENABLE_UNDO_MANAGER);$(ENABLE_VIDEO);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_WORKERS);$(ENABLE_XSLT)"
-	/>
-  <UserMacro
-		Name="ENABLE_3D_RENDERING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_ACCELERATED_2D_CANVAS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_BLOB"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CHANNEL_MESSAGING"
-		Value="ENABLE_CHANNEL_MESSAGING"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSP_NEXT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_BACKGROUND"
-		Value=""
-		PerformEnvironmentSet="false"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_CONDITIONAL_RULES"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS3_TEXT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_BOX_DECORATION_BREAK"
-		Value="ENABLE_CSS_BOX_DECORATION_BREAK"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_EXCLUSIONS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_FILTERS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_GRID_LAYOUT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_REGIONS"
-		Value="ENABLE_CSS_REGIONS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CSS_SHADERS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-                Name="ENABLE_CSS_COMPOSITING"
-                Value=""
-                PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_CUSTOM_SCHEME_HANDLER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATAGRID"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATALIST_ELEMENT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DATA_TRANSFER_ITEMS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DETAILS_ELEMENT"
-		Value="ENABLE_DETAILS_ELEMENT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DEVICE_ORIENTATION"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_DIRECTORY_UPLOAD"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FILE_SYSTEM"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FILTERS"
-		Value="ENABLE_FILTERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_FULLSCREEN_API"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_GAMEPAD"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_GEOLOCATION"
-		Value="ENABLE_GEOLOCATION"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_HIGH_DPI_CANVAS"
-		Value="ENABLE_HIGH_DPI_CANVAS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_ICONDATABASE"
-		Value="ENABLE_ICONDATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_IFRAME_SEAMLESS"
-		Value="ENABLE_IFRAME_SEAMLESS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INDEXED_DATABASE"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_SPEECH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_COLOR"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATE"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATETIME"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_DATETIMELOCAL"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_MONTH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_TIME"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_INPUT_TYPE_WEEK"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_JAVASCRIPT_DEBUGGER"
-		Value="ENABLE_JAVASCRIPT_DEBUGGER"
-		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=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MEDIA_STATISTICS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_METER_ELEMENT"
-		Value="ENABLE_METER_ELEMENT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MICRODATA"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_MUTATION_OBSERVERS"
-		Value="ENABLE_MUTATION_OBSERVERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_NOTIFICATIONS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PAGE_VISIBILITY_API"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PROGRESS_ELEMENT"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_PROXIMITY_EVENTS"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_QUOTA"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_REGISTER_PROTOCOL_HANDLER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_REQUEST_ANIMATION_FRAME"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SCRIPTED_SPEECH"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SHADOW_DOM"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SHARED_WORKERS"
-		Value="ENABLE_SHARED_WORKERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SQL_DATABASE"
-		Value="ENABLE_SQL_DATABASE"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_STYLE_SCOPED"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_SVG"
-		Value="ENABLE_SVG"
-		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_TEXT_AUTOSIZING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_UNDO_MANAGER"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_VIDEO"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_AUDIO"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_SOCKETS"
-		Value="ENABLE_WEB_SOCKETS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WEB_TIMING"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_WORKERS"
-		Value="ENABLE_WORKERS"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_XHR_TIMEOUT"
-		Value="ENABLE_XHR_TIMEOUT"
-		PerformEnvironmentSet="true"
-	/>
-  <UserMacro
-		Name="ENABLE_XSLT"
-		Value="ENABLE_XSLT"
-		PerformEnvironmentSet="true"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.props b/WebKitLibraries/win/tools/vsprops/WinCairo.props
new file mode 100644
index 000000000..da956d619
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/WinCairo.props
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;$(SolutionDir)\..\..\JavaScriptCore\os-win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN_CAIRO=1;WTF_PLATFORM_WIN_CAIRO=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>cairo.lib;libjpeg.lib;zdll.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops b/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
deleted file mode 100644
index 8e163ca68..000000000
--- a/WebKitLibraries/win/tools/vsprops/WinCairo.vsprops
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="WinCairo"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;;&quot;$(SolutionDir)\..\..\..\JavaScriptCore\os-win32&quot;"
-		PreprocessorDefinitions="WTF_PLATFORM_WIN_CAIRO=1"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="cairo.lib libjpeg.lib zdll.lib libpng.lib"
-		AdditionalLibraryDirectories="&quot;$(WebKitLibrariesDir)\lib&quot;"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/cURL.props b/WebKitLibraries/win/tools/vsprops/cURL.props
new file mode 100644
index 000000000..598774392
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/cURL.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;wininet.lib;Wldap32.lib;libeay32.lib;ssleay32.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/cURL.vsprops b/WebKitLibraries/win/tools/vsprops/cURL.vsprops
deleted file mode 100644
index 3f06aa6b3..000000000
--- a/WebKitLibraries/win/tools/vsprops/cURL.vsprops
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="cURL"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="ws2_32.lib wininet.lib Wldap32.lib libeay32.lib ssleay32.lib libcurl_imp.lib"
-		IgnoreAllDefaultLibraries="false"
-		IgnoreDefaultLibraryNames=""
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
new file mode 100644
index 000000000..06a13ea49
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/common.props
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <CONFIGURATIONBUILDDIR>$(WEBKIT_OUTPUTDIR)\$(Configuration)</CONFIGURATIONBUILDDIR>
+    <DEBUGSUFFIX>
+    </DEBUGSUFFIX>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir>$(ConfigurationBuildDir)\bin32\</OutDir>
+    <IntDir>$(ConfigurationBuildDir)\obj32\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+nmake /nologo -f $(ProjectName).make clean
+nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
+if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
+
+set PATH=$(VSInstallDir)\VC\bin;%PATH%
+
+REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
+    <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
+      <ExceptionHandling>false</ExceptionHandling>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <WarningLevel>Level4</WarningLevel>
+      <TreatWarningAsError>false</TreatWarningAsError>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4344;4355;4389;4396;4481;4503;4505;4510;4512;4610;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <FloatingPointExceptions>false</FloatingPointExceptions>
+      <OpenMPSupport>false</OpenMPSupport>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>
+      </AssemblerListingLocation>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <StringPooling>false</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Lib>
+      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
+      <UseUnicodeResponseFiles>true</UseUnicodeResponseFiles>
+    </Lib>
+    <Midl>
+      <WarnAsError>true</WarnAsError>
+      <HeaderFileName>$(OutDir)%(Filename).h</HeaderFileName>
+    </Midl>
+    <PostBuildEvent>
+      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file.
+if not exist "$(ProjectDir)$(ProjectName)PostBuild.cmd" exit /b
+
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+set CONFIGURATIONNAME=$(ConfigurationName)
+set INPUTDIR=$(InputDir)
+set INPUTFILENAME=$(InputFileName)
+set INPUTPATH=$(InputPath)
+set INTDIR=$(IntDir)
+set OUTDIR=$(OutDir)
+set PLATFORMNAME=$(PlatformName)
+set PROJECTDIR=$(ProjectDir)
+set PROJECTFILENAME=$(ProjectFileName)
+set PROJECTNAME=$(ProjectName)
+set PROJECTPATH=$(ProjectPath)
+set SOLUTIONDIR=$(SolutionDir)
+set SOLUTIONFILENAME=$(SolutionFileName)
+set SOLUTIONNAME=$(SolutionName)
+set SOLUTIONPATH=$(SolutionPath)
+set TARGETDIR=$(TargetDir)
+set TARGETEXT=$(TargetExt)
+set TARGETFILENAME=$(TargetFileName)
+set TARGETPATH=$(TargetPath)
+set DEBUGSUFFIX=$(DebugSuffix)
+
+REM If any of the above variables didn't exist previously and
+REM were set to an empty string, set will set the errorlevel to 1,
+REM which will cause the project-specific script to think the build
+REM has failed. This cmd /c call will clear the errorlevel.
+cmd /c
+
+"$(ProjectDir)$(ProjectName)PostBuild.cmd"
+</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.
+if not exist "$(ProjectDir)$(ProjectName)PreBuild.cmd" exit /b
+
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+set CONFIGURATIONNAME=$(ConfigurationName)
+set INPUTDIR=$(InputDir)
+set INPUTFILENAME=$(InputFileName)
+set INPUTPATH=$(InputPath)
+set INTDIR=$(IntDir)
+set OUTDIR=$(OutDir)
+set PLATFORMNAME=$(PlatformName)
+set PROJECTDIR=$(ProjectDir)
+set PROJECTFILENAME=$(ProjectFileName)
+set PROJECTNAME=$(ProjectName)
+set PROJECTPATH=$(ProjectPath)
+set SOLUTIONDIR=$(SolutionDir)
+set SOLUTIONFILENAME=$(SolutionFileName)
+set SOLUTIONNAME=$(SolutionName)
+set SOLUTIONPATH=$(SolutionPath)
+set TARGETDIR=$(TargetDir)
+set TARGETEXT=$(TargetExt)
+set TARGETFILENAME=$(TargetFileName)
+set TARGETPATH=$(TargetPath)
+set DEBUGSUFFIX=$(DebugSuffix)
+
+REM If any of the above variables didn't exist previously and
+REM were set to an empty string, set will set the errorlevel to 1,
+REM which will cause the project-specific script to think the build
+REM has failed. This cmd /c call will clear the errorlevel.
+cmd /c
+
+"$(ProjectDir)$(ProjectName)PreBuild.cmd"
+</Command>
+    </PreBuildEvent>
+    <PreLinkEvent>
+      <Command>REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.
+if not exist "$(ProjectDir)$(ProjectName)PreLink.cmd" exit /b
+
+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
+set CONFIGURATIONNAME=$(ConfigurationName)
+set INPUTDIR=$(InputDir)
+set INPUTFILENAME=$(InputFileName)
+set INPUTPATH=$(InputPath)
+set INTDIR=$(IntDir)
+set OUTDIR=$(OutDir)
+set PLATFORMNAME=$(PlatformName)
+set PROJECTDIR=$(ProjectDir)
+set PROJECTFILENAME=$(ProjectFileName)
+set PROJECTNAME=$(ProjectName)
+set PROJECTPATH=$(ProjectPath)
+set SOLUTIONDIR=$(SolutionDir)
+set SOLUTIONFILENAME=$(SolutionFileName)
+set SOLUTIONNAME=$(SolutionName)
+set SOLUTIONPATH=$(SolutionPath)
+set TARGETDIR=$(TargetDir)
+set TARGETEXT=$(TargetExt)
+set TARGETFILENAME=$(TargetFileName)
+set TARGETPATH=$(TargetPath)
+set DEBUGSUFFIX=$(DebugSuffix)
+
+REM If any of the above variables didn't exist previously and
+REM were set to an empty string, set will set the errorlevel to 1,
+REM which will cause the project-specific script to think the build
+REM has failed. This cmd /c call will clear the errorlevel.
+cmd /c
+
+"$(ProjectDir)$(ProjectName)PreLink.cmd"
+</Command>
+    </PreLinkEvent>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(IntDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <BuildLog />
+    <Link>
+      <AdditionalLibraryDirectories>$(IntDir)lib32;$(ConfigurationBuildDir)\lib32;$(WEBKIT_LIBRARIES)\lib32</AdditionalLibraryDirectories>
+      <LinkErrorReporting>PromptImmediately</LinkErrorReporting>
+      <CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AssemblyDebug>false</AssemblyDebug>
+      <SubSystem>Windows</SubSystem>
+      <HeapReserveSize>0</HeapReserveSize>
+      <HeapCommitSize>0</HeapCommitSize>
+      <StackReserveSize>0</StackReserveSize>
+      <StackCommitSize>0</StackCommitSize>
+      <LargeAddressAware>
+      </LargeAddressAware>
+      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <EnableUAC>
+      </EnableUAC>
+      <UACExecutionLevel>
+      </UACExecutionLevel>
+      <UACUIAccess>
+      </UACUIAccess>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <CLRThreadAttribute>DefaultThreadingAttribute</CLRThreadAttribute>
+      <ImportLibrary>$(ConfigurationBuildDir)\lib32\$(TargetName).lib</ImportLibrary>
+    </Link>
+    <Bscmake />
+    <Xdcmake />
+    <ManifestResourceCompile>
+      <ResourceOutputFileName>$(IntDir)\$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
+    </ManifestResourceCompile>
+    <ProjectReference>
+      <LinkLibraryDependencies>false</LinkLibraryDependencies>
+    </ProjectReference>
+    <BuildLog>
+      <Path>$(IntDir)BuildLog.htm</Path>
+    </BuildLog>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="CONFIGURATIONBUILDDIR">
+      <Value>$(CONFIGURATIONBUILDDIR)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="DEBUGSUFFIX">
+      <Value>$(DEBUGSUFFIX)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
deleted file mode 100644
index d656720eb..000000000
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="common"
-	OutputDirectory="$(ConfigurationBuildDir)\bin"
-	IntermediateDirectory="$(ConfigurationBuildDir)\obj\$(ProjectName)"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalOptions="/bigobj /GS"
-		PreprocessorDefinitions="WIN32;_WINDOWS;WINVER=0x502;_WIN32_WINNT=0x502;_WIN32_IE=0x603;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName)"
-		ExceptionHandling= "0"
-		RuntimeTypeInfo="false"
-		WarningLevel="4"
-		WarnAsError="true"
-		DebugInformationFormat="3"
-		DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4180;4189;4201;4244;4251;4275;4288;4291;4305;4344;4355;4389;4481;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		AdditionalOptions="/ignore:4221"
-		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkLibraryDependencies="false"
-		AdditionalOptions="/FIXED:NO /dynamicbase /ignore:4221"
-		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
-		AdditionalLibraryDirectories="&quot;$(ConfigurationBuildDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"
-		GenerateDebugInformation="true"
-		SubSystem="2"
-		ImportLibrary="$(ConfigurationBuildDir)\lib\$(TargetName).lib"
-		TargetMachine="1"
-	/>
-	<Tool
-		Name="VCMIDLTool"
-		WarnAsError="true"
-		HeaderFileName="$(OutDir)\$(InputName).h"
-	/>
-	<Tool
-		Name="VCPostBuildEventTool"
-		CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PostBuild.cmd file&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)PostBuild.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)PostBuild.cmd&quot;&#x0D;&#x0A;"
-	/>
-	<Tool
-		Name="VCPreBuildEventTool"
-		CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreBuild.cmd file.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)PreBuild.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)PreBuild.cmd&quot;&#x0D;&#x0A;"
-	/>
-	<Tool
-		Name="VCPreLinkEventTool"
-		CommandLine="REM Do not edit from the Visual Studio IDE! Customize via a $(ProjectName)PreLink.cmd file.&#x0D;&#x0A;if not exist &quot;$(ProjectDir)$(ProjectName)PreLink.cmd&quot; exit /b&#x0D;&#x0A;&#x0D;&#x0A;set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)&#x0D;&#x0A;set CONFIGURATIONNAME=$(ConfigurationName)&#x0D;&#x0A;set INPUTDIR=$(InputDir)&#x0D;&#x0A;set INPUTFILENAME=$(InputFileName)&#x0D;&#x0A;set INPUTPATH=$(InputPath)&#x0D;&#x0A;set INTDIR=$(IntDir)&#x0D;&#x0A;set LIBRARYCONFIGSUFFIX=$(LibraryConfigSuffix)&#x0D;&#x0A;set OUTDIR=$(OutDir)&#x0D;&#x0A;set PLATFORMNAME=$(PlatformName)&#x0D;&#x0A;set PROJECTDIR=$(ProjectDir)&#x0D;&#x0A;set PROJECTFILENAME=$(ProjectFileName)&#x0D;&#x0A;set PROJECTNAME=$(ProjectName)&#x0D;&#x0A;set PROJECTPATH=$(ProjectPath)&#x0D;&#x0A;set SOLUTIONDIR=$(SolutionDir)&#x0D;&#x0A;set SOLUTIONFILENAME=$(SolutionFileName)&#x0D;&#x0A;set SOLUTIONNAME=$(SolutionName)&#x0D;&#x0A;set SOLUTIONPATH=$(SolutionPath)&#x0D;&#x0A;set TARGETDIR=$(TargetDir)&#x0D;&#x0A;set TARGETEXT=$(TargetExt)&#x0D;&#x0A;set TARGETFILENAME=$(TargetFileName)&#x0D;&#x0A;set TARGETPATH=$(TargetPath)&#x0D;&#x0A;set WEBKITCONFIGSUFFIX=$(WebKitConfigSuffix)&#x0D;&#x0A;set WEBKITDLLCONFIGSUFFIX=$(WebKitDLLConfigSuffix)&#x0D;&#x0A;&#x0D;&#x0A;REM If any of the above variables didn&apos;t exist previously and&#x0D;&#x0A;REM were set to an empty string, set will set the errorlevel to 1,&#x0D;&#x0A;REM which will cause the project-specific script to think the build&#x0D;&#x0A;REM has failed. This cmd /c call will clear the errorlevel.&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;&quot;$(ProjectDir)$(ProjectName)PreLink.cmd&quot;&#x0D;&#x0A;"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		Culture="1033"
-		AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"
-	/>
-  <UserMacro
-		Name="ConfigurationBuildDir"
-		Value="$(WebKitOutputDir)\$(ConfigurationName)"
-	/>
-	<UserMacro
-		Name="ProductionBuild"
-		Value="0"
-	/>
-</VisualStudioPropertySheet>
-
diff --git a/WebKitLibraries/win/tools/vsprops/debug.props b/WebKitLibraries/win/tools/vsprops/debug.props
new file mode 100644
index 000000000..75a793850
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/debug.props
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <WebKitConfigSuffix />
+    <LibraryConfigSuffix />
+    <WebKitDLLConfigSuffix />
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Bscmake />
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="WebKitConfigSuffix">
+      <Value>$(WebKitConfigSuffix)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="LibraryConfigSuffix">
+      <Value>$(LibraryConfigSuffix)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="WebKitDLLConfigSuffix">
+      <Value>$(WebKitDLLConfigSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/debug.vsprops b/WebKitLibraries/win/tools/vsprops/debug.vsprops
deleted file mode 100644
index dee62214e..000000000
--- a/WebKitLibraries/win/tools/vsprops/debug.vsprops
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="0"
-		MinimalRebuild="true"
-		BasicRuntimeChecks="3"
-		RuntimeLibrary="2"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="2"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-	/>
-	<UserMacro
-		Name="WebKitConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="LibraryConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="WebKitDLLConfigSuffix"
-		Value=""
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/debug_all.vsprops b/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
deleted file mode 100644
index 288e803da..000000000
--- a/WebKitLibraries/win/tools/vsprops/debug_all.vsprops
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug_all"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="USE_DEBUG_SAFARI_THEME;DEBUG_INTERNAL;DEBUG_ALL"
-		RuntimeLibrary="3"
-	/>
-	<UserMacro
-		Name="WebKitConfigSuffix"
-		Value="_debug"
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="LibraryConfigSuffix"
-		Value="_debug"
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="WebKitDLLConfigSuffix"
-		Value="_debug"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.props b/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
new file mode 100644
index 000000000..4bf36f9aa
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.props
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <WebKitConfigSuffix />
+    <LibraryConfigSuffix />
+    <WebKitDLLConfigSuffix />
+  </PropertyGroup>
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(WebKit_Libraries)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="WebKitConfigSuffix">
+      <Value>$(WebKitConfigSuffix)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="LibraryConfigSuffix">
+      <Value>$(LibraryConfigSuffix)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+    <BuildMacro Include="WebKitDLLConfigSuffix">
+      <Value>$(WebKitDLLConfigSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
deleted file mode 100644
index ad9142d72..000000000
--- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="debug_wincairo"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="0"
-		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;"
-		PreprocessorDefinitions="DEBUG_ALL"
-		MinimalRebuild="true"
-		BasicRuntimeChecks="3"
-		RuntimeLibrary="2"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="2"
-		AdditionalLibraryDirectories="&quot;$(WebKitLibrariesDir)\lib&quot;"
-	/>
-	<UserMacro
-		Name="WebKitConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="LibraryConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="WebKitDLLConfigSuffix"
-		Value=""
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/debugsuffix.props b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
new file mode 100644
index 000000000..16d070ecf
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/debugsuffix.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <DebugSuffix>_debug</DebugSuffix>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetName>$(TargetName)$(DebugSuffix)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;DEBUG_INTERNAL;DEBUG_ALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Lib>
+      <OutputFile>$(OutDir)\$(ProjectName)$(DebugSuffix).lib</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="DebugSuffix">
+      <Value>$(DebugSuffix)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/production.props b/WebKitLibraries/win/tools/vsprops/production.props
new file mode 100644
index 000000000..0b3fbcd55
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/production.props
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <PRODUCTION>1</PRODUCTION>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>__PRODUCTION__=1;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>__PRODUCTION__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Midl>
+      <PreprocessorDefinitions>__PRODUCTION__=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </Midl>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="PRODUCTION">
+      <Value>$(PRODUCTION)</Value>
+      <EnvironmentVariable>true</EnvironmentVariable>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/production.vsprops b/WebKitLibraries/win/tools/vsprops/production.vsprops
deleted file mode 100644
index fb25bf510..000000000
--- a/WebKitLibraries/win/tools/vsprops/production.vsprops
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="production"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="__PRODUCTION__=1"
-		WholeProgramOptimization="false"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkTimeCodeGeneration="0"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		LinkTimeCodeGeneration="false"
-	/>
-	<Tool
-		Name="VCMIDLTool"
-		PreprocessorDefinitions="__PRODUCTION__=1"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="__PRODUCTION__=1"
-	/>
-	<UserMacro
-		Name="ProductionBuild"
-		Value="1"
-	/>
-	<UserMacro
-		Name="PRODUCTION"
-		Value="1"
-		PerformEnvironmentSet="true"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/release.props b/WebKitLibraries/win/tools/vsprops/release.props
new file mode 100644
index 000000000..e7f899e49
--- /dev/null
+++ b/WebKitLibraries/win/tools/vsprops/release.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <NMakePreprocessorDefinitions>NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Bscmake />
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
+\ No newline at end of file
diff --git a/WebKitLibraries/win/tools/vsprops/release.vsprops b/WebKitLibraries/win/tools/vsprops/release.vsprops
deleted file mode 100644
index 633c04d81..000000000
--- a/WebKitLibraries/win/tools/vsprops/release.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="release"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalOptions="/Oy-"
-		OmitFramePointers="false"
-	/>
-</VisualStudioPropertySheet>
diff --git a/WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops b/WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops
deleted file mode 100644
index 077246777..000000000
--- a/WebKitLibraries/win/tools/vsprops/releaseproduction.vsprops
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="releaseproduction"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		Optimization="2"
-		PreprocessorDefinitions="NDEBUG"
-		RuntimeLibrary="2"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		LinkIncremental="1"
-		OptimizeReferences="2"
-		EnableCOMDATFolding="2"
-		OptimizeForWindows98="1"
-	/>
-	<Tool
-		Name="VCResourceCompilerTool"
-		PreprocessorDefinitions="NDEBUG"
-	/>
-	<UserMacro
-		Name="WebKitConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="LibraryConfigSuffix"
-		Value=""
-		PerformEnvironmentSet="true"
-	/>
-	<UserMacro
-		Name="WebKitDLLConfigSuffix"
-		Value=""
-	/>
-</VisualStudioPropertySheet>
author	Allan Sandfeld Jensen <allan.jensen@digia.com>	2013-09-13 12:51:20 +0200
committer	The Qt Project <gerrit-noreply@qt-project.org>	2013-09-19 20:50:05 +0200
commit	d441d6f39bb846989d95bcf5caf387b42414718d (patch)
tree	e367e64a75991c554930278175d403c072de6bb8 /WebKitLibraries
parent	0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)