Merge WebKit at r72805: Initial merge by Git

Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.

Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790

60 files changed, 4537 insertions, 5196 deletions

diff --git a/JavaScriptCore/CMakeListsEfl.txt b/JavaScriptCore/CMakeListsEfl.txt
index 9d3c71e..90ee22b 100644
--- a/JavaScriptCore/CMakeListsEfl.txt
+++ b/JavaScriptCore/CMakeListsEfl.txt
@@ -2,7 +2,6 @@ LIST(APPEND JavaScriptCore_SOURCES
     jit/ExecutableAllocatorFixedVMPool.cpp
     jit/ExecutableAllocator.cpp
     runtime/MarkStackPosix.cpp
-    wtf/OSAllocatorPosix.cpp
 )
 
 LIST(APPEND JavaScriptCore_LIBRARIES
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7175c5d..f5176f2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,480 +1,19 @@
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the GTK build.
-
-        * GNUmakefile.am: Use a full path to OSAllocator*.cpp.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the EFL Linux build.
-
-        * CMakeListsEfl.txt: Added OSAllocator to the project.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the Qt build: Include all OS files for Qt's sake, and then
-        use #ifdefs in the files to exclude things based on OS.
-        
-        This is a pretty bad way to manage platforms -- hopefully we can
-        fix the Qt build system and move away from this in the future.
-
-        * wtf/OSAllocatorPosix.cpp:
-        * wtf/OSAllocatorSymbian.cpp:
-        * wtf/OSAllocatorWin.cpp:
-        * wtf/wtf.pri:
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the Chromium build.
-        
-        * JavaScriptCore.gypi: This is a Windows build file, so use OSAllocatorWin.cpp.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the GTK build.
-
-        * GNUmakefile.am: Added OSAllocator to another project.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the GTK Linux build.
-
-        * JavaScriptCore.gypi: Added OSAllocator to the project.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the Qt Linux build.
-
-        * wtf/OSAllocatorPosix.cpp: Use the right errno.h.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix Windows build: export some more symbols.
-
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Try to fix the Qt Linux build.
-
-        * wtf/wtf.pri: Use the POSIX OSAllocator for Qt Linux.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Windows build fix: commit doesn't have a return value.
-
-        * wtf/OSAllocatorWin.cpp:
-        (WTF::OSAllocator::commit):
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Build fix: Export some symbols.
-
-        * JavaScriptCore.exp:
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Build fix.
-
-        * JavaScriptCore.xcodeproj/project.pbxproj: Export OSAllocator.h as private
-        so other projects can see it.
-
-        * wtf/OSAllocatorPosix.cpp: #include UnusedParam.h for UNUSED_PARAM.
-
-2010-12-01  Geoffrey Garen  <ggaren@apple.com>
-
-        Reviewed by Sam Weinig.
-
-        Baby step toward a cross-platform virtual memory abstraction: created
-        an all-static OSAllocator class and changed MarkStack to use it.
-
-        * JavaScriptCore.exp: These functions are inlined now.
-
-        * JavaScriptCore.vcproj/WTF/WTF.vcproj: Added OSAllocatorWin.cpp.
-
-        * JavaScriptCore.xcodeproj/project.pbxproj: Added OSAllocatorPosix.cpp.
-
-        * runtime/MarkStack.h:
-        (JSC::MarkStack::allocateStack):
-        (JSC::MarkStack::releaseStack): Use OSAllocator instead of rolling our
-        own platform-specific code.
-
-        * runtime/MarkStackNone.cpp: Removed. Nothing used this.
-
-        * runtime/MarkStackPosix.cpp: 
-        * runtime/MarkStackSymbian.cpp:
-        * runtime/MarkStackWin.cpp: Removed custom platform-specific code, since
-        we use the OSAllocator abstraction now.
-
-        * wtf/OSAllocator.h: Added.
-        * wtf/OSAllocatorPosix.cpp: Added.
-        (WTF::OSAllocator::reserve):
-        (WTF::OSAllocator::reserveAndCommit):
-        (WTF::OSAllocator::commit):
-        (WTF::OSAllocator::decommit):
-        (WTF::OSAllocator::release):
-        * wtf/OSAllocatorSymbian.cpp: Added.
-        (WTF::OSAllocator::reserve):
-        (WTF::OSAllocator::reserveAndCommit):
-        (WTF::OSAllocator::commit):
-        (WTF::OSAllocator::decommit):
-        (WTF::OSAllocator::release):
-        * wtf/OSAllocatorWin.cpp: Added.
-        (WTF::OSAllocator::reserve):
-        (WTF::OSAllocator::reserveAndCommit):
-        (WTF::OSAllocator::commit):
-        (WTF::OSAllocator::decommit):
-        (WTF::OSAllocator::release): The new OSAllocator abstraction.
-
-        * wtf/wtf.pri: Added OSAllocatorSymbian.cpp.
-
-2010-12-01  Steve Falkenburg  <sfalken@apple.com>
-
-        Reviewed by Adam Roben.
-
-        WinCairo build should not use link-time code generation (LTCG)
-        https://bugs.webkit.org/show_bug.cgi?id=50353
-
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
-        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
-        * JavaScriptCore.vcproj/jsc/jsc.vcproj:
-        * JavaScriptCore.vcproj/testapi/testapi.vcproj:
-
-010-12-01  Steve Falkenburg  <sfalken@apple.com>
-
-        Reviewed by Adam Roben.
-
-        vcproj changes can't be applied cleanly by the Windows EWS bot
-        https://bugs.webkit.org/show_bug.cgi?id=50328
-
-        * JavaScriptCore.vcproj/JavaScriptCore.sln: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/WTF/WTF.vcproj: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/jsc/jsc.vcproj: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/jsc/jscCommon.vsprops: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/testapi/testapi.vcproj: Modified property svn:eol-style.
-        * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops: Added property svn:eol-style.
-
-2010-12-01  Gavin Barraclough  <barraclough@apple.com>
-
-        Reviewed by Sam Weinig.
-
-        Bug 50298 - /()()()()()()()()()(?:(\10a|b)(X|Y))+/.exec("bXXaYYaY") ASSERTs
-
-        For unmatched subpattens we previously used to set the subpattern end to -1,
-        but now we only set the start value. E.g. consider the following:
-            /a(b)?c/.exec("ac");
-        Previously we would generate an internal results array of:
-            [ 0, 2, -1, -1 ]
-        Since fairly recently we have generated results of:
-            [ 0, 2, -1, ??? ]
-        (With the end index of the subpattern uninitialized).
-
-        Update these ASSERTs to account for this.
-
-        Also, when stripping out self-referencing backreferences, (e.g. /(\1)/) we
-        were checking the wrong property on the pattern term. We should have been
-        looking at term.parentheses.subpatternId, but instead were checking
-        term.subpatternId. The latter is actually only the subpatternId for
-        back reference terms. Rename this to backReferenceSubpatternId.
-
-        * yarr/RegexInterpreter.cpp:
-        (JSC::Yarr::Interpreter::matchBackReference):
-        (JSC::Yarr::Interpreter::backtrackBackReference):
-
-2010-11-30  Gavin Barraclough  <barraclough@apple.com>
-
-        Rubber stamped by Sam Weinig.
-
-        Bug 50297 - \s in YARR should match BOMs.
-
-        From section 15.10.2.12 CharacterClassEscape contains:
-
-        The production CharacterClassEscape :: s evaluates by returning the set of characters containing the
-        characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions.
-
-        Table 2 in section 7.2 contains:
-
-        \uFEFF Byte Order Mark <BOM>
-
-        * create_regex_tables:
-            Add BOM to spaces table.
-
-2010-11-30  Gavin Barraclough  <barraclough@apple.com>
-
-        Reviewed by Darin Adler.
-
-        Fixed review comments following bug #48101.
-        Mostly typos, plus gave quantifyInfinite a symbolic name.
-
-        * yarr/RegexCompiler.cpp:
-        (JSC::Yarr::RegexPatternConstructor::quantifyAtom):
-        (JSC::Yarr::RegexPatternConstructor::checkForTerminalParentheses):
-        * yarr/RegexInterpreter.cpp:
-        (JSC::Yarr::Interpreter::backtrackParenthesesOnceEnd):
-        (JSC::Yarr::Interpreter::matchParenthesesTerminalBegin):
-        (JSC::Yarr::Interpreter::backtrackParenthesesTerminalBegin):
-        (JSC::Yarr::Interpreter::backtrackParenthesesTerminalEnd):
-        * yarr/RegexJIT.cpp:
-        (JSC::Yarr::RegexGenerator::generatePatternCharacterGreedy):
-        (JSC::Yarr::RegexGenerator::generatePatternCharacterNonGreedy):
-        (JSC::Yarr::RegexGenerator::generateCharacterClassGreedy):
-        * yarr/RegexParser.h:
-        (JSC::Yarr::Parser::parseTokens):
-        (JSC::Yarr::parse):
-
-2010-11-30  Steve Falkenburg  <sfalken@apple.com>
-
-        Reviewed by Darin Adler.
-
-        WTF project missing build-stopping code from its pre-build event
-        https://bugs.webkit.org/show_bug.cgi?id=50281
-
-        * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd:
-
-2010-11-30  Patrick Gansterer  <paroga@webkit.org>
-
-        Reviewed by Darin Adler.
-
-        Cleanup UTF8.cpp
-        https://bugs.webkit.org/show_bug.cgi?id=49581
-
-        Use macros and functions instead of range values directly.
-
-        * wtf/unicode/UTF8.cpp:
-        (WTF::Unicode::inlineUTF8SequenceLength):
-        (WTF::Unicode::UTF8SequenceLength):
-        (WTF::Unicode::convertUTF16ToUTF8):
-        (WTF::Unicode::readUTF8Sequence):
-        (WTF::Unicode::convertUTF8ToUTF16):
-        * wtf/unicode/UnicodeMacrosFromICU.h: Added U_IS_SUPPLEMENTARY macro.
-
-2010-11-30  Geoffrey Garen  <ggaren@apple.com>
-
-        Reviewed by Gavin Barraclough.
-
-        Fixed a crash seen when using a PageAllocation to store itself.
-
-        * wtf/PageAllocation.h:
-        (WTF::PageAllocation::systemDeallocate): Zero out m_base before unmapping
-        it, in case unmapping m_base unmaps the PageAllocation.
-
-        * wtf/BumpPointerAllocator.h:
-        (WTF::BumpPointerPool::destroy): Now this work-around isn't needed!
-
-2010-11-30  Xan Lopez  <xlopez@igalia.com>
-
-        Reviewed by Darin Adler.
-
-        m_hasNonEnumerableProperties is never initialized in Structure
-        https://bugs.webkit.org/show_bug.cgi?id=50266
-
-        * runtime/Structure.cpp:
-        (JSC::Structure::Structure): initialize member variable.
-
-2010-11-29  Steve Falkenburg  <sfalken@apple.com>
-
-        Windows build fix (part 1). Use correct environment variable syntax in cmd files.
-
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd:
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd:
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd:
-        * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd:
-        * JavaScriptCore.vcproj/jsc/jscPostBuild.cmd:
-        * JavaScriptCore.vcproj/jsc/jscPreBuild.cmd:
-        * JavaScriptCore.vcproj/jsc/jscPreLink.cmd:
-        * JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd:
-        * JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd:
-        * JavaScriptCore.vcproj/testapi/testapiPreLink.cmd:
-
-2010-11-29  Dan Bernstein  <mitz@apple.com>
-
-        Reviewed by Darin Adler.
-
-        WTF support for <rdar://problem/8650085> adding word-prefix search options to the text search API.
-        https://bugs.webkit.org/show_bug.cgi?id=50038
-
-        * wtf/unicode/UnicodeMacrosFromICU.h: Copied additional macros from icu/unicode/utf16.h.
-
-2010-11-29  Steve Falkenburg  <sfalken@apple.com>
-
-        Reviewed by Darin Adler.
-
-        JavaScriptCore projects on Windows should use cmd files for build events
-        https://bugs.webkit.org/show_bug.cgi?id=50193
-
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops:
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd: Added.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd: Added.
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd: Added.
-        * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added property svn:eol-style.
-        * JavaScriptCore.vcproj/jsc/jscCommon.vsprops:
-        * JavaScriptCore.vcproj/jsc/jscPostBuild.cmd: Added.
-        * JavaScriptCore.vcproj/jsc/jscPreBuild.cmd: Added.
-        * JavaScriptCore.vcproj/jsc/jscPreLink.cmd: Added.
-        * JavaScriptCore.vcproj/testapi/testapiCommon.vsprops:
-        * JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd: Added.
-        * JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd: Added.
-        * JavaScriptCore.vcproj/testapi/testapiPreLink.cmd: Added.
-
-2010-11-29  Dai Mikurube  <dmikurube@google.com>
-
-        Reviewed by Kent Tamura.
-
-        when empty, clicking "down" on outer-spin-button returns "max value"
-        https://bugs.webkit.org/show_bug.cgi?id=45491
-
-        It is required to calculate UTC/DST offsets to retrieve the current local milliseconds for
-        date/time type inputs. WTF::currentTimeMS() returns a UTC time, and WTF::getLocalTime()
-        returns a struct tm, not milliseconds.
-
-        Calculating milliseconds from a struct tm is not simple since timegm() cannot be used in all
-        environments. This calculation is already done in calculateUTCOffset(), and complicated.
-        Duplicating this complicated calculation is unreasonable because of maintainability.
-        To achieve this without duplication, we must call calculate{UTC|DST}Offset in some way.
-
-        * JavaScriptCore.exp:
-        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
-        * wtf/DateMath.cpp: Changed calculateUTCOffset() and calculateDSTOffset() to external functions.
-        (WTF::calculateUTCOffset):
-        (WTF::calculateDSTOffset):
-        * wtf/DateMath.h:
-
-2010-11-29  Chris Rogers  <crogers@google.com>
-
-        Reviewed by Kenneth Russell.
-
-        Switch web audio code to use FloatPoint3D instead of Vector3
-        https://bugs.webkit.org/show_bug.cgi?id=50186
-
-        * wtf/Vector3.h: Removed.
-
-2010-11-29  Steve Falkenburg  <sfalken@apple.com>
-
-        Reviewed by Adam Roben.
-
-        Add a mechanism for Windows pre-build/pre-link/post-build events to be separated into individual cmd files
-        https://bugs.webkit.org/show_bug.cgi?id=49858
-
-        We're migrating our prebuild/prelink/postbuild steps out of vcproj and vsprops files:
-        - To simplify editing (editing vsprops build steps is confusing).
-        - For more readable diffs.
-
-        * JavaScriptCore.vcproj/WTF/WTFCommon.vsprops:
-        * JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd: Added.
-        * JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd: Added.
-
-2010-11-29  Geoffrey Garen  <ggaren@apple.com>
-
-        Reviewed by Gavin Barraclough.
-
-        Improved accuracy of command-line SunSpider.
-
-        * jsc.cpp:
-        (functionRun): Changed the "run" function to run a given test in
-        its own global object. Previously, all tests ran in the same global
-        object, which created name conflicts, and made globals from previous
-        tests artificially survive into later tests.
-        
-        Also changed "run" to return the elapsed milliseconds when running a
-        given test, for slightly more accurate numbers.
-
-        (functionCheckSyntax): Ditto on returning elapsed milliseconds.
-
-2010-11-29  Darin Adler  <darin@apple.com>
-
-        Reviewed by Andreas Kling.
-
-        Remove a couple unneeded overflow checks
-        https://bugs.webkit.org/show_bug.cgi?id=49816
-
-        * wtf/text/CString.cpp:
-        (WTF::CString::init): Use an ASSERT instead of
-        an overflow check with CRASH.
-
-2010-11-29  Adam Roben  <aroben@apple.com>
-
-        Robustify react-to-vsprops-changes.py against changes to its location
-        or the location of the .vsprops files
-
-        Suggested by John Sullivan.
-
-        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
-        Removed file_modification_times.
-        (main): Use glob.glob to find the .vsprops files and assert that we found some.
-
-2010-11-29  Adam Roben  <aroben@apple.com>
-
-        Touch wtf/Platform.h whenever any .vsprops file changes
-
-        This will cause all files to be recompiled, which will make changes to
-        preprocessor macros (e.g., ENABLE_*) actually take effect.
-
-        Fixes <http://webkit.org/b/50167> Windows build fails when ENABLE_*
-        macros are changed (because not enough files are rebuilt)
-
-        Reviewed by John Sullivan.
-
-        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
-        (main): Touch wtf/Platform.h if it's older than any .vsprops file. Also
-        added some comments and logging to make it clearer what the script is
-        doing and why.
-
-2010-11-29  Adam Roben  <aroben@apple.com>
-
-        Update react-to-vsprops-changes.py after r72555
-
-        .vsprops files are no longer accessed relative to $WebKitLibrariesDir.
-
-        Fixes <http://webkit.org/b/50166> REGRESSION (r72555):
-        react-to-vsprops-changes.py no longer works for people with a
-        non-default $WebKitLibrariesDir
-
-        Reviewed by John Sullivan.
-
-        * JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py:
-        (main): Always look in WebKitLibraries/win for .vsprops files, not in
-        $WebKitLibrariesDir.
-
-2010-11-28  Gavin Barraclough  <barraclough@apple.com>
-
-        Reviewed by Sam Weinig.
-
-        Bug 48100 - YARR allows what seems like a bogus character-class range
-
-        Per ECMA-262 character classes containing character ranges containing
-        character classes are invalid, eg:
-            /[\d-x]/
-            /[x-\d]/
-            /[\d-\d]/
-        These should throw a syntax error.
-
-        * yarr/RegexParser.h:
-
 2010-11-27  Gavin Barraclough  <barraclough@apple.com>
 
         Reviewed by Sam Weinig.
 
         Bug 48101 - Yarr gives different results for /(?:a*?){2,}/
 
-        The test cases in the linked mozilla bug demonstrate a couple of
+        The test cases in the linked mozilla bug demostrate a couple of
         problems in subpattern matching. These bugs lie in the optimized
         cases - for matching parentheses with a quantity count of 1, and
         for matching greedy quantified parentheses at the end of a regex
         (which do not backtrack).
 
         In both of these cases we are failing to correctly handle empty
-        matches. In the case of parentheses-single matches (quantity count
+        matches. In the case of parenthese-single matches (quantity count
         one) we are failing to test for empty matches at all. In the case
-        of terminal subpattern matches we do currently check, however there
+        of terminal subpattern matches we do currenty check, however there
         is a subtler bug here too. In the case of an empty match we will
         presently immediately fall through to the next alternative (or
         complete the regex match), whereas upon a failed match we should
@@ -486,7 +25,7 @@
         which point the non-greedy a?? will match, and as such the result
         should be "ab", not "a").
 
-        Terminal subpattern matching contains a second bug, too. The frame
+        Terminal sunpattern matching contains a second bug, too. The frame
         location values in the subpattern should be being allocated with
         the outer disjunction's frame (as we do for the parentheses-single
         optimization). Consider the following three regexes:
diff --git a/JavaScriptCore/Configurations/Version.xcconfig b/JavaScriptCore/Configurations/Version.xcconfig
index ee86a20..d4cb8e7 100644
--- a/JavaScriptCore/Configurations/Version.xcconfig
+++ b/JavaScriptCore/Configurations/Version.xcconfig
@@ -22,7 +22,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 MAJOR_VERSION = 534;
-MINOR_VERSION = 14;
+MINOR_VERSION = 13;
 TINY_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
 
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 89f9ab7..f7806b4 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -554,13 +554,11 @@ javascriptcore_sources += \
 
 if TARGET_WIN32
 javascriptcore_sources += \
-	JavaScriptCore/runtime/MarkStackWin.cpp \
-	JavaScriptCore/wtf/OSAllocatorWin.cpp
+	JavaScriptCore/runtime/MarkStackWin.cpp
 else
 javascriptcore_sources += \
 	JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp \
-	JavaScriptCore/runtime/MarkStackPosix.cpp \
-	JavaScriptCore/wtf/OSAllocatorPosix.cpp
+	JavaScriptCore/runtime/MarkStackPosix.cpp
 endif
 
 # ----
diff --git a/JavaScriptCore/JavaScriptCore.exp b/JavaScriptCore/JavaScriptCore.exp
index 193fa08..ac5d0d7 100644
--- a/JavaScriptCore/JavaScriptCore.exp
+++ b/JavaScriptCore/JavaScriptCore.exp
@@ -306,6 +306,8 @@ __ZN3JSC8evaluateEPNS_9ExecStateERNS_10ScopeChainERKNS_10SourceCodeENS_7JSValueE
 __ZN3JSC9CodeBlockD1Ev
 __ZN3JSC9CodeBlockD2Ev
 __ZN3JSC9MarkStack10s_pageSizeE
+__ZN3JSC9MarkStack12releaseStackEPvm
+__ZN3JSC9MarkStack13allocateStackEm
 __ZN3JSC9MarkStack18initializePagesizeEv
 __ZN3JSC9Structure13hasTransitionEPN3WTF10StringImplEj
 __ZN3JSC9Structure17stopIgnoringLeaksEv
@@ -359,12 +361,8 @@ __ZN3WTF10StringImplD1Ev
 __ZN3WTF10fastCallocEmm
 __ZN3WTF10fastMallocEm
 __ZN3WTF10fastStrDupEPKc
-__ZN3WTF11OSAllocator16reserveAndCommitEm
-__ZN3WTF11OSAllocator7releaseEPvm
 __ZN3WTF11commentAtomE
 __ZN3WTF11currentTimeEv
-__ZN3WTF11dtoaRoundDPEPcdiRbRiRj
-__ZN3WTF11dtoaRoundSFEPcdiRbRiRj
 __ZN3WTF11fastReallocEPvm
 __ZN3WTF12AtomicString11addSlowCaseEPNS_10StringImplE
 __ZN3WTF12AtomicString3addEPKc
@@ -406,8 +404,6 @@ __ZN3WTF17charactersToFloatEPKtmPb
 __ZN3WTF17equalIgnoringCaseEPKtPKcj
 __ZN3WTF17equalIgnoringCaseEPNS_10StringImplEPKc
 __ZN3WTF17equalIgnoringCaseEPNS_10StringImplES1_
-__ZN3WTF18calculateDSTOffsetEdd
-__ZN3WTF18calculateUTCOffsetEv
 __ZN3WTF18charactersToDoubleEPKtmPb
 __ZN3WTF18dateToDaysFrom1970Eiii
 __ZN3WTF18monthFromDayInYearEib
@@ -435,7 +431,6 @@ __ZN3WTF39initializeMainThreadToProcessMainThreadEv
 __ZN3WTF3MD58addBytesEPKhm
 __ZN3WTF3MD58checksumERNS_6VectorIhLm16EEE
 __ZN3WTF3MD5C1Ev
-__ZN3WTF4dtoaEPcdRbRiRj
 __ZN3WTF5Mutex4lockEv
 __ZN3WTF5Mutex6unlockEv
 __ZN3WTF5Mutex7tryLockEv
@@ -550,6 +545,9 @@ __ZNK3JSC8JSObject9toBooleanEPNS_9ExecStateE
 __ZNK3JSC8JSString11resolveRopeEPNS_9ExecStateE
 __ZNK3JSC9HashTable11createTableEPNS_12JSGlobalDataE
 __ZNK3JSC9HashTable11deleteTableEv
+__ZN3WTF11dtoaRoundSFEPcdiRbRiRj
+__ZN3WTF11dtoaRoundDPEPcdiRbRiRj
+__ZN3WTF4dtoaEPcdRbRiRj
 __ZNK3WTF12AtomicString5lowerEv
 __ZNK3WTF13DecimalNumber15toStringDecimalEPtj
 __ZNK3WTF13DecimalNumber28bufferLengthForStringDecimalEv
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi
index 676a35d..deb36fb 100644
--- a/JavaScriptCore/JavaScriptCore.gypi
+++ b/JavaScriptCore/JavaScriptCore.gypi
@@ -400,8 +400,6 @@
             'wtf/NonCopyingSort.h',
             'wtf/Noncopyable.h',
             'wtf/NotFound.h',
-            'wtf/OSAllocatorWin.cpp',
-            'wtf/OSAllocator.h',
             'wtf/OwnArrayPtr.h',
             'wtf/OwnFastMallocPtr.h',
             'wtf/OwnPtr.h',
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
index b67d254..47371c5 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.sln
@@ -1,95 +1,95 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\WebKitTools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_All|Win32 = Debug_All|Win32
-		Debug|Win32 = Debug|Win32
-		Release_LTCG|Win32 = Release_LTCG|Win32
-		Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32
-		Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"

+	ProjectSection(ProjectDependencies) = postProject

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindSafari", "..\..\WebKitTools\FindSafari\FindSafari.vcproj", "{DA31DA52-6675-48D4-89E0-333A7144397C}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug_All|Win32 = Debug_All|Win32

+		Debug|Win32 = Debug|Win32

+		Release_LTCG|Win32 = Release_LTCG|Win32

+		Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32

+		Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32

+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
index 1bc488f..449c0bb 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
@@ -58,8 +58,6 @@ EXPORTS
     ?attach@Debugger@JSC@@QAEXPAVJSGlobalObject@2@@Z
     ?broadcast@ThreadCondition@WTF@@QAEXXZ
     ?bufferLengthForStringDecimal@DecimalNumber@WTF@@QBEIXZ
-    ?calculateDSTOffset@WTF@@YANNN@Z
-    ?calculateUTCOffset@WTF@@YAHXZ
     ?calculatedFunctionName@DebuggerCallFrame@JSC@@QBE?AVUString@2@XZ
     ?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z
     ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
@@ -263,9 +261,7 @@ EXPORTS
     ?recompileAllJSFunctions@Debugger@JSC@@QAEXPAVJSGlobalData@2@@Z
     ?recordExtraCost@Heap@JSC@@AAEXI@Z
     ?reifyString@StringBuilder@WTF@@AAEXXZ
-    ?release@OSAllocator@WTF@@SAXPAXI@Z
     ?releaseStack@MarkStack@JSC@@CAXPAXI@Z
-    ?reserveAndCommit@OSAllocator@WTF@@SAPAXI@Z
     ?reset@ParserArena@JSC@@QAEXXZ
     ?reset@TimeoutChecker@JSC@@QAEXXZ
     ?resetDateCache@JSGlobalData@JSC@@QAEXXZ
@@ -326,10 +322,10 @@ EXPORTS
     ?toPrimitive@JSCell@JSC@@UBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
     ?toPrimitive@JSString@JSC@@EBE?AVJSValue@2@PAVExecState@2@W4PreferredPrimitiveType@2@@Z
     ?toStrictThisObject@JSObject@JSC@@UBE?AVJSValue@2@PAVExecState@2@@Z
+    ?toStringDecimal@DecimalNumber@WTF@@QBEIPA_WI@Z
     ?toString@JSCell@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
     ?toString@JSObject@JSC@@UBE?AVUString@2@PAVExecState@2@@Z
     ?toString@JSString@JSC@@EBE?AVUString@2@PAVExecState@2@@Z
-    ?toStringDecimal@DecimalNumber@WTF@@QBEIPA_WI@Z
     ?toThisObject@JSCell@JSC@@UBEPAVJSObject@2@PAVExecState@2@@Z
     ?toThisObject@JSObject@JSC@@UBEPAV12@PAVExecState@2@@Z
     ?toThisObject@JSString@JSC@@EBEPAVJSObject@2@PAVExecState@2@@Z
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 202742d..7ecd766 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -1,1974 +1,1975 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCore"
-	ProjectGUID="{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
-	RootNamespace="JavaScriptCore"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_PGOInstrument|Win32"
-			IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_PGOOptimize|Win32"
-			IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="4"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_All|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_LTCG|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="runtime"
-			>
-			<File
-				RelativePath="..\..\runtime\ArgList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ArgList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Arguments.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Arguments.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ArrayConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ArrayConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ArrayPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ArrayPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BatchedTransitionOptimizer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\BooleanPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\CallData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\CallData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ClassInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Collector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Collector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\CollectorHeapIntrospector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\CommonIdentifiers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\CommonIdentifiers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Completion.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Completion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ConstructData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ConstructData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateConversion.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateConversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DateInstanceCache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\DateMath.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\DateMath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DatePrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\DatePrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Error.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorInstance.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorInstance.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ErrorPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ExceptionHelpers.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\ExceptionHelpers.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Executable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Executable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\FunctionConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\FunctionConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\FunctionPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\FunctionPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GCActivityCallback.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GCActivityCallback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GCHandle.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GCHandle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GetterSetter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GetterSetter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GlobalEvalFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\GlobalEvalFunction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Identifier.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Identifier.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\InitializeThreading.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\InitializeThreading.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\InternalFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\InternalFunction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSActivation.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSActivation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSArray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSByteArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSByteArray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSCell.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSCell.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSFunction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalData.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalData.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalObjectFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSGlobalObjectFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSImmediate.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSImmediate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSLock.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSLock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSNotAnObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSNotAnObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSNumberCell.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSNumberCell.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSObjectWithGlobalObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSObjectWithGlobalObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSONObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSONObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSPropertyNameIterator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSPropertyNameIterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSStaticScopeObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSStaticScopeObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSTypeInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSValue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSValue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSVariableObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSVariableObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSWrapperObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSWrapperObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSZombie.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSZombie.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\LiteralParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\LiteralParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Lookup.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Lookup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\MarkStack.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\MarkStack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\MarkStackWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\MathObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\MathObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NativeErrorConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NativeErrorConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NativeErrorPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NativeErrorPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NativeFunctionWrapper.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumberPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\NumericStrings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ObjectConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ObjectConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ObjectPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ObjectPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Operations.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Operations.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertyDescriptor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertyDescriptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertyMapHashTable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertyNameArray.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertyNameArray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertySlot.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PropertySlot.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Protect.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PrototypeFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\PrototypeFunction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExp.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpCache.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpCache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpKey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpMatchesArray.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RegExpPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RopeImpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\RopeImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ScopeChain.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ScopeChain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\ScopeChainMark.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\SmallStrings.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\SmallStrings.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StrictEvalActivation.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StrictEvalActivation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringObjectThatMasqueradesAsUndefined.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringPrototype.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StringPrototype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Structure.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Structure.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StructureChain.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StructureChain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\StructureTransitionTable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\SymbolTable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\Terminator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\TimeoutChecker.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\TimeoutChecker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\UString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\UString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\UStringBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\UStringConcatenate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\UStringImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\WeakGCMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\WeakGCPtr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\WeakRandom.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="pcre"
-			>
-			<File
-				RelativePath="..\..\pcre\pcre.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_compile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_exec.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_tables.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_ucp_searchfuncs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\pcre_xclass.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\pcre\ucpinternal.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="API"
-			>
-			<File
-				RelativePath="..\..\API\APICast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JavaScript.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JavaScriptCore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSAPIValueWrapper.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\runtime\JSAPIValueWrapper.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSBase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSBasePrivate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackConstructor.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackConstructor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackFunction.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackFunction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackObject.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackObject.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSCallbackObjectFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSClassRef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSClassRef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSContextRef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSContextRef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSContextRefPrivate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSObjectRef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSObjectRef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSRetainPtr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRefBSTR.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRefBSTR.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRefCF.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSStringRefCF.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSValueRef.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSValueRef.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSWeakObjectMapRefInternal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSWeakObjectMapRefPrivate.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\JSWeakObjectMapRefPrivate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\OpaqueJSString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\OpaqueJSString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\API\WebKitAvailability.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="profiler"
-			>
-			<File
-				RelativePath="..\..\profiler\CallIdentifier.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\Profile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\Profile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\ProfileGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\ProfileGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\ProfileNode.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\ProfileNode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\Profiler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\profiler\Profiler.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="bytecode"
-			>
-			<File
-				RelativePath="..\..\bytecode\CodeBlock.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\CodeBlock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\EvalCodeCache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\Instruction.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\JumpTable.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\JumpTable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\Opcode.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\Opcode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\SamplingTool.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\SamplingTool.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\StructureStubInfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecode\StructureStubInfo.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="debugger"
-			>
-			<File
-				RelativePath="..\..\debugger\Debugger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\debugger\Debugger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\debugger\DebuggerActivation.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\debugger\DebuggerActivation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\debugger\DebuggerCallFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\debugger\DebuggerCallFrame.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="assembler"
-			>
-			<File
-				RelativePath="..\..\assembler\AbstractMacroAssembler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\AssemblerBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\CodeLocation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\LinkBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\MacroAssembler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\MacroAssemblerX86.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\MacroAssemblerX86Common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\RepatchBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\assembler\X86Assembler.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="yarr"
-			>
-			<File
-				RelativePath="..\..\yarr\RegexCompiler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexCompiler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexInterpreter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexInterpreter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexJIT.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexJIT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\yarr\RegexPattern.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="jit"
-			>
-			<File
-				RelativePath="..\..\jit\ExecutableAllocator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\ExecutableAllocator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JIT.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JIT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITArithmetic.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITArithmetic32_64.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITCall.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITCall32_64.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITCode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITInlineMethods.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITOpcodes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITOpcodes32_64.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITPropertyAccess.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITPropertyAccess32_64.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITStubCall.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITStubs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JITStubs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\JSInterfaceJIT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\SpecializedThunkJIT.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\ThunkGenerators.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\jit\ThunkGenerators.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resources"
-			>
-			<File
-				RelativePath=".\JavaScriptCore.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="interpreter"
-			>
-			<File
-				RelativePath="..\..\interpreter\CachedCall.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\CallFrame.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\CallFrame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\CallFrameClosure.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\Interpreter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\Interpreter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\Register.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\RegisterFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\interpreter\RegisterFile.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="bytecompiler"
-			>
-			<File
-				RelativePath="..\..\bytecompiler\BytecodeGenerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecompiler\BytecodeGenerator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecompiler\Label.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecompiler\LabelScope.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecompiler\NodesCodegen.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\bytecompiler\RegisterID.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="parser"
-			>
-			<File
-				RelativePath="..\..\parser\ASTBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\JSParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\JSParser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Lexer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Lexer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\NodeConstructors.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\NodeInfo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Nodes.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Nodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Parser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\Parser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\ParserArena.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\ParserArena.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\ResultType.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\SourceCode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\SourceProvider.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\parser\SyntaxChecker.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Derived Sources"
-			>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DatePrototype.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\lexer.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\MathObject.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\NumberConstructor.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RegExpObject.lut.h"
-				>
-			</File>
-			<File
-				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\StringPrototype.lut.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\config.h"
-			>
-		</File>
-		<File
-			RelativePath=".\JavaScriptCore.def"
-			>
-		</File>
-		<File
-			RelativePath=".\JavaScriptCore_debug.def"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCore"

+	ProjectGUID="{011D10F1-B656-4A1B-A0C3-3842F02122C5}"

+	RootNamespace="JavaScriptCore"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_PGOInstrument|Win32"

+			IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_PGOOptimize|Win32"

+			IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="4"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_Cairo_CFLite|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_Cairo_CFLite|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCFLite.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_All|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_LTCG|Win32"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\JavaScriptCoreCommon.vsprops;.\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="runtime"

+			>

+			<File

+				RelativePath="..\..\runtime\ArgList.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ArgList.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Arguments.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Arguments.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ArrayConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ArrayConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ArrayPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ArrayPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BatchedTransitionOptimizer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\BooleanPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\CallData.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\CallData.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ClassInfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Collector.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Collector.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\CollectorHeapIntrospector.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\CommonIdentifiers.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\CommonIdentifiers.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Completion.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Completion.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ConstructData.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ConstructData.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateConversion.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateConversion.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateInstance.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateInstance.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DateInstanceCache.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\DateMath.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\DateMath.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DatePrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\DatePrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Error.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Error.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorInstance.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorInstance.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ErrorPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ExceptionHelpers.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\ExceptionHelpers.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Executable.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Executable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\FunctionConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\FunctionConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\FunctionPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\FunctionPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GCActivityCallback.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GCActivityCallback.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GCHandle.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GCHandle.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GetterSetter.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GetterSetter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GlobalEvalFunction.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\GlobalEvalFunction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Identifier.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Identifier.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\InitializeThreading.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\InitializeThreading.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\InternalFunction.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\InternalFunction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSActivation.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSActivation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSArray.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSArray.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSByteArray.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSByteArray.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSCell.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSCell.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSFunction.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSFunction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalData.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalData.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalObjectFunctions.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSGlobalObjectFunctions.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSImmediate.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSImmediate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSLock.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSLock.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSNotAnObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSNotAnObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSNumberCell.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSNumberCell.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSObjectWithGlobalObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSObjectWithGlobalObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSONObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSONObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSPropertyNameIterator.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSPropertyNameIterator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSStaticScopeObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSStaticScopeObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSString.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSType.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSTypeInfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSValue.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSValue.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSVariableObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSVariableObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSWrapperObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSWrapperObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSZombie.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSZombie.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\LiteralParser.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\LiteralParser.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Lookup.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Lookup.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\MarkStack.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\MarkStack.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\MarkStackWin.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\MathObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\MathObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NativeErrorConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NativeErrorConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NativeErrorPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NativeErrorPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NativeFunctionWrapper.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumberPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\NumericStrings.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ObjectConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ObjectConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ObjectPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ObjectPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Operations.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Operations.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertyDescriptor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertyDescriptor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertyMapHashTable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertyNameArray.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertyNameArray.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertySlot.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PropertySlot.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Protect.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PrototypeFunction.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\PrototypeFunction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExp.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExp.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpCache.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpCache.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpKey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpMatchesArray.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RegExpPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RopeImpl.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\RopeImpl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ScopeChain.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ScopeChain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\ScopeChainMark.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\SmallStrings.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\SmallStrings.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StrictEvalActivation.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StrictEvalActivation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringObjectThatMasqueradesAsUndefined.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringPrototype.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StringPrototype.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Structure.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Structure.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StructureChain.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StructureChain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\StructureTransitionTable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\SymbolTable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\Terminator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\TimeoutChecker.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\TimeoutChecker.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\UString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\UString.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\UStringBuilder.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\UStringConcatenate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\UStringImpl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\WeakGCMap.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\WeakGCPtr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\WeakRandom.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="pcre"

+			>

+			<File

+				RelativePath="..\..\pcre\pcre.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_compile.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_exec.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_internal.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_tables.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_ucp_searchfuncs.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\pcre_xclass.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\pcre\ucpinternal.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="API"

+			>

+			<File

+				RelativePath="..\..\API\APICast.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JavaScript.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JavaScriptCore.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSAPIValueWrapper.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\runtime\JSAPIValueWrapper.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSBase.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSBase.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSBasePrivate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackConstructor.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackConstructor.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackFunction.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackFunction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackObject.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackObject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSCallbackObjectFunctions.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSClassRef.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSClassRef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSContextRef.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSContextRef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSContextRefPrivate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSObjectRef.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSObjectRef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSRetainPtr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRef.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRefBSTR.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRefBSTR.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRefCF.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSStringRefCF.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSValueRef.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSValueRef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSWeakObjectMapRefInternal.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSWeakObjectMapRefPrivate.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\JSWeakObjectMapRefPrivate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\OpaqueJSString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\OpaqueJSString.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\API\WebKitAvailability.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="profiler"

+			>

+			<File

+				RelativePath="..\..\profiler\CallIdentifier.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\Profile.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\Profile.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\ProfileGenerator.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\ProfileGenerator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\ProfileNode.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\ProfileNode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\Profiler.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\profiler\Profiler.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="bytecode"

+			>

+			<File

+				RelativePath="..\..\bytecode\CodeBlock.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\CodeBlock.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\EvalCodeCache.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\Instruction.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\JumpTable.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\JumpTable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\Opcode.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\Opcode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\SamplingTool.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\SamplingTool.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\StructureStubInfo.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecode\StructureStubInfo.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="debugger"

+			>

+			<File

+				RelativePath="..\..\debugger\Debugger.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\debugger\Debugger.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\debugger\DebuggerActivation.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\debugger\DebuggerActivation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\debugger\DebuggerCallFrame.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\debugger\DebuggerCallFrame.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="assembler"

+			>

+			<File

+				RelativePath="..\..\assembler\AbstractMacroAssembler.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\AssemblerBuffer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\CodeLocation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\LinkBuffer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\MacroAssembler.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\MacroAssemblerX86.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\MacroAssemblerX86Common.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\RepatchBuffer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\assembler\X86Assembler.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="yarr"

+			>

+			<File

+				RelativePath="..\..\yarr\RegexCompiler.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexCompiler.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexInterpreter.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexInterpreter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexJIT.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexJIT.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexParser.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\yarr\RegexPattern.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="jit"

+			>

+			<File

+				RelativePath="..\..\jit\ExecutableAllocator.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\ExecutableAllocator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JIT.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JIT.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITArithmetic.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITArithmetic32_64.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITCall.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITCall32_64.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITCode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITInlineMethods.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITOpcodes.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITOpcodes32_64.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITPropertyAccess.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITPropertyAccess32_64.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITStubCall.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITStubs.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JITStubs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\JSInterfaceJIT.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\SpecializedThunkJIT.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\ThunkGenerators.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\jit\ThunkGenerators.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Resources"

+			>

+			<File

+				RelativePath=".\JavaScriptCore.rc"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="interpreter"

+			>

+			<File

+				RelativePath="..\..\interpreter\CachedCall.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\CallFrame.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\CallFrame.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\CallFrameClosure.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\Interpreter.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\Interpreter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\Register.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\RegisterFile.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\interpreter\RegisterFile.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="bytecompiler"

+			>

+			<File

+				RelativePath="..\..\bytecompiler\BytecodeGenerator.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecompiler\BytecodeGenerator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecompiler\Label.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecompiler\LabelScope.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecompiler\NodesCodegen.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\bytecompiler\RegisterID.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="parser"

+			>

+			<File

+				RelativePath="..\..\parser\ASTBuilder.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\JSParser.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\JSParser.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Lexer.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Lexer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\NodeConstructors.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\NodeInfo.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Nodes.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Nodes.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Parser.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\Parser.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\ParserArena.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\ParserArena.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\ResultType.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\SourceCode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\SourceProvider.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\parser\SyntaxChecker.h"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Derived Sources"

+			>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\DatePrototype.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\lexer.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\MathObject.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\NumberConstructor.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RegExpConstructor.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\RegExpObject.lut.h"

+				>

+			</File>

+			<File

+				RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\StringPrototype.lut.h"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="..\..\config.h"

+			>

+		</File>

+		<File

+			RelativePath=".\JavaScriptCore.def"

+			>

+		</File>

+		<File

+			RelativePath=".\JavaScriptCore_debug.def"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops
index 61e10b4..fe884aa 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCF.vsprops
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCoreCF"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCoreCF"

+	>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
index 1e7aed7..8c9e31f 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCFLite.vsprops
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCoreCFLite"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="CFLite$(WebKitConfigSuffix).lib"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCoreCFLite"

+	>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="CFLite$(WebKitConfigSuffix).lib"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
index f0b759f..6929c8a 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreCommon.vsprops
@@ -1,20 +1,32 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCoreCommon"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../jit/;../../runtime/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
-		PreprocessorDefinitions="__STD_C"
-		ForcedIncludeFiles="ICUVersion.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"
-		OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"
-		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
-		ModuleDefinitionFile="JavaScriptCore.def"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCoreCommon"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\DerivedSources\&quot;;../../;../../API/;../../pcre/;../../parser/;../../bytecompiler/;../../jit/;../../runtime/;../../bytecode/;../../interpreter/;../../wtf/;../../profiler;../../assembler/;../../debugger/;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"

+		PreprocessorDefinitions="__STD_C"

+		ForcedIncludeFiles="ICUVersion.h"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="gdi32.lib oleaut32.lib winmm.lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib WTF$(WebKitConfigSuffix).lib"

+		OutputFile="$(OutDir)\$(ProjectName)$(WebKitDLLConfigSuffix).dll"

+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"

+		ModuleDefinitionFile="JavaScriptCore.def"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreBuildEventTool"

+		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;bash &quot;$(WebKitLibrariesDir)\tools\scripts\auto-version.sh&quot; &quot;$(IntDir)&quot;&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreLinkEventTool"

+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
index 6dad054..b7a7320 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCoreGenerated"
-	ProjectGUID="{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"
-	RootNamespace="JavaScriptCoreGenerated"
-	Keyword="MakeFileProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_All|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_LTCG|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\build-generated-files.sh"
-			>
-		</File>
-		<File
-			RelativePath=".\JavaScriptCoreGenerated.make"
-			>
-		</File>
-		<File
-			RelativePath=".\react-to-vsprops-changes.py"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCoreGenerated"

+	ProjectGUID="{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"

+	RootNamespace="JavaScriptCoreGenerated"

+	Keyword="MakeFileProj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_All|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_LTCG|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_Cairo_CFLite|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_Cairo_CFLite|Win32"

+			ConfigurationType="0"

+			InheritedPropertySheets=".\JavaScriptCoreGeneratedCommon.vsprops"

+			>

+			<Tool

+				Name="VCNMakeTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath=".\build-generated-files.sh"

+			>

+		</File>

+		<File

+			RelativePath=".\JavaScriptCoreGenerated.make"

+			>

+		</File>

+		<File

+			RelativePath=".\react-to-vsprops-changes.py"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops
index 786be86..44ae1d9 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGeneratedCommon.vsprops
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="JavaScriptCoreGeneratedCommon"
-	OutputDirectory="$(WebKitOutputDir)\lib"
-	IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"
-	>
-	<Tool
-		Name="VCNMakeTool"
-		BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"
-		ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"
-		CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="JavaScriptCoreGeneratedCommon"

+	OutputDirectory="$(WebKitOutputDir)\lib"

+	IntermediateDirectory="$(WebKitOutputDir)\obj\$(ProjectName)\$(ConfigurationName)"

+	>

+	<Tool

+		Name="VCNMakeTool"

+		BuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make"

+		ReBuildCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean&#x0D;&#x0A;nmake -f JavaScriptCoreGenerated.make"

+		CleanCommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;&#x0D;&#x0A;nmake /nologo -f JavaScriptCoreGenerated.make clean"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd
deleted file mode 100644
index f011495..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePostBuild.cmd
+++ /dev/null
@@ -1 +0,0 @@
-if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd
deleted file mode 100644
index cdacbf1..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreBuild.cmd
+++ /dev/null
@@ -1,8 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed"
-
-bash "%WEBKITLIBRARIESDIR%\tools\scripts\auto-version.sh" "%INTDIR%"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd
deleted file mode 100644
index 3ff5069..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCorePreLink.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-mkdir 2>NUL "%IntDir%\lib"
-
-if exist "%WebKitLibrariesDir%\lib\icuuc%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\icuuc%LibraryConfigSuffix%.lib" "%IntDir%\lib\libicuuc%LibraryConfigSuffix%.lib"
-if exist "%WebKitLibrariesDir%\lib\icuin%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\icuin%LibraryConfigSuffix%.lib" "%IntDir%\lib\libicuin%LibraryConfigSuffix%.lib"
-
-if exist "%WebKitLibrariesDir%\lib\libicuuc%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\libicuuc%LibraryConfigSuffix%.lib" "%IntDir%\lib"
-if exist "%WebKitLibrariesDir%\lib\libicuin%LibraryConfigSuffix%.lib" copy /y "%WebKitLibrariesDir%\lib\libicuin%LibraryConfigSuffix%.lib" "%IntDir%\lib"
-
-cmd /c
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
index 0d5d6fb..a2a0543 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/react-to-vsprops-changes.py
@@ -6,32 +6,22 @@ import re
 import sys
 
 
-def main():
-    # It's a little unfortunate that we're relying on the location of this
-    # script to find the top-level source directory.
-    top_level_directory = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+def file_modification_times(directory):
+    for dirpath, dirnames, filenames in os.walk(directory):
+        for filename in filenames:
+            yield os.path.getmtime(os.path.join(dirpath, filename))
+
 
-    vsprops_directory = os.path.join(top_level_directory, 'WebKitLibraries', 'win', 'tools', 'vsprops')
-    vsprops_files = glob.glob(os.path.join(vsprops_directory, '*.vsprops'))
-    assert len(vsprops_files), "Couldn't find any .vsprops files in %s" % vsprops_directory
-    newest_vsprops_time = max(map(os.path.getmtime, vsprops_files))
+def main():
+    vsprops_directory = os.path.join(os.environ['WEBKITLIBRARIESDIR'], 'tools', 'vsprops')
+    newest_vsprops_time = max(file_modification_times(vsprops_directory))
 
-    # Delete any manifest-related files because Visual Studio isn't smart
-    # enough to figure out that it might need to rebuild them.
     obj_directory = os.path.join(os.environ['WEBKITOUTPUTDIR'], 'obj')
     for manifest_file in glob.iglob(os.path.join(obj_directory, '*', '*', '*.manifest*')):
         manifest_time = os.path.getmtime(manifest_file)
         if manifest_time < newest_vsprops_time:
-            print 'Deleting %s' % manifest_file
             os.remove(manifest_file)
 
-    # Touch wtf/Platform.h so all files will be recompiled. This is necessary
-    # to pick up changes to preprocessor macros (e.g., ENABLE_*).
-    wtf_platform_h = os.path.join(top_level_directory, 'JavaScriptCore', 'wtf', 'Platform.h')
-    if os.path.getmtime(wtf_platform_h) < newest_vsprops_time:
-        print 'Touching wtf/Platform.h'
-        os.utime(wtf_platform_h, None)
-
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln
index f55e7d6..e85ff9d 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCoreSubmit.sln
@@ -1,83 +1,83 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_All|Win32 = Debug_All|Win32
-		Debug|Win32 = Debug|Win32
-		Release_LTCG|Win32 = Release_LTCG|Win32
-		Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32
-		Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore\JavaScriptCore.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"

+	ProjectSection(ProjectDependencies) = postProject

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCore\JavaScriptCoreGenerated.vcproj", "{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcproj", "{C59E5129-B453-49B7-A52B-1E104715F76E}"

+	ProjectSection(ProjectDependencies) = postProject

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5} = {011D10F1-B656-4A1B-A0C3-3842F02122C5}

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug_All|Win32 = Debug_All|Win32

+		Debug|Win32 = Debug|Win32

+		Release_LTCG|Win32 = Release_LTCG|Win32

+		Release_PGOInstrument|Win32 = Release_PGOInstrument|Win32

+		Release_PGOOptimize|Win32 = Release_PGOOptimize|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.ActiveCfg = Debug|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.ActiveCfg = Release_PGOInstrument|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOInstrument|Win32.Build.0 = Release_PGOInstrument|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.ActiveCfg = Release_PGOOptimize|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_PGOOptimize|Win32.Build.0 = Release_PGOOptimize|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32

+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.ActiveCfg = Debug|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32

+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32

+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.Build.0 = Debug_All|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOInstrument|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_PGOOptimize|Win32.Build.0 = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32

+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 4a3e859..3609939 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -1,894 +1,891 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="WTF"
-	ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"
-	RootNamespace="WTF"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_All|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_LTCG|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFCommon.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WTFCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WTFCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="win"
-			>
-			<File
-				RelativePath="..\..\wtf\win\MainThreadWin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\win\OwnPtrWin.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="unicode"
-			>
-			<File
-				RelativePath="..\..\wtf\unicode\Collator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\unicode\Unicode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\unicode\UnicodeMacrosFromICU.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\unicode\UTF8.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\unicode\UTF8.h"
-				>
-			</File>
-			<Filter
-				Name="icu"
-				>
-				<File
-					RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="text"
-			>
-			<File
-				RelativePath="..\..\wtf\text\AtomicString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\AtomicString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\AtomicStringHash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\AtomicStringImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\CString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\CString.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringBuilder.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringBuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringConcatenate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringHash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringImpl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringImpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringImplBase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\StringStatics.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\WTFString.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wtf\text\WTFString.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath="..\..\wtf\AlwaysInline.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ASCIICType.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Assertions.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Assertions.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Atomics.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\AVLTree.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Bitmap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\BumpPointerAllocator.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ByteArray.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ByteArray.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Complex.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\CrossThreadRefCounted.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\CurrentTime.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\CurrentTime.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\DecimalNumber.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\DecimalNumber.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Deque.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\DisallowCType.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\dtoa.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\dtoa.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\FastAllocBase.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\FastMalloc.cpp"
-			>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					DisableSpecificWarnings="4702"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release_LTCG|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					DisableSpecificWarnings="4702"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release_Cairo_CFLite|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					DisableSpecificWarnings="4702"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\wtf\FastMalloc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\FixedArray.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Forward.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\GetPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashCountedSet.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashFunctions.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashIterators.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashMap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashSet.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashTable.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashTable.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\HashTraits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ListHashSet.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ListRefPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Locker.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MainThread.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MainThread.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MallocZoneSupport.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MathExtras.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MD5.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MD5.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\MessageQueue.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Noncopyable.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\NonCopyingSort.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\NotFound.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\NullPtr.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\NullPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OSAllocatorWin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OwnArrayPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OwnArrayPtrCommon.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OwnFastMallocPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OwnPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\OwnPtrCommon.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PageAllocation.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PageAllocation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PageReservation.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PassOwnArrayPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PassOwnPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PassRefPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Platform.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PlatformRefPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\PossiblyNull.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RandomNumber.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RandomNumber.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RandomNumberSeed.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RefCounted.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RefCountedLeakCounter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RefCountedLeakCounter.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RefPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RefPtrHashMap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\RetainPtr.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\SegmentedVector.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\SizeLimits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\StaticConstructors.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\StdLibExtras.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\StringExtras.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\StringExtras.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\StringHasher.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TCPackedCache.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TCPageMap.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TCSpinLock.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TCSystemAlloc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TCSystemAlloc.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Threading.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Threading.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadingNone.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadingPrimitives.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadingWin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadSafeShared.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadSpecific.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ThreadSpecificWin.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TypeTraits.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\TypeTraits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\UnusedParam.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\ValueCheck.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Vector.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\Vector3.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\VectorTraits.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\VMTags.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\WTFThreadData.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\WTFThreadData.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="windows-1251"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="WTF"

+	ProjectGUID="{AA8A5A85-592B-4357-BC60-E0E91E026AF6}"

+	RootNamespace="WTF"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_All|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WTFCommon.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_LTCG|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WTFCommon.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_Cairo_CFLite|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WTFCommon.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_Cairo_CFLite|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WTFCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="win"

+			>

+			<File

+				RelativePath="..\..\wtf\win\MainThreadWin.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\win\OwnPtrWin.cpp"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="unicode"

+			>

+			<File

+				RelativePath="..\..\wtf\unicode\Collator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\unicode\Unicode.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\unicode\UnicodeMacrosFromICU.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\unicode\UTF8.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\unicode\UTF8.h"

+				>

+			</File>

+			<Filter

+				Name="icu"

+				>

+				<File

+					RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp"

+					>

+				</File>

+				<File

+					RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h"

+					>

+				</File>

+			</Filter>

+		</Filter>

+		<Filter

+			Name="text"

+			>

+			<File

+				RelativePath="..\..\wtf\text\AtomicString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\AtomicString.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\AtomicStringHash.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\AtomicStringImpl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\CString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\CString.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringBuffer.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringBuilder.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringBuilder.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringConcatenate.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringHash.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringImpl.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringImpl.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringImplBase.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\StringStatics.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\WTFString.cpp"

+				>

+			</File>

+			<File

+				RelativePath="..\..\wtf\text\WTFString.h"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath="..\..\wtf\AlwaysInline.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ASCIICType.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Assertions.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Assertions.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Atomics.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\AVLTree.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Bitmap.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\BumpPointerAllocator.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ByteArray.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ByteArray.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Complex.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\CrossThreadRefCounted.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\CurrentTime.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\CurrentTime.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\DecimalNumber.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\DecimalNumber.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Deque.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\DisallowCType.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\dtoa.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\dtoa.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\FastAllocBase.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\FastMalloc.cpp"

+			>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					DisableSpecificWarnings="4702"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release_LTCG|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					DisableSpecificWarnings="4702"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release_Cairo_CFLite|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					DisableSpecificWarnings="4702"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\..\wtf\FastMalloc.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\FixedArray.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Forward.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\GetPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashCountedSet.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashFunctions.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashIterators.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashMap.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashSet.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashTable.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashTable.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\HashTraits.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ListHashSet.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ListRefPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Locker.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MainThread.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MainThread.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MallocZoneSupport.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MathExtras.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MD5.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MD5.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\MessageQueue.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Noncopyable.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\NonCopyingSort.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\NotFound.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\NullPtr.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\NullPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\OwnArrayPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\OwnArrayPtrCommon.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\OwnFastMallocPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\OwnPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\OwnPtrCommon.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PageAllocation.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PageAllocation.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PageReservation.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PassOwnArrayPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PassOwnPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PassRefPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Platform.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PlatformRefPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\PossiblyNull.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RandomNumber.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RandomNumber.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RandomNumberSeed.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RefCounted.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RefCountedLeakCounter.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RefCountedLeakCounter.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RefPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RefPtrHashMap.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\RetainPtr.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\SegmentedVector.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\SizeLimits.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\StaticConstructors.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\StdLibExtras.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\StringExtras.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\StringExtras.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\StringHasher.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TCPackedCache.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TCPageMap.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TCSpinLock.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TCSystemAlloc.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TCSystemAlloc.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Threading.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Threading.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadingNone.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadingPrimitives.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadingWin.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadSafeShared.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadSpecific.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ThreadSpecificWin.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TypeTraits.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\TypeTraits.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\UnusedParam.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\ValueCheck.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Vector.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\Vector3.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\VectorTraits.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\VMTags.h"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\WTFThreadData.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\wtf\WTFThreadData.h"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
index 07f679f..d81a604 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFCommon.vsprops
@@ -1,20 +1,28 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="WTFCommon"
-	OutputDirectory="$(WebKitOutputDir)\lib"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"
-		PreprocessorDefinitions="__STD_C"
-		ForcedIncludeFiles="ICUVersion.h"
-		ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb"
-	/>
-	<Tool
-		Name="VCLibrarianTool"
-		AdditionalDependencies="user32.lib"
-		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="WTFCommon"

+	OutputDirectory="$(WebKitOutputDir)\lib"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../parser/;../../wtf/;../../wtf/unicode/;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;../../../icu/include;../../bindings;../../bindings/c;../../bindings/jni;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;"

+		PreprocessorDefinitions="__STD_C"

+		ForcedIncludeFiles="ICUVersion.h"

+		ProgramDataBaseFileName="$(OutDir)\$(TargetName).vc80.pdb"

+	/>

+	<Tool

+		Name="VCLibrarianTool"

+		AdditionalDependencies="user32.lib"

+		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).lib"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;"

+	/>

+	<Tool

+		Name="VCPreBuildEventTool"

+		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd
deleted file mode 100644
index f011495..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPostBuild.cmd
+++ /dev/null
@@ -1 +0,0 @@
-if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd
deleted file mode 100644
index 3a84c26..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTFPreBuild.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
index a6b59d3..ef5e114 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jsc.vcproj
@@ -1,412 +1,413 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="jsc"
-	ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"
-	RootNamespace="jsc"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\jscCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\jscCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\jscCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_All|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\jscCommon.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_LTCG|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\jscCommon.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\jscCommon.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\AtomicString.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\jsc.cpp"
-			>
-		</File>
-		<File
-			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\StringBuilder.cpp"
-			>
-		</File>
-		<File
-			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\StringImpl.cpp"
-			>
-		</File>
-		<File
-			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\WTFString.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="jsc"

+	ProjectGUID="{C59E5129-B453-49B7-A52B-1E104715F76E}"

+	RootNamespace="jsc"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\jscCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\jscCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_Cairo_CFLite|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\jscCommon.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_All|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\jscCommon.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_LTCG|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\jscCommon.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_Cairo_CFLite|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\jscCommon.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\AtomicString.cpp"

+			>

+		</File>

+		<File

+			RelativePath="..\..\jsc.cpp"

+			>

+		</File>

+		<File

+			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\StringBuilder.cpp"

+			>

+		</File>

+		<File

+			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\StringImpl.cpp"

+			>

+		</File>

+		<File

+			RelativePath="$(WebKitOutputDir)\include\private\JavaScriptCore\WTFString.cpp"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
index fed83cd..b63729c 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscCommon.vsprops
@@ -1,20 +1,32 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="jscCommon"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../assembler/;../../API/;../../parser/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;../../jit/;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include&quot;"
-		PreprocessorDefinitions="__STD_C"
-		ForcedIncludeFiles="ICUVersion.h"
-		ForcedUsingFiles=""
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib"
-		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
-		SubSystem="1"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="jscCommon"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitOutputDir)\obj\JavaScriptCore\$(ConfigurationName)\DerivedSources\&quot;;../../;&quot;../../os-win32/&quot;;../../pcre/;../../assembler/;../../API/;../../parser/;../../runtime/;../../VM/;../../bytecode/;../../interpreter/;../../wtf/;../../debugger/;../../bytecompiler/;../../profiler;../../jit/;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include&quot;"

+		PreprocessorDefinitions="__STD_C"

+		ForcedIncludeFiles="ICUVersion.h"

+		ForcedUsingFiles=""

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib winmm.lib pthreadVC2$(LibraryConfigSuffix).lib user32.lib"

+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"

+		SubSystem="1"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt44.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt44.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt44$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt44$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\libicuin$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libicuin$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\libicuuc$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libicuuc$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt40.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt40.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt40$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt40$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuin40$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin40$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc40$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc40$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt42.dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt42.dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icudt42$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icudt42$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuin42$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuin42$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\icuuc42$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\icuuc42$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\CoreFoundation$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\CoreFoundation.resources&quot; xcopy /y /d /e /i &quot;$(WebKitLibrariesDir)\bin\CoreFoundation.resources&quot; &quot;$(WebKitOutputDir)\bin\CoreFoundation.resources&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\pthreadVC2$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\objc$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\objc$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\ASL$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\ASL$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\bin\libdispatch$(LibraryConfigSuffix).dll&quot; xcopy /y /d &quot;$(WebKitLibrariesDir)\bin\libdispatch$(LibraryConfigSuffix).dll&quot; &quot;$(WebKitOutputDir)\bin&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreBuildEventTool"

+		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreLinkEventTool"

+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd
deleted file mode 100644
index c81e940..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPostBuild.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed"
-
-mkdir 2>NUL "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt44.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt44.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt44%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt44%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\libicuin%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libicuin%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\libicuuc%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libicuuc%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc40%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icudt42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuin42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\icuuc42%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\CoreFoundation%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\CoreFoundation.resources" xcopy /y /d /e /i "%WEBKITLIBRARIESDIR%\bin\CoreFoundation.resources" "%WEBKITOUTPUTDIR%\bin\CoreFoundation.resources"
-if exist "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\pthreadVC2%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\objc%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\objc%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\ASL%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\ASL%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-if exist "%WEBKITLIBRARIESDIR%\bin\libdispatch%LIBRARYCONFIGSUFFIX%.dll" xcopy /y /d "%WEBKITLIBRARIESDIR%\bin\libdispatch%LIBRARYCONFIGSUFFIX%.dll" "%WEBKITOUTPUTDIR%\bin"
-
-cmd /c
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd
deleted file mode 100644
index 3a84c26..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreBuild.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd
deleted file mode 100644
index 8523026..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/jsc/jscPreLink.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-mkdir 2>NUL "%INTDIR%\lib"
-
-if exist "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib"
-
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib"
-
-cmd /c
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj
index e0011e3..17f8312 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapi.vcproj
@@ -1,448 +1,449 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="testapi"
-	ProjectGUID="{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}"
-	RootNamespace="testapi"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Cairo_CFLite|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCFLite.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Cairo_CFLite|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCFLite.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_All|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_LTCG|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\API\tests\testapi.c"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_Cairo_CFLite|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release_Cairo_CFLite|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug_All|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release_LTCG|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					CompileAs="2"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\API\tests\testapi.js"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="testapi"

+	ProjectGUID="{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}"

+	RootNamespace="testapi"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_Cairo_CFLite|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCFLite.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_Cairo_CFLite|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCFLite.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug_All|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops"

+			CharacterSet="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release_LTCG|Win32"

+			ConfigurationType="1"

+			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\testapiCommon.vsprops;..\JavaScriptCore\JavaScriptCoreCF.vsprops"

+			CharacterSet="1"

+			WholeProgramOptimization="1"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<File

+			RelativePath="..\..\API\tests\testapi.c"

+			>

+			<FileConfiguration

+				Name="Debug|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug_Cairo_CFLite|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release_Cairo_CFLite|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Debug_All|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+			<FileConfiguration

+				Name="Release_LTCG|Win32"

+				>

+				<Tool

+					Name="VCCLCompilerTool"

+					CompileAs="2"

+				/>

+			</FileConfiguration>

+		</File>

+		<File

+			RelativePath="..\..\API\tests\testapi.js"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops
index d0fea83..a1a7267 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops
+++ b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiCommon.vsprops
@@ -1,20 +1,32 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="testapiCommon"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\API&quot;;&quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;"
-		WarningLevel="4"
-		Detect64BitPortabilityProblems="true"
-		ForcedIncludeFiles="ICUVersion.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib"
-		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"
-		SubSystem="1"
-	/>
-</VisualStudioPropertySheet>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioPropertySheet

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="testapiCommon"

+	>

+	<Tool

+		Name="VCCLCompilerTool"

+		AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\..\API&quot;;&quot;$(WebKitOutputDir)\include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;"

+		WarningLevel="4"

+		Detect64BitPortabilityProblems="true"

+		ForcedIncludeFiles="ICUVersion.h"

+	/>

+	<Tool

+		Name="VCLinkerTool"

+		AdditionalDependencies="JavaScriptCore$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib libicuin$(LibraryConfigSuffix).lib libicuuc$(LibraryConfigSuffix).lib"

+		AdditionalLibraryDirectories="&quot;$(IntDir)\lib&quot;"

+		SubSystem="1"

+	/>

+	<Tool

+		Name="VCPostBuildEventTool"

+		CommandLine="if exist &quot;$(WebKitOutputDir)\buildfailed&quot; del &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;&#x0D;&#x0A;xcopy /y /d &quot;$(ProjectDir)\..\..\API\tests\testapi.js&quot; &quot;$(OutDir)&quot;&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreBuildEventTool"

+		CommandLine="%SystemDrive%\cygwin\bin\which.exe bash&#x0D;&#x0A;if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%&#x0D;&#x0A;cmd /c&#x0D;&#x0A;if exist &quot;$(WebKitOutputDir)\buildfailed&quot; grep XX$(ProjectName)XX &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;if errorlevel 1 exit 1&#x0D;&#x0A;echo XX$(ProjectName)XX &gt; &quot;$(WebKitOutputDir)\buildfailed&quot;&#x0D;&#x0A;"

+	/>

+	<Tool

+		Name="VCPreLinkEventTool"

+		CommandLine="mkdir 2&gt;NUL &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\icuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuuc$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;if exist &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; copy /y &quot;$(WebKitLibrariesDir)\lib\libicuin$(LibraryConfigSuffix).lib&quot; &quot;$(IntDir)\lib&quot;&#x0D;&#x0A;&#x0D;&#x0A;cmd /c&#x0D;&#x0A;"

+	/>

+</VisualStudioPropertySheet>

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd
deleted file mode 100644
index af5c949..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPostBuild.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-if exist "%WEBKITOUTPUTDIR%\buildfailed" del "%WEBKITOUTPUTDIR%\buildfailed"
-
-xcopy /y /d "%PROJECTDIR%\..\..\API\tests\testapi.js" "%OUTDIR%"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd
deleted file mode 100644
index 3a84c26..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreBuild.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-%SystemDrive%\cygwin\bin\which.exe bash
-if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
-cmd /c
-if exist "%WEBKITOUTPUTDIR%\buildfailed" grep XX%PROJECTNAME%XX "%WEBKITOUTPUTDIR%\buildfailed"
-if errorlevel 1 exit 1
-echo XX%PROJECTNAME%XX > "%WEBKITOUTPUTDIR%\buildfailed"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd b/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd
deleted file mode 100644
index 8523026..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/testapi/testapiPreLink.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-mkdir 2>NUL "%INTDIR%\lib"
-
-if exist "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\icuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib"
-
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuuc%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib"
-if exist "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" copy /y "%WEBKITLIBRARIESDIR%\lib\libicuin%LIBRARYCONFIGSUFFIX%.lib" "%INTDIR%\lib"
-
-cmd /c
diff --git a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index e7de0e1..a1e1c5c 100644
--- a/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -48,8 +48,6 @@
 		0BDFFAE10FC6193100D69EF4 /* OwnFastMallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0BF28A2911A33DC300638F84 /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */; };
 		0F29479C126E698C00B3ABF5 /* DecimalNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */; };
-		1400067712A6F7830064D123 /* OSAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 1400067612A6F7830064D123 /* OSAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		1400069312A6F9E10064D123 /* OSAllocatorPosix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */; };
 		14035DB110DBFB2A00FFFFE7 /* WeakGCPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 14035DB010DBFB2A00FFFFE7 /* WeakGCPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		140566C4107EC255005DBC8D /* JSAPIValueWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC0894D50FAFBA2D00001865 /* JSAPIValueWrapper.cpp */; };
 		140566D1107EC267005DBC8D /* JSStaticScopeObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A7E42C190E3938830065A544 /* JSStaticScopeObject.cpp */; };
@@ -651,8 +649,6 @@
 		0BDFFAD40FC6171000D69EF4 /* CrossThreadRefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadRefCounted.h; sourceTree = "<group>"; };
 		0BF28A2811A33DC300638F84 /* SizeLimits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SizeLimits.cpp; sourceTree = "<group>"; };
 		0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DecimalNumber.cpp; sourceTree = "<group>"; };
-		1400067612A6F7830064D123 /* OSAllocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSAllocator.h; sourceTree = "<group>"; };
-		1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OSAllocatorPosix.cpp; sourceTree = "<group>"; };
 		14035DB010DBFB2A00FFFFE7 /* WeakGCPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakGCPtr.h; sourceTree = "<group>"; };
 		140D17D60E8AD4A9000CD17D /* JSBasePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBasePrivate.h; sourceTree = "<group>"; };
 		141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = minidom.c; path = tests/minidom.c; sourceTree = "<group>"; };
@@ -1476,6 +1472,10 @@
 		65162EF108E6A21C007556CD /* wtf */ = {
 			isa = PBXGroup;
 			children = (
+				9714AF2F122F27C60092D9F5 /* url */,
+				06D358A00DAAD9C4003B174E /* mac */,
+				8656573E115BE35200291F40 /* text */,
+				E195678D09E7CF1200B89D13 /* unicode */,
 				93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
 				938C4F690CA06BC700D9310A /* ASCIICType.h */,
 				65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
@@ -1491,8 +1491,8 @@
 				180B9AF00F16C569009BDBC5 /* CurrentTime.h */,
 				41359CF40FDD89CB00206180 /* DateMath.cpp */,
 				41359CF50FDD89CB00206180 /* DateMath.h */,
-				0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */,
 				862AF4B512239C7B0024E5B8 /* DecimalNumber.h */,
+				0F29479B126E698C00B3ABF5 /* DecimalNumber.cpp */,
 				5186111D0CC824830081412B /* Deque.h */,
 				938C4F6B0CA06BCE00D9310A /* DisallowCType.h */,
 				651F6412039D5B5F0078395C /* dtoa.cpp */,
@@ -1514,7 +1514,6 @@
 				657EB7450B708F540063461B /* ListHashSet.h */,
 				148A1626095D16BB00666D0D /* ListRefPtr.h */,
 				E1EE79270D6C964500FEA3BA /* Locker.h */,
-				06D358A00DAAD9C4003B174E /* mac */,
 				06D358A20DAAD9C4003B174E /* MainThread.cpp */,
 				06D358A30DAAD9C4003B174E /* MainThread.h */,
 				5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */,
@@ -1522,12 +1521,10 @@
 				511FC4C7117EE23D00425272 /* MD5.cpp */,
 				511FC4CA117EE2A800425272 /* MD5.h */,
 				E1EE798B0D6CA53D00FEA3BA /* MessageQueue.h */,
-				9303F5690991190000AD71B8 /* Noncopyable.h */,
 				65E1A2F4122B880D00B26097 /* NonCopyingSort.h */,
+				9303F5690991190000AD71B8 /* Noncopyable.h */,
 				C0A2723F0E509F1E00E96E15 /* NotFound.h */,
 				933F5CDB126922690049191E /* NullPtr.h */,
-				1400069212A6F9E10064D123 /* OSAllocatorPosix.cpp */,
-				1400067612A6F7830064D123 /* OSAllocator.h */,
 				9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */,
 				BCFBE697122561D200309E9D /* OwnArrayPtrCommon.h */,
 				0BDFFAD10FC616EC00D69EF4 /* OwnFastMallocPtr.h */,
@@ -1561,7 +1558,6 @@
 				6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,
 				6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
 				6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */,
-				8656573E115BE35200291F40 /* text */,
 				18BAB52710DADFCD000D945B /* ThreadIdentifierDataPthreads.cpp */,
 				18BAB52810DADFCD000D945B /* ThreadIdentifierDataPthreads.h */,
 				5D6A566A0F05995500266145 /* Threading.cpp */,
@@ -1572,9 +1568,7 @@
 				E1B7C8BD0DA3A3360074B0DC /* ThreadSpecific.h */,
 				0B330C260F38C62300692DE3 /* TypeTraits.cpp */,
 				0B4D7E620F319AC800AD7E58 /* TypeTraits.h */,
-				E195678D09E7CF1200B89D13 /* unicode */,
 				935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */,
-				9714AF2F122F27C60092D9F5 /* url */,
 				E17FF770112131D200076A19 /* ValueCheck.h */,
 				6592C316098B7DE10003D4F6 /* Vector.h */,
 				6592C317098B7DE10003D4F6 /* VectorTraits.h */,
@@ -2359,7 +2353,6 @@
 				A730B6121250068F009D25B1 /* StrictEvalActivation.h in Headers */,
 				933F5CDC1269229B0049191E /* NullPtr.h in Headers */,
 				F3BD31ED126735770065467F /* TextPosition.h in Headers */,
-				1400067712A6F7830064D123 /* OSAllocator.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2453,7 +2446,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
 			compatibilityVersion = "Xcode 2.4";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -2818,7 +2810,6 @@
 				A730B6131250068F009D25B1 /* StrictEvalActivation.cpp in Sources */,
 				86438FC41265503E00E0DFCA /* StringBuilder.cpp in Sources */,
 				0F29479C126E698C00B3ABF5 /* DecimalNumber.cpp in Sources */,
-				1400069312A6F9E10064D123 /* OSAllocatorPosix.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/JavaScriptCore/create_regex_tables b/JavaScriptCore/create_regex_tables
index d1cc1c2..b436eee 100644
--- a/JavaScriptCore/create_regex_tables
+++ b/JavaScriptCore/create_regex_tables
@@ -25,8 +25,8 @@ types = {
     "wordchar": { "UseTable" : True, "data": ['_', ('0','9'), ('A', 'Z'), ('a','z')]},
     "nonwordchar": { "UseTable" : True, "Inverse": "wordchar", "data": ['`', (0, ord('0') - 1), (ord('9') + 1, ord('A') - 1), (ord('Z') + 1, ord('_') - 1), (ord('z') + 1, 0xffff)]},
     "newline": { "UseTable" : False, "data": ['\n', '\r', 0x2028, 0x2029]},
-    "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a), 0xfeff]},
-    "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xfefe), (0xff00, 0xffff)]},
+    "spaces": { "UseTable" : True, "data": [' ', ('\t', '\r'), 0xa0, 0x1680, 0x180e, 0x2028, 0x2029, 0x202f, 0x205f, 0x3000, (0x2000, 0x200a)]},
+    "nonspaces": { "UseTable" : True, "Inverse": "spaces", "data": [(0, ord('\t') - 1), (ord('\r') + 1, ord(' ') - 1), (ord(' ') + 1, 0x009f), (0x00a1, 0x167f), (0x1681, 0x180d), (0x180f, 0x1fff), (0x200b, 0x2027), (0x202a, 0x202e), (0x2030, 0x205e), (0x2060, 0x2fff), (0x3001, 0xffff)]},
     "digits": { "UseTable" : False, "data": [('0', '9')]},
     "nondigits": { "UseTable" : False, "Inverse": "digits", "data": [(0, ord('0') - 1), (ord('9') + 1, 0xffff)] }
 }
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp
index 5439bad..00581e5 100644
--- a/JavaScriptCore/jsc.cpp
+++ b/JavaScriptCore/jsc.cpp
@@ -208,14 +208,14 @@ EncodedJSValue JSC_HOST_CALL functionVersion(ExecState*)
 
 EncodedJSValue JSC_HOST_CALL functionRun(ExecState* exec)
 {
+    StopWatch stopWatch;
     UString fileName = exec->argument(0).toString(exec);
     Vector<char> script;
     if (!fillBufferWithContentsOfFile(fileName, script))
         return JSValue::encode(throwError(exec, createError(exec, "Could not open file.")));
 
-    GlobalObject* globalObject = new (&exec->globalData()) GlobalObject(Vector<UString>());
+    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
 
-    StopWatch stopWatch;
     stopWatch.start();
     evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), makeSource(script.data(), fileName));
     stopWatch.stop();
@@ -245,15 +245,10 @@ EncodedJSValue JSC_HOST_CALL functionCheckSyntax(ExecState* exec)
         return JSValue::encode(throwError(exec, createError(exec, "Could not open file.")));
 
     JSGlobalObject* globalObject = exec->lexicalGlobalObject();
-
-    StopWatch stopWatch;
-    stopWatch.start();
     Completion result = checkSyntax(globalObject->globalExec(), makeSource(script.data(), fileName));
-    stopWatch.stop();
-
     if (result.complType() == Throw)
         throwError(exec, result.value());
-    return JSValue::encode(jsNumber(stopWatch.getElapsedMS()));
+    return JSValue::encode(result.value());
 }
 
 #if ENABLE(SAMPLING_FLAGS)
diff --git a/JavaScriptCore/runtime/MarkStack.h b/JavaScriptCore/runtime/MarkStack.h
index c3efc8f..c551bac 100644
--- a/JavaScriptCore/runtime/MarkStack.h
+++ b/JavaScriptCore/runtime/MarkStack.h
@@ -28,7 +28,6 @@
 
 #include "JSValue.h"
 #include <wtf/Noncopyable.h>
-#include <wtf/OSAllocator.h>
 
 namespace JSC {
 
@@ -86,8 +85,8 @@ namespace JSC {
             MarkSetProperties m_properties;
         };
 
-        static void* allocateStack(size_t size) { return OSAllocator::reserveAndCommit(size); }
-        static void releaseStack(void* addr, size_t size) { OSAllocator::release(addr, size); }
+        static void* allocateStack(size_t size);
+        static void releaseStack(void* addr, size_t size);
 
         static void initializePagesize();
         static size_t pageSize()
diff --git a/JavaScriptCore/runtime/MarkStackNone.cpp b/JavaScriptCore/runtime/MarkStackNone.cpp
new file mode 100644
index 0000000..b1ff48b
--- /dev/null
+++ b/JavaScriptCore/runtime/MarkStackNone.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2009 Company 100, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "MarkStack.h"
+
+#include "FastMalloc.h"
+
+namespace JSC {
+
+void MarkStack::initializePagesize()
+{
+    MarkStack::s_pageSize = 4096;
+}
+
+void* MarkStack::allocateStack(size_t size)
+{
+    return fastMalloc(size);
+}
+
+void MarkStack::releaseStack(void* addr, size_t)
+{
+    return fastFree(addr);
+}
+
+}
diff --git a/JavaScriptCore/runtime/MarkStackPosix.cpp b/JavaScriptCore/runtime/MarkStackPosix.cpp
index 2a5b298..c28bc0d 100644
--- a/JavaScriptCore/runtime/MarkStackPosix.cpp
+++ b/JavaScriptCore/runtime/MarkStackPosix.cpp
@@ -38,6 +38,15 @@ void MarkStack::initializePagesize()
     MarkStack::s_pageSize = getpagesize();
 }
 
+void* MarkStack::allocateStack(size_t size)
+{
+    return mmap(0, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+}
+void MarkStack::releaseStack(void* addr, size_t size)
+{
+    munmap(addr, size);
+}
+
 }
 
 #endif
diff --git a/JavaScriptCore/runtime/MarkStackSymbian.cpp b/JavaScriptCore/runtime/MarkStackSymbian.cpp
index a3893d7..bda14ac 100644
--- a/JavaScriptCore/runtime/MarkStackSymbian.cpp
+++ b/JavaScriptCore/runtime/MarkStackSymbian.cpp
@@ -33,6 +33,16 @@ void MarkStack::initializePagesize()
     MarkStack::s_pageSize = page_size;
 }
 
+void* MarkStack::allocateStack(size_t size)
+{
+    return fastMalloc(size);
+}
+
+void MarkStack::releaseStack(void* addr, size_t size)
+{
+    return fastFree(addr);
+}
+
 }
 
 #endif
diff --git a/JavaScriptCore/runtime/MarkStackWin.cpp b/JavaScriptCore/runtime/MarkStackWin.cpp
index 2d2a1b3..a171c78 100644
--- a/JavaScriptCore/runtime/MarkStackWin.cpp
+++ b/JavaScriptCore/runtime/MarkStackWin.cpp
@@ -39,6 +39,17 @@ void MarkStack::initializePagesize()
     MarkStack::s_pageSize = system_info.dwPageSize;
 }
 
+void* MarkStack::allocateStack(size_t size)
+{
+    return VirtualAlloc(0, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+}
+void MarkStack::releaseStack(void* addr, size_t)
+{
+    // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx,
+    // dwSize must be 0 if dwFreeType is MEM_RELEASE.
+    VirtualFree(addr, 0, MEM_RELEASE);
+}
+
 }
 
 #endif
diff --git a/JavaScriptCore/runtime/Structure.cpp b/JavaScriptCore/runtime/Structure.cpp
index 0179eed..d06a239 100644
--- a/JavaScriptCore/runtime/Structure.cpp
+++ b/JavaScriptCore/runtime/Structure.cpp
@@ -233,7 +233,6 @@ Structure::Structure(JSValue prototype, const TypeInfo& typeInfo, unsigned anony
     , m_dictionaryKind(NoneDictionaryKind)
     , m_isPinnedPropertyTable(false)
     , m_hasGetterSetterProperties(false)
-    , m_hasNonEnumerableProperties(false)
     , m_attributesInPrevious(0)
     , m_specificFunctionThrashCount(0)
     , m_anonymousSlotCount(anonymousSlotCount)
diff --git a/JavaScriptCore/wtf/BumpPointerAllocator.h b/JavaScriptCore/wtf/BumpPointerAllocator.h
index 682283c..3deefe6 100644
--- a/JavaScriptCore/wtf/BumpPointerAllocator.h
+++ b/JavaScriptCore/wtf/BumpPointerAllocator.h
@@ -138,7 +138,10 @@ private:
 
     void destroy()
     {
-        m_allocation.deallocate();
+        // Don't call deallocate on allocation, because allocation is *inside* allocation,
+        // and it will get deallocated before deallocate has completed!
+        PageAllocation allocation = m_allocation;
+        allocation.deallocate();
     }
 
     static BumpPointerPool* ensureCapacityCrossPool(BumpPointerPool* previousPool, size_t size)
diff --git a/JavaScriptCore/wtf/DateMath.cpp b/JavaScriptCore/wtf/DateMath.cpp
index 675f093..f3627e6 100644
--- a/JavaScriptCore/wtf/DateMath.cpp
+++ b/JavaScriptCore/wtf/DateMath.cpp
@@ -379,7 +379,7 @@ int equivalentYearForDST(int year)
     return year;
 }
 
-int32_t calculateUTCOffset()
+static int32_t calculateUTCOffset()
 {
 #if PLATFORM(BREWMP)
     time_t localTime = static_cast<time_t>(currentTime());
@@ -449,7 +449,7 @@ static double calculateDSTOffsetSimple(double localTimeSeconds, double utcOffset
 }
 
 // Get the DST offset, given a time in UTC
-double calculateDSTOffset(double ms, double utcOffset)
+static double calculateDSTOffset(double ms, double utcOffset)
 {
     // On Mac OS X, the call to localtime (see calculateDSTOffsetSimple) will return historically accurate
     // DST information (e.g. New Zealand did not have DST from 1946 to 1974) however the JavaScript
diff --git a/JavaScriptCore/wtf/DateMath.h b/JavaScriptCore/wtf/DateMath.h
index cb84708..be51947 100644
--- a/JavaScriptCore/wtf/DateMath.h
+++ b/JavaScriptCore/wtf/DateMath.h
@@ -84,10 +84,6 @@ int dayInYear(double ms, int year);
 int monthFromDayInYear(int dayInYear, bool leapYear);
 int dayInMonthFromDayInYear(int dayInYear, bool leapYear);
 
-// Returns offset milliseconds for UTC and DST.
-int32_t calculateUTCOffset();
-double calculateDSTOffset(double ms, double utcOffset);
-
 } // namespace WTF
 
 using WTF::dateToDaysFrom1970;
@@ -96,13 +92,10 @@ using WTF::dayInYear;
 using WTF::minutesPerHour;
 using WTF::monthFromDayInYear;
 using WTF::msPerDay;
-using WTF::msPerMinute;
 using WTF::msPerSecond;
 using WTF::msToYear;
 using WTF::secondsPerMinute;
 using WTF::parseDateFromNullTerminatedCharacters;
-using WTF::calculateUTCOffset;
-using WTF::calculateDSTOffset;
 
 #if USE(JSC)
 namespace JSC {
diff --git a/JavaScriptCore/wtf/OSAllocator.h b/JavaScriptCore/wtf/OSAllocator.h
deleted file mode 100644
index 9d80714..0000000
--- a/JavaScriptCore/wtf/OSAllocator.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef OSAllocator_h
-#define OSAllocator_h
-
-namespace WTF {
-
-class OSAllocator {
-public:
-    static void* reserve(size_t);
-    static void* reserveAndCommit(size_t);
-
-    static void commit(void*, size_t);
-    static void decommit(void*, size_t);
-
-    static void release(void*, size_t);
-};
-
-} // namespace WTF
-
-using WTF::OSAllocator;
-
-#endif // OSAllocator_h
diff --git a/JavaScriptCore/wtf/OSAllocatorPosix.cpp b/JavaScriptCore/wtf/OSAllocatorPosix.cpp
deleted file mode 100644
index d1d4af5..0000000
--- a/JavaScriptCore/wtf/OSAllocatorPosix.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "OSAllocator.h"
-
-#if OS(UNIX) && !OS(SYMBIAN)
-
-#include <errno.h>
-#include <sys/mman.h>
-#include <wtf/Assertions.h>
-#include <wtf/UnusedParam.h>
-
-namespace WTF {
-
-void* OSAllocator::reserve(size_t bytes)
-{
-    // From a bookkeeping perspective, POSIX reservations start out in the committed state.
-    void* result = mmap(0, bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-    if (result == MAP_FAILED)
-        CRASH();
-#if HAVE(MADV_FREE_REUSE)
-    while (madvise(result, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { }
-#endif
-    return result;
-}
-
-void* OSAllocator::reserveAndCommit(size_t bytes)
-{
-    // From a bookkeeping perspective, POSIX reservations start out in the committed state.
-    return reserve(bytes);
-}
-
-void OSAllocator::commit(void* address, size_t bytes)
-{
-#if HAVE(MADV_FREE_REUSE)
-    while (madvise(address, bytes, MADV_FREE_REUSE) == -1 && errno == EAGAIN) { }
-#else
-    UNUSED_PARAM(address);
-    UNUSED_PARAM(bytes);
-#endif
-}
-
-void OSAllocator::decommit(void* address, size_t bytes)
-{
-#if HAVE(MADV_FREE_REUSE)
-    while (madvise(address, bytes, MADV_FREE_REUSABLE) == -1 && errno == EAGAIN) { }
-#elif HAVE(MADV_FREE)
-    while (madvise(address, bytes, MADV_FREE) == -1 && errno == EAGAIN) { }
-#elif HAVE(MADV_DONTNEED)
-    while (madvise(address, bytes, MADV_DONTNEED) == -1 && errno == EAGAIN) { }
-#else
-    UNUSED_PARAM(address);
-    UNUSED_PARAM(bytes);
-#endif
-}
-
-void OSAllocator::release(void* address, size_t bytes)
-{
-    munmap(address, bytes);
-}
-
-} // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp b/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
deleted file mode 100644
index c1cc08c..0000000
--- a/JavaScriptCore/wtf/OSAllocatorSymbian.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "OSAllocator.h"
-
-#if OS(SYMBIAN)
-
-#include <wtf/FastMalloc.h>
-
-namespace WTF {
-
-void* OSAllocator::reserve(size_t bytes)
-{
-    return fastMalloc(bytes);
-}
-
-void* OSAllocator::reserveAndCommit(size_t bytes)
-{
-    return reserve(bytes);
-}
-
-void OSAllocator::commit(void*, size_t)
-{
-}
-
-void OSAllocator::decommit(void*, size_t)
-{
-}
-
-void OSAllocator::release(void* address, size_t)
-{
-    fastFree(address);
-}
-
-} // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/OSAllocatorWin.cpp b/JavaScriptCore/wtf/OSAllocatorWin.cpp
deleted file mode 100644
index 384fe13..0000000
--- a/JavaScriptCore/wtf/OSAllocatorWin.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "OSAllocator.h"
-
-#if OS(WINDOWS)
-
-#include "windows.h"
-
-namespace WTF {
-
-void* OSAllocator::reserve(size_t bytes)
-{
-    return VirtualAlloc(0, bytes, MEM_RESERVE, PAGE_READWRITE);
-}
-
-void* OSAllocator::reserveAndCommit(size_t bytes)
-{
-    return VirtualAlloc(0, bytes, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
-}
-
-void OSAllocator::commit(void* address, size_t bytes)
-{
-    VirtualAlloc(address, bytes, MEM_COMMIT, PAGE_READWRITE);
-}
-
-void OSAllocator::decommit(void* address, size_t bytes)
-{
-    VirtualFree(address, bytes, MEM_DECOMMIT);
-}
-
-void OSAllocator::release(void* address, size_t bytes)
-{
-    // According to http://msdn.microsoft.com/en-us/library/aa366892(VS.85).aspx,
-    // dwSize must be 0 if dwFreeType is MEM_RELEASE.
-    VirtualFree(address, 0, MEM_RELEASE);
-}
-
-} // namespace WTF
-
-#endif
diff --git a/JavaScriptCore/wtf/PageAllocation.h b/JavaScriptCore/wtf/PageAllocation.h
index c13821c..26d53a5 100644
--- a/JavaScriptCore/wtf/PageAllocation.h
+++ b/JavaScriptCore/wtf/PageAllocation.h
@@ -29,7 +29,6 @@
 #include <wtf/Assertions.h>
 #include <wtf/UnusedParam.h>
 #include <wtf/VMTags.h>
-#include <algorithm>
 
 #if OS(DARWIN)
 #include <mach/mach_init.h>
@@ -267,11 +266,9 @@ inline PageAllocation PageAllocation::systemAllocateAligned(size_t size, Usage u
 
 inline void PageAllocation::systemDeallocate(bool)
 {
-    void* tmp = 0;
-    std::swap(tmp, m_base);
-
-    int result = munmap(tmp, m_size);
+    int result = munmap(m_base, m_size);
     ASSERT_UNUSED(result, !result);
+    m_base = 0;
 }
 
 inline size_t PageAllocation::systemPageSize()
@@ -306,16 +303,14 @@ inline PageAllocation PageAllocation::systemAllocateAligned(size_t size, Usage u
 
 inline void PageAllocation::systemDeallocate(bool committed)
 {
-    void* tmp = 0;
-    std::swap(tmp, m_base);
-
 #if OS(WINCE)
     if (committed)
-        VirtualFree(tmp, m_size, MEM_DECOMMIT);
+        VirtualFree(m_base, m_size, MEM_DECOMMIT);
 #else
     UNUSED_PARAM(committed);
 #endif
-    VirtualFree(tmp, 0, MEM_RELEASE); 
+    VirtualFree(m_base, 0, MEM_RELEASE); 
+    m_base = 0;
 }
 
 inline size_t PageAllocation::systemPageSize()
@@ -343,11 +338,9 @@ inline PageAllocation PageAllocation::systemAllocate(size_t size, Usage usage, b
 
 inline void PageAllocation::systemDeallocate(bool)
 {
-    void* tmp = 0;
-    std::swap(tmp, m_base);
-
     m_chunk->Close();
     delete m_chunk;
+    m_base = 0;
 }
 
 inline size_t PageAllocation::systemPageSize()
diff --git a/JavaScriptCore/wtf/Vector3.h b/JavaScriptCore/wtf/Vector3.h
new file mode 100644
index 0000000..1850929
--- /dev/null
+++ b/JavaScriptCore/wtf/Vector3.h
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WTF_Vector3_h
+#define WTF_Vector3_h
+
+#include <math.h>
+
+namespace WTF {
+
+class Vector3 {
+public:
+    Vector3()
+        : m_x(0.0)
+        , m_y(0.0)
+        , m_z(0.0)
+    {
+    }
+
+    Vector3(double x, double y, double z)
+        : m_x(x)
+        , m_y(y)
+        , m_z(z)
+    {
+    }
+
+    Vector3(const float p[3])
+        : m_x(p[0])
+        , m_y(p[1])
+        , m_z(p[2])
+    {
+    }
+
+    Vector3(const double p[3])
+        : m_x(p[0])
+        , m_y(p[1])
+        , m_z(p[2])
+    {
+    }
+
+    double abs() const
+    {
+        return sqrt(m_x * m_x + m_y * m_y + m_z * m_z);
+    }
+
+    bool isZero() const
+    {
+        return !m_x && !m_y && !m_z;
+    }
+
+    void normalize()
+    {
+        double absValue = abs();
+        if (!absValue)
+            return;
+
+        double k = 1.0 / absValue;
+        m_x *= k;
+        m_y *= k;
+        m_z *= k;
+    }
+
+    double x() const { return m_x; }
+    double y() const { return m_y; }
+    double z() const { return m_z; }
+
+private:
+    double m_x;
+    double m_y;
+    double m_z;
+};
+
+inline Vector3 operator+(const Vector3& v1, const Vector3& v2)
+{
+    return Vector3(v1.x() + v2.x(), v1.y() + v2.y(), v1.z() + v2.z());
+}
+
+inline Vector3 operator-(const Vector3& v1, const Vector3& v2)
+{
+    return Vector3(v1.x() - v2.x(), v1.y() - v2.y(), v1.z() - v2.z());
+}
+
+inline Vector3 operator*(double k, const Vector3& v)
+{
+    return Vector3(k * v.x(), k * v.y(), k * v.z());
+}
+
+inline Vector3 operator*(const Vector3& v, double k)
+{
+    return Vector3(k * v.x(), k * v.y(), k * v.z());
+}
+
+inline double dot(const Vector3& v1, const Vector3& v2)
+{
+    return v1.x() * v2.x() + v1.y() * v2.y() + v1.z() * v2.z();
+}
+
+inline Vector3 cross(const Vector3& v1, const Vector3& v2)
+{
+    double x3 = v1.y() * v2.z() - v1.z() * v2.y();
+    double y3 = v1.z() * v2.x() - v1.x() * v2.z();
+    double z3 = v1.x() * v2.y() - v1.y() * v2.x();
+    return Vector3(x3, y3, z3);
+}
+
+inline double distance(const Vector3& v1, const Vector3& v2)
+{
+    return (v1 - v2).abs();
+}
+
+} // WTF
+
+#endif // WTF_Vector3_h
diff --git a/JavaScriptCore/wtf/text/CString.cpp b/JavaScriptCore/wtf/text/CString.cpp
index 981d77a..db6443f 100644
--- a/JavaScriptCore/wtf/text/CString.cpp
+++ b/JavaScriptCore/wtf/text/CString.cpp
@@ -49,11 +49,8 @@ void CString::init(const char* str, size_t length)
     if (!str)
         return;
 
-    // We need to be sure we can add 1 to length without overflowing.
-    // Since the passed-in length is the length of an actual existing
-    // string, and we know the string doesn't occupy the entire address
-    // space, we can assert here and there's no need for a runtime check.
-    ASSERT(length < numeric_limits<size_t>::max());
+    if (length >= numeric_limits<size_t>::max())
+        CRASH();
 
     m_buffer = CStringBuffer::create(length + 1);
     memcpy(m_buffer->mutableData(), str, length); 
diff --git a/JavaScriptCore/wtf/unicode/UTF8.cpp b/JavaScriptCore/wtf/unicode/UTF8.cpp
index ca4fc1c..40c5609 100644
--- a/JavaScriptCore/wtf/unicode/UTF8.cpp
+++ b/JavaScriptCore/wtf/unicode/UTF8.cpp
@@ -26,14 +26,9 @@
 #include "config.h"
 #include "UTF8.h"
 
-#include "ASCIICType.h"
-
 namespace WTF {
 namespace Unicode {
 
-// FIXME: Use definition from CharacterNames.h.
-const UChar replacementCharacter = 0xFFFD;
-
 inline int inlineUTF8SequenceLengthNonASCII(char b0)
 {
     if ((b0 & 0xC0) != 0xC0)
@@ -49,12 +44,12 @@ inline int inlineUTF8SequenceLengthNonASCII(char b0)
 
 inline int inlineUTF8SequenceLength(char b0)
 {
-    return isASCII(b0) ? 1 : inlineUTF8SequenceLengthNonASCII(b0);
+    return (b0 & 0x80) == 0 ? 1 : inlineUTF8SequenceLengthNonASCII(b0);
 }
 
 int UTF8SequenceLength(char b0)
 {
-    return isASCII(b0) ? 1 : inlineUTF8SequenceLengthNonASCII(b0);
+    return (b0 & 0x80) == 0 ? 1 : inlineUTF8SequenceLengthNonASCII(b0);
 }
 
 int decodeUTF8Sequence(const char* sequence)
@@ -177,7 +172,7 @@ ConversionResult convertUTF16ToUTF8(
             bytesToWrite = 4;
         } else {
             bytesToWrite = 3;
-            ch = replacementCharacter;
+            ch = 0xFFFD;
         }
 
         target += bytesToWrite;
@@ -236,23 +231,6 @@ static bool isLegalUTF8(const unsigned char* source, int length)
 static const UChar32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL, 
             0x03C82080UL, 0xFA082080UL, 0x82082080UL };
 
-static inline UChar32 readUTF8Sequence(const char*& sequence, unsigned length)
-{
-    UChar32 character = 0;
-
-    // The cases all fall through.
-    switch (length) {
-        case 6: character += static_cast<unsigned char>(*sequence++); character <<= 6;
-        case 5: character += static_cast<unsigned char>(*sequence++); character <<= 6;
-        case 4: character += static_cast<unsigned char>(*sequence++); character <<= 6;
-        case 3: character += static_cast<unsigned char>(*sequence++); character <<= 6;
-        case 2: character += static_cast<unsigned char>(*sequence++); character <<= 6;
-        case 1: character += static_cast<unsigned char>(*sequence++);
-    }
-
-    return character - offsetsFromUTF8[length - 1];
-}
-
 ConversionResult convertUTF8ToUTF16(
     const char** sourceStart, const char* sourceEnd, 
     UChar** targetStart, UChar* targetEnd, bool strict)
@@ -261,52 +239,60 @@ ConversionResult convertUTF8ToUTF16(
     const char* source = *sourceStart;
     UChar* target = *targetStart;
     while (source < sourceEnd) {
-        int utf8SequenceLength = inlineUTF8SequenceLength(*source);
-        if (sourceEnd - source < utf8SequenceLength)  {
+        UChar32 ch = 0;
+        int extraBytesToRead = inlineUTF8SequenceLength(*source) - 1;
+        if (source + extraBytesToRead >= sourceEnd) {
             result = sourceExhausted;
             break;
         }
         // Do this check whether lenient or strict
-        if (!isLegalUTF8(reinterpret_cast<const unsigned char*>(source), utf8SequenceLength)) {
+        if (!isLegalUTF8(reinterpret_cast<const unsigned char*>(source), extraBytesToRead + 1)) {
             result = sourceIllegal;
             break;
         }
-
-        UChar32 character = readUTF8Sequence(source, utf8SequenceLength);
+        // The cases all fall through.
+        switch (extraBytesToRead) {
+            case 5: ch += static_cast<unsigned char>(*source++); ch <<= 6; // remember, illegal UTF-8
+            case 4: ch += static_cast<unsigned char>(*source++); ch <<= 6; // remember, illegal UTF-8
+            case 3: ch += static_cast<unsigned char>(*source++); ch <<= 6;
+            case 2: ch += static_cast<unsigned char>(*source++); ch <<= 6;
+            case 1: ch += static_cast<unsigned char>(*source++); ch <<= 6;
+            case 0: ch += static_cast<unsigned char>(*source++);
+        }
+        ch -= offsetsFromUTF8[extraBytesToRead];
 
         if (target >= targetEnd) {
-            source -= utf8SequenceLength; // Back up source pointer!
-            result = targetExhausted;
-            break;
+            source -= (extraBytesToRead + 1); // Back up source pointer!
+            result = targetExhausted; break;
         }
-
-        if (U_IS_BMP(character)) {
+        if (ch <= 0xFFFF) {
             // UTF-16 surrogate values are illegal in UTF-32
-            if (U_IS_SURROGATE(character)) {
+            if (ch >= 0xD800 && ch <= 0xDFFF) {
                 if (strict) {
-                    source -= utf8SequenceLength; // return to the illegal value itself
+                    source -= (extraBytesToRead + 1); // return to the illegal value itself
                     result = sourceIllegal;
                     break;
                 } else
-                    *target++ = replacementCharacter;
+                    *target++ = 0xFFFD;
             } else
-                *target++ = character; // normal case
-        } else if (U_IS_SUPPLEMENTARY(character)) {
+                *target++ = (UChar)ch; // normal case
+        } else if (ch > 0x10FFFF) {
+            if (strict) {
+                result = sourceIllegal;
+                source -= (extraBytesToRead + 1); // return to the start
+                break; // Bail out; shouldn't continue
+            } else
+                *target++ = 0xFFFD;
+        } else {
             // target is a character in range 0xFFFF - 0x10FFFF
             if (target + 1 >= targetEnd) {
-                source -= utf8SequenceLength; // Back up source pointer!
+                source -= (extraBytesToRead + 1); // Back up source pointer!
                 result = targetExhausted;
                 break;
             }
-            *target++ = U16_LEAD(character);
-            *target++ = U16_TRAIL(character);
-        } else {
-            if (strict) {
-                source -= utf8SequenceLength; // return to the start
-                result = sourceIllegal;
-                break; // Bail out; shouldn't continue
-            } else
-                *target++ = replacementCharacter;
+            ch -= 0x0010000UL;
+            *target++ = (UChar)((ch >> 10) + 0xD800);
+            *target++ = (UChar)((ch & 0x03FF) + 0xDC00);
         }
     }
     *sourceStart = source;
@@ -314,5 +300,5 @@ ConversionResult convertUTF8ToUTF16(
     return result;
 }
 
-} // namespace Unicode
-} // namespace WTF
+}
+}
diff --git a/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h b/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h
index 8959912..f865ef1 100644
--- a/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h
+++ b/JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h
@@ -1,5 +1,4 @@
 /*
- *  Copyright (C) 1999-2004, International Business Machines Corporation and others.  All Rights Reserved.
  *  Copyright (C) 2006 George Staikos <staikos@kde.org>
  *  Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
  *  Copyright (C) 2007 Apple Computer, Inc. All rights reserved.
@@ -39,28 +38,11 @@
 #define U16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00)
 #define U16_LENGTH(c) ((uint32_t)(c) <= 0xffff ? 1 : 2)
 
-#define U_IS_SUPPLEMENTARY(c) ((UChar32)((c)-0x10000)<=0xfffff)
 #define U_IS_SURROGATE(c) (((c)&0xfffff800)==0xd800)
 #define U16_IS_SINGLE(c) !U_IS_SURROGATE(c)
 #define U16_IS_SURROGATE(c) U_IS_SURROGATE(c)
 #define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0)
 
-#define U16_GET(s, start, i, length, c) { \
-    (c)=(s)[i]; \
-    if(U16_IS_SURROGATE(c)) { \
-        uint16_t __c2; \
-        if(U16_IS_SURROGATE_LEAD(c)) { \
-            if((i)+1<(length) && U16_IS_TRAIL(__c2=(s)[(i)+1])) { \
-                (c)=U16_GET_SUPPLEMENTARY((c), __c2); \
-            } \
-        } else { \
-            if((i)-1>=(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
-                (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
-            } \
-        } \
-    } \
-}
-
 #define U16_PREV(s, start, i, c) { \
     (c)=(s)[--(i)]; \
     if(U16_IS_TRAIL(c)) { \
@@ -72,12 +54,6 @@
     } \
 }
 
-#define U16_BACK_1(s, start, i) { \
-    if(U16_IS_TRAIL((s)[--(i)]) && (i)>(start) && U16_IS_LEAD((s)[(i)-1])) { \
-        --(i); \
-    } \
-}
-
 #define U16_NEXT(s, i, length, c) { \
     (c)=(s)[(i)++]; \
     if(U16_IS_LEAD(c)) { \
@@ -89,12 +65,7 @@
     } \
 }
 
-#define U16_FWD_1(s, i, length) { \
-    if(U16_IS_LEAD((s)[(i)++]) && (i)<(length) && U16_IS_TRAIL((s)[i])) { \
-        ++(i); \
-    } \
-}
-
 #define U_MASK(x) ((uint32_t)1<<(x))
 
 #endif
+
diff --git a/JavaScriptCore/wtf/wtf.pri b/JavaScriptCore/wtf/wtf.pri
index 0f7241c..1780334 100644
--- a/JavaScriptCore/wtf/wtf.pri
+++ b/JavaScriptCore/wtf/wtf.pri
@@ -13,9 +13,6 @@ SOURCES += \
     wtf/HashTable.cpp \
     wtf/MD5.cpp \
     wtf/MainThread.cpp \
-    wtf/OSAllocatorPosix.cpp \
-    wtf/OSAllocatorSymbian.cpp \
-    wtf/OSAllocatorWin.cpp \
     wtf/qt/MainThreadQt.cpp \
     wtf/qt/StringQt.cpp \
     wtf/qt/ThreadingQt.cpp \
diff --git a/JavaScriptCore/yarr/RegexCompiler.cpp b/JavaScriptCore/yarr/RegexCompiler.cpp
index e40c791..06ecbad 100644
--- a/JavaScriptCore/yarr/RegexCompiler.cpp
+++ b/JavaScriptCore/yarr/RegexCompiler.cpp
@@ -520,7 +520,7 @@ public:
             PatternTerm& term = currentAlternative->lastTerm();
             ASSERT((term.type == PatternTerm::TypeParenthesesSubpattern) || (term.type == PatternTerm::TypeParentheticalAssertion));
 
-            if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.parentheses.subpatternId)) {
+            if ((term.type == PatternTerm::TypeParenthesesSubpattern) && term.invertOrCapture && (subpatternId == term.subpatternId)) {
                 m_alternative->m_terms.append(PatternTerm::ForwardReference());
                 return;
             }
@@ -595,7 +595,7 @@ public:
             term.quantify(min, QuantifierFixedCount);
             m_alternative->m_terms.append(copyTerm(term));
             // NOTE: this term is interesting from an analysis perspective, in that it can be ignored.....
-            m_alternative->lastTerm().quantify((max == quantifyInfinite) ? max : max - min, greedy ? QuantifierGreedy : QuantifierNonGreedy);
+            m_alternative->lastTerm().quantify((max == UINT_MAX) ? max : max - min, greedy ? QuantifierGreedy : QuantifierNonGreedy);
             if (m_alternative->lastTerm().type == PatternTerm::TypeParenthesesSubpattern)
                 m_alternative->lastTerm().parentheses.isCopy = true;
         }
@@ -734,8 +734,7 @@ public:
     // This optimization identifies sets of parentheses that we will never need to backtrack.
     // In these cases we do not need to store state from prior iterations.
     // We can presently avoid backtracking for:
-    //   * where the parens are at the end of the regular expression (last term in any of the
-    //     alternatives of the main body disjunction).
+    //   * a set of parens at the end of the regular expression (last term in any of the alternatives of the main body disjunction).
     //   * where the parens are non-capturing, and quantified unbounded greedy (*).
     //   * where the parens do not contain any capturing subpatterns.
     void checkForTerminalParentheses()
@@ -746,13 +745,13 @@ public:
             return;
 
         Vector<PatternAlternative*>& alternatives = m_pattern.m_body->m_alternatives;
-        for (size_t i = 0; i < alternatives.size(); ++i) {
+        for (unsigned i =0; i < alternatives.size(); ++i) {
             Vector<PatternTerm>& terms = alternatives[i]->m_terms;
             if (terms.size()) {
                 PatternTerm& term = terms.last();
                 if (term.type == PatternTerm::TypeParenthesesSubpattern
                     && term.quantityType == QuantifierGreedy
-                    && term.quantityCount == quantifyInfinite
+                    && term.quantityCount == UINT_MAX
                     && !term.capture())
                     term.parentheses.isTerminal = true;
             }
diff --git a/JavaScriptCore/yarr/RegexInterpreter.cpp b/JavaScriptCore/yarr/RegexInterpreter.cpp
index a51cd25..164158e 100644
--- a/JavaScriptCore/yarr/RegexInterpreter.cpp
+++ b/JavaScriptCore/yarr/RegexInterpreter.cpp
@@ -515,7 +515,8 @@ public:
         if (matchEnd == -1)
             return true;
 
-        ASSERT((matchBegin == -1) || (matchBegin <= matchEnd));
+        ASSERT((matchBegin == -1) == (matchEnd == -1));
+        ASSERT(matchBegin <= matchEnd);
 
         if (matchBegin == matchEnd)
             return true;
@@ -557,7 +558,8 @@ public:
 
         int matchBegin = output[(term.atom.subpatternId << 1)];
         int matchEnd = output[(term.atom.subpatternId << 1) + 1];
-        ASSERT((matchBegin == -1) || (matchBegin <= matchEnd));
+        ASSERT((matchBegin == -1) == (matchEnd == -1));
+        ASSERT(matchBegin <= matchEnd);
 
         if (matchBegin == matchEnd)
             return false;
@@ -717,7 +719,7 @@ public:
                 if (term.capture()) {
                     // Technically this access to inputPosition should be accessing the begin term's
                     // inputPosition, but for repeats other than fixed these values should be
-                    // the same anyway! (We don't pre-check for greedy or non-greedy matches.)
+                    // the same anyway! (we don't pre-check for greedy or non-greedy matches.)
                     ASSERT((&term - term.atom.parenthesesWidth)->type == ByteTerm::TypeParenthesesSubpatternOnceBegin);
                     ASSERT((&term - term.atom.parenthesesWidth)->inputPosition == term.inputPosition);
                     unsigned subpatternId = term.atom.subpatternId;
@@ -737,7 +739,7 @@ public:
     {
         ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin);
         ASSERT(term.atom.quantityType == QuantifierGreedy);
-        ASSERT(term.atom.quantityCount == quantifyInfinite);
+        ASSERT(term.atom.quantityCount == UINT_MAX);
         ASSERT(!term.capture());
 
         BackTrackInfoParenthesesTerminal* backTrack = reinterpret_cast<BackTrackInfoParenthesesTerminal*>(context->frame + term.frameLocation);
@@ -763,7 +765,7 @@ public:
     {
         ASSERT(term.type == ByteTerm::TypeParenthesesSubpatternTerminalBegin);
         ASSERT(term.atom.quantityType == QuantifierGreedy);
-        ASSERT(term.atom.quantityCount == quantifyInfinite);
+        ASSERT(term.atom.quantityCount == UINT_MAX);
         ASSERT(!term.capture());
 
         // If we backtrack to this point, we have failed to match this iteration of the parens.
@@ -775,7 +777,7 @@ public:
     bool backtrackParenthesesTerminalEnd(ByteTerm&, DisjunctionContext*)
     {
         // 'Terminal' parentheses are at the end of the regex, and as such a match past end
-        // should always be returned as a successful match - we should never backtrack to here.
+        // should always be returned as a successful match - we should never becktrack to here.
         ASSERT_NOT_REACHED();
         return false;
     }
@@ -1826,7 +1828,7 @@ public:
                     break;
 
                 case PatternTerm::TypeBackReference:
-                    atomBackReference(term.backReferenceSubpatternId, term.inputPosition - currentCountAlreadyChecked, term.frameLocation, term.quantityCount, term.quantityType);
+                    atomBackReference(term.subpatternId, term.inputPosition - currentCountAlreadyChecked, term.frameLocation, term.quantityCount, term.quantityType);
                         break;
 
                 case PatternTerm::TypeForwardReference:
diff --git a/JavaScriptCore/yarr/RegexJIT.cpp b/JavaScriptCore/yarr/RegexJIT.cpp
index 1eac667..acbd458 100644
--- a/JavaScriptCore/yarr/RegexJIT.cpp
+++ b/JavaScriptCore/yarr/RegexJIT.cpp
@@ -624,7 +624,7 @@ class RegexGenerator : private MacroAssembler {
 
         add32(Imm32(1), countRegister);
         add32(Imm32(1), index);
-        if (term.quantityCount != quantifyInfinite) {
+        if (term.quantityCount != 0xffffffff) {
             branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this);
             failures.append(jump());
         } else
@@ -662,7 +662,7 @@ class RegexGenerator : private MacroAssembler {
         loadFromFrame(term.frameLocation, countRegister);
 
         atEndOfInput().linkTo(hardFail, this);
-        if (term.quantityCount != quantifyInfinite)
+        if (term.quantityCount != 0xffffffff)
             branch32(Equal, countRegister, Imm32(term.quantityCount), hardFail);
         if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) {
             readCharacter(state.inputOffset(), character);
@@ -749,7 +749,7 @@ class RegexGenerator : private MacroAssembler {
 
         add32(Imm32(1), countRegister);
         add32(Imm32(1), index);
-        if (term.quantityCount != quantifyInfinite) {
+        if (term.quantityCount != 0xffffffff) {
             branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this);
             failures.append(jump());
         } else
diff --git a/JavaScriptCore/yarr/RegexParser.h b/JavaScriptCore/yarr/RegexParser.h
index 8392cdf..a5c0ba2 100644
--- a/JavaScriptCore/yarr/RegexParser.h
+++ b/JavaScriptCore/yarr/RegexParser.h
@@ -33,8 +33,6 @@
 
 namespace JSC { namespace Yarr {
 
-static const unsigned quantifyInfinite = UINT_MAX;
-
 enum BuiltInCharacterClassID {
     DigitClassID,
     SpaceClassID,
@@ -58,7 +56,6 @@ private:
         ParenthesesUnmatched,
         ParenthesesTypeInvalid,
         CharacterClassUnmatched,
-        CharacterClassInvalidRange,
         CharacterClassOutOfOrder,
         EscapeUnterminated,
         NumberOfErrorCodes
@@ -78,7 +75,7 @@ private:
         CharacterClassParserDelegate(Delegate& delegate, ErrorCode& err)
             : m_delegate(delegate)
             , m_err(err)
-            , m_state(Empty)
+            , m_state(empty)
         {
         }
 
@@ -93,88 +90,65 @@ private:
         }
 
         /*
-         * atomPatternCharacter():
+         * atomPatternCharacterUnescaped():
          *
-         * This method is called either from parseCharacterClass() (for an unescaped
-         * character in a character class), or from parseEscape(). In the former case
-         * the value true will be passed for the argument 'hyphenIsRange', and in this
-         * mode we will allow a hypen to be treated as indicating a range (i.e. /[a-z]/
-         * is different to /[a\-z]/).
+         * This method is called directly from parseCharacterClass(), to report a new
+         * pattern character token.  This method differs from atomPatternCharacter(),
+         * which will be called from parseEscape(), since a hypen provided via this
+         * method may be indicating a character range, but a hyphen parsed by
+         * parseEscape() cannot be interpreted as doing so.
          */
-        void atomPatternCharacter(UChar ch, bool hyphenIsRange = false)
+        void atomPatternCharacterUnescaped(UChar ch)
         {
             switch (m_state) {
-            case AfterCharacterClass:
-                // Following a builtin character class we need look out for a hyphen.
-                // We're looking for invalid ranges, such as /[\d-x]/ or /[\d-\d]/.
-                // If we see a hyphen following a charater class then unlike usual
-                // we'll report it to the delegate immediately, and put ourself into
-                // a poisoned state. Any following calls to add another character or
-                // character class will result in an error. (A hypen following a
-                // character-class is itself valid, but only  at the end of a regex).
-                if (hyphenIsRange && ch == '-') {
-                    m_delegate.atomCharacterClassAtom('-');
-                    m_state = AfterCharacterClassHyphen;
-                    return;
-                }
-                // Otherwise just fall through - cached character so treat this as Empty.
-
-            case Empty:
+            case empty:
                 m_character = ch;
-                m_state = CachedCharacter;
-                return;
+                m_state = cachedCharacter;
+                break;
 
-            case CachedCharacter:
-                if (hyphenIsRange && ch == '-')
-                    m_state = CachedCharacterHyphen;
+            case cachedCharacter:
+                if (ch == '-')
+                    m_state = cachedCharacterHyphen;
                 else {
                     m_delegate.atomCharacterClassAtom(m_character);
                     m_character = ch;
                 }
-                return;
+                break;
 
-            case CachedCharacterHyphen:
-                if (ch < m_character) {
+            case cachedCharacterHyphen:
+                if (ch >= m_character)
+                    m_delegate.atomCharacterClassRange(m_character, ch);
+                else
                     m_err = CharacterClassOutOfOrder;
-                    return;
-                }
-                m_delegate.atomCharacterClassRange(m_character, ch);
-                m_state = Empty;
-                return;
-
-            case AfterCharacterClassHyphen:
-                // Error! We have something like /[\d-x]/.
-                m_err = CharacterClassInvalidRange;
-                return;
+                m_state = empty;
             }
         }
 
         /*
+         * atomPatternCharacter():
+         *
+         * Adds a pattern character, called by parseEscape(), as such will not
+         * interpret a hyphen as indicating a character range.
+         */
+        void atomPatternCharacter(UChar ch)
+        {
+            // Flush if a character is already pending to prevent the
+            // hyphen from begin interpreted as indicating a range.
+            if((ch == '-') && (m_state == cachedCharacter))
+                flush();
+
+            atomPatternCharacterUnescaped(ch);
+        }
+
+        /*
          * atomBuiltInCharacterClass():
          *
          * Adds a built-in character class, called by parseEscape().
          */
         void atomBuiltInCharacterClass(BuiltInCharacterClassID classID, bool invert)
         {
-            switch (m_state) {
-            case CachedCharacter:
-                // Flush the currently cached character, then fall through.
-                m_delegate.atomCharacterClassAtom(m_character);
-
-            case Empty:
-            case AfterCharacterClass:
-                m_state = AfterCharacterClass;
-                m_delegate.atomCharacterClassBuiltIn(classID, invert);
-                return;
-
-            case CachedCharacterHyphen:
-            case AfterCharacterClassHyphen:
-                // Error! If we hit either of these cases, we have an
-                // invalid range that looks something like /[x-\d]/
-                // or /[\d-\d]/.
-                m_err = CharacterClassInvalidRange;
-                return;
-            }
+            flush();
+            m_delegate.atomCharacterClassBuiltIn(classID, invert);
         }
 
         /*
@@ -184,12 +158,7 @@ private:
          */
         void end()
         {
-            if (m_state == CachedCharacter)
-                m_delegate.atomCharacterClassAtom(m_character);
-            else if (m_state == CachedCharacterHyphen) {
-                m_delegate.atomCharacterClassAtom(m_character);
-                m_delegate.atomCharacterClassAtom('-');
-            }
+            flush();
             m_delegate.atomCharacterClassEnd();
         }
 
@@ -199,14 +168,21 @@ private:
         void atomBackReference(unsigned) { ASSERT_NOT_REACHED(); }
 
     private:
+        void flush()
+        {
+            if (m_state != empty) // either cachedCharacter or cachedCharacterHyphen
+                m_delegate.atomCharacterClassAtom(m_character);
+            if (m_state == cachedCharacterHyphen)
+                m_delegate.atomCharacterClassAtom('-');
+            m_state = empty;
+        }
+    
         Delegate& m_delegate;
         ErrorCode& m_err;
         enum CharacterClassConstructionState {
-            Empty,
-            CachedCharacter,
-            CachedCharacterHyphen,
-            AfterCharacterClass,
-            AfterCharacterClassHyphen,
+            empty,
+            cachedCharacter,
+            cachedCharacterHyphen,
         } m_state;
         UChar m_character;
     };
@@ -452,7 +428,7 @@ private:
                 break;
 
             default:
-                characterClassConstructor.atomPatternCharacter(consume(), true);
+                characterClassConstructor.atomPatternCharacterUnescaped(consume());
             }
 
             if (m_err)
@@ -596,13 +572,13 @@ private:
 
             case '*':
                 consume();
-                parseQuantifier(lastTokenWasAnAtom, 0, quantifyInfinite);
+                parseQuantifier(lastTokenWasAnAtom, 0, UINT_MAX);
                 lastTokenWasAnAtom = false;
                 break;
 
             case '+':
                 consume();
-                parseQuantifier(lastTokenWasAnAtom, 1, quantifyInfinite);
+                parseQuantifier(lastTokenWasAnAtom, 1, UINT_MAX);
                 lastTokenWasAnAtom = false;
                 break;
 
@@ -621,7 +597,7 @@ private:
                     unsigned max = min;
                     
                     if (tryConsume(','))
-                        max = peekIsDigit() ? consumeNumber() : quantifyInfinite;
+                        max = peekIsDigit() ? consumeNumber() : UINT_MAX;
 
                     if (tryConsume('}')) {
                         if (min <= max)
@@ -681,7 +657,6 @@ private:
             "unmatched parentheses",
             "unrecognized character after (?",
             "missing terminating ] for character class",
-            "invalid range in character class",
             "range out of order in character class",
             "\\ at end of pattern"
         };
@@ -863,7 +838,7 @@ private:
  */
 
 template<class Delegate>
-const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = quantifyInfinite)
+const char* parse(Delegate& delegate, const UString& pattern, unsigned backReferenceLimit = UINT_MAX)
 {
     return Parser<Delegate>(delegate, pattern, backReferenceLimit).parse();
 }
diff --git a/JavaScriptCore/yarr/RegexPattern.h b/JavaScriptCore/yarr/RegexPattern.h
index 8a7d35b..c76c641 100644
--- a/JavaScriptCore/yarr/RegexPattern.h
+++ b/JavaScriptCore/yarr/RegexPattern.h
@@ -107,7 +107,7 @@ struct PatternTerm {
     union {
         UChar patternCharacter;
         CharacterClass* characterClass;
-        unsigned backReferenceSubpatternId;
+        unsigned subpatternId;
         struct {
             PatternDisjunction* disjunction;
             unsigned subpatternId;
@@ -162,7 +162,7 @@ struct PatternTerm {
         : type(TypeBackReference)
         , invertOrCapture(false)
     {
-        backReferenceSubpatternId = spatternId;
+        subpatternId = spatternId;
         quantityType = QuantifierFixedCount;
         quantityCount = 1;
     }