Get JSC build a closer to compiling.

There's still a ton to do here, but I wanted
to get something in so others could start hacking.

I think the only projects left that don't compile are KJSBindings_prebuild and WebCore.
Review URL: http://codereview.chromium.org/6473

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2863 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 148 insertions, 150 deletions

diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
index f4639a9..8f03179 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -125,515 +125,519 @@
 			Name="KJS"
 			>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Activation.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArgList.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\array_instance.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArgList.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\array_instance.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Arguments.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\array_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Arguments.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\array_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\bool_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\bool_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\completion.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\config.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\date_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\date_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CallData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CallData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ClassInfo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\error_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\completion.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\error_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ConstructData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ConstructData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\function.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\function.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\function_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\function_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\internal.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DatePrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\internal.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DatePrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Error.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Error.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\list.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\list.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LocalStorage.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GetterSetter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GetterSetter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\math_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GlobalEvalFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\math_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GlobalEvalFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NodeInfo.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\IndexToNameMap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes2string.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\IndexToNameMap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\number_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InitializeThreading.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\number_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InitializeThreading.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InternalFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InternalFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\object_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\object_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSActivation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSActivation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSArray.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSArray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\property_map.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSCell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\property_map.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSCell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\property_slot.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\property_slot.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\protect.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObjectFunctions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObjectFunctions.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SavedBuiltins.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\scope_chain.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\scope_chain.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\scope_chain_mark.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\simple_number.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\os-win32\stdint.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\string_object.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\string_object.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SymbolTable.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\MathObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\types.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\MathObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\value.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\value.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorPrototype.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="DerivedSources"
-			>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\array_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NodeInfo.h"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\date_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\grammar.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\grammar.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\lexer.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberObject.h"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\math_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\number_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\regexp_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="$(IntDir)\DerivedSources\string_object.lut.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectConstructor.h"
 				>
 			</File>
-		</Filter>
-		<Filter
-			Name="Bindings"
-			>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_class.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_class.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_instance.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_instance.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_runtime.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyMap.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_runtime.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyMap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_utility.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\c\c_utility.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\NP_jsobject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertySlot.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\NP_jsobject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertySlot.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\npapi.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\protect.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\npruntime.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PrototypeFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\npruntime.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PrototypeFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\npruntime_impl.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\npruntime_priv.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SymbolTable.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_array.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.h"
 				>
 			</File>
+		</Filter>
+		<Filter
+			Name="DerivedSources"
+			>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_array.h"
+				RelativePath="$(IntDir)\DerivedSources\array_object.lut.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_method.cpp"
+				RelativePath="$(IntDir)\DerivedSources\date_object.lut.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_method.h"
+				RelativePath="$(IntDir)\DerivedSources\grammar.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_object.cpp"
+				RelativePath="$(IntDir)\DerivedSources\grammar.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_object.h"
+				RelativePath="$(IntDir)\DerivedSources\lexer.lut.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_root.cpp"
+				RelativePath="$(IntDir)\DerivedSources\math_object.lut.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bindings\runtime_root.h"
+				RelativePath="$(IntDir)\DerivedSources\number_object.lut.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\regexp_object.lut.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\string_object.lut.h"
 				>
 			</File>
 		</Filter>
diff --git a/webkit/build/JavaScriptCore/copy_files.bat b/webkit/build/JavaScriptCore/copy_files.bat
index d1c6e2c..c01e0b7 100644
--- a/webkit/build/JavaScriptCore/copy_files.bat
+++ b/webkit/build/JavaScriptCore/copy_files.bat
@@ -15,13 +15,7 @@ xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRef.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefCF.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSStringRefBSTR.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScriptCore.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\npruntime.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\runtime.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\np_jsobject.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\npruntime_internal.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\npruntime_impl.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\runtime_object.h" %DIR%
-xcopy /y /d "%JAVASCRIPTCORE_DIR%\bindings\runtime_root.h" %DIR%
+xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\WebKitAvailability.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\JSLock.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\collector.h" %DIR%
 xcopy /y /d "%JAVASCRIPTCORE_DIR%\kjs\interpreter.h" %DIR%
diff --git a/webkit/build/JavaScriptCore/javascriptcore.vsprops b/webkit/build/JavaScriptCore/javascriptcore.vsprops
index d9056ce..1bc7e16 100644
--- a/webkit/build/JavaScriptCore/javascriptcore.vsprops
+++ b/webkit/build/JavaScriptCore/javascriptcore.vsprops
@@ -13,7 +13,7 @@
 	/>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(IntDir)&quot;;&quot;$(IntDir)\DerivedSources&quot;;../../../third_party/WebKit/JavaScriptCore;&quot;../../../third_party/WebKit/JavaScriptCore/os-win32&quot;;../../../third_party/WebKit/JavaScriptCore/pcre;../../../third_party/WebKit/JavaScriptCore/kjs;../../../third_party/WebKit/JavaScriptCore/wtf;../../../third_party/WebKit/JavaScriptCore/API;../../../third_party/WebKit/JavaScriptCore/bindings;../../../third_party/WebKit/JavaScriptCore/bindings/c;../../../third_party/WebKit/JavaScriptCore/bindings/jni;../../pending;../../pending/kjs;../../pending/wtf"
-		PreprocessorDefinitions="__STD_C"
+		AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(IntDir)&quot;;&quot;$(IntDir)\DerivedSources&quot;;../../../third_party/WebKit/JavaScriptCore;&quot;../../../third_party/WebKit/JavaScriptCore/os-win32&quot;;../../../third_party/WebKit/JavaScriptCore/pcre;../../../third_party/WebKit/JavaScriptCore/kjs;../../../third_party/WebKit/JavaScriptCore/wtf;../../../third_party/WebKit/JavaScriptCore/API;../../../third_party/WebKit/JavaScriptCore/VM;../../../third_party/WebKit/JavaScriptCore/profiler;../../../third_party/WebKit/JavaScriptCore/bindings;../../../third_party/WebKit/JavaScriptCore/bindings/c;../../../third_party/WebKit/JavaScriptCore/bindings/jni;../../pending;../../pending/kjs;../../pending/wtf"
+		PreprocessorDefinitions="ENABLE_JSC_MULTIPLE_THREADS=0;__STD_C"
 	/>
 </VisualStudioPropertySheet>
diff --git a/webkit/build/JavaScriptCore/testkjs.vcproj b/webkit/build/JavaScriptCore/testapi.vcproj
index 0161da0..9bc556e 100644
--- a/webkit/build/JavaScriptCore/testkjs.vcproj
+++ b/webkit/build/JavaScriptCore/testapi.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="testkjs"
-	ProjectGUID="{5FDEEC10-DC87-4830-9DC6-FC8D2F373E80}"
-	RootNamespace="testkjs"
+	Name="testapi"
+	ProjectGUID="{BF27B0A0-08B1-44EB-B0A2-E58C187FB087}"
+	RootNamespace="testapi"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\bug_1124849_debug.vsprops;.\testkjs.vsprops"
+			InheritedPropertySheets=".\bug_1124849_debug.vsprops;.\testapi.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -78,7 +78,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\bug_1124849_release.vsprops;.\testkjs.vsprops"
+			InheritedPropertySheets=".\bug_1124849_release.vsprops;.\testapi.vsprops"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -140,7 +140,7 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\testkjs.cpp"
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\tests\testapi.js"
 			>
 		</File>
 	</Files>
diff --git a/webkit/build/JavaScriptCore/testkjs.vsprops b/webkit/build/JavaScriptCore/testapi.vsprops
index 164d595..0c7aafe1 100644
--- a/webkit/build/JavaScriptCore/testkjs.vsprops
+++ b/webkit/build/JavaScriptCore/testapi.vsprops
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="testkjs"
+	Name="testapi"
 	InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops"
 	>
 	<Tool