Landing 37604:38097 merge

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

9 files changed, 298 insertions, 165 deletions

diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh
index 228a14d..e561229 100755
--- a/webkit/build/JSConfig/create-config.sh
+++ b/webkit/build/JSConfig/create-config.sh
@@ -87,6 +87,12 @@ then
   $CP $JavaScriptCoreSrcDir/API/JSRetainPtr.h $JSHeadersDir/JavaScriptCore
   $CP $JavaScriptCoreSrcDir/API/OpaqueJSString.h $JSHeadersDir/JavaScriptCore
   $CP $JavaScriptCoreSrcDir/API/WebKitAvailability.h $JSHeadersDir/JavaScriptCore
+  # TODO(dglazkov): we should really look into adopting their ways of doing this
+  # WebKit uses ForwardingHeaders and copies them to make this work
+  $CP $JavaScriptCoreSrcDir/kjs/ustring.h $JSHeadersDir/JavaScriptCore
+  $CP $JavaScriptCoreSrcDir/kjs/identifier.h $JSHeadersDir/JavaScriptCore
+  $CP $JavaScriptCoreSrcDir/kjs/collector.h $JSHeadersDir/JavaScriptCore
+  $CP $JavaScriptCoreSrcDir/kjs/TypeInfo.h $JSHeadersDir/JavaScriptCore
 else 
   $CP $WebCoreSrcDir/bridge/npapi.h $JSHeadersDir
   $CP $WebCoreSrcDir/bridge/npruntime.h $JSHeadersDir
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
index 2c7e76d..fbb09b6 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -125,71 +125,71 @@
 			Name="KJS"
 			>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArgList.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArgList.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArgList.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArgList.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Arguments.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Arguments.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Arguments.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Arguments.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArrayConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArrayConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArrayPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ArrayPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ArrayPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\BooleanPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\BooleanPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CallData.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CallData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CallData.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CallData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ClassInfo.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ClassInfo.h"
 				>
 			</File>
 			<File
@@ -201,11 +201,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CollectorHeapIntrospector.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\CommonIdentifiers.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CommonIdentifiers.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\CommonIdentifiers.h"
 				>
 			</File>
 			<File
@@ -217,59 +221,59 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ConstructData.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ConstructData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ConstructData.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ConstructData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateInstance.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateInstance.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateMath.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DateMath.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DateMath.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DatePrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DatePrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DatePrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\DatePrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\debugger\debugger.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\debugger\debugger.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DebuggerCallFrame.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\debugger\DebuggerCallFrame.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DebuggerCallFrame.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\debugger\DebuggerCallFrame.h"
 				>
 			</File>
 			<File
@@ -281,75 +285,75 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Error.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Error.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Error.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Error.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorInstance.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorInstance.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorInstance.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorInstance.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ErrorPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ErrorPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ExecState.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ExecState.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ExecState.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\FunctionConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\FunctionConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\FunctionPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\FunctionPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\FunctionPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GetterSetter.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\GetterSetter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GetterSetter.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\GetterSetter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GlobalEvalFunction.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\GlobalEvalFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\GlobalEvalFunction.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\GlobalEvalFunction.h"
 				>
 			</File>
 			<File
@@ -361,19 +365,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InitializeThreading.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\InitializeThreading.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InitializeThreading.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\InitializeThreading.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InternalFunction.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\InternalFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InternalFunction.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\InternalFunction.h"
 				>
 			</File>
 			<File
@@ -385,147 +389,143 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSActivation.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSActivation.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSActivation.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSActivation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSArray.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSArray.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSArray.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSArray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSCell.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSCell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSCell.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSCell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSFunction.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSFunction.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSFunction.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalData.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSGlobalData.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalData.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSGlobalData.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSGlobalObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObjectFunctions.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSGlobalObjectFunctions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSGlobalObjectFunctions.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSGlobalObjectFunctions.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSImmediate.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSImmediate.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSImmediate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSLock.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSLock.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSLock.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNotAnObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSNotAnObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNotAnObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSNotAnObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNumberCell.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSNumberCell.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNumberCell.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSNumberCell.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\jsobject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSStaticScopeObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSStaticScopeObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSStaticScopeObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSStaticScopeObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSString.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSString.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSString.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSString.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSType.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSType.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSValue.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSValue.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSValue.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSValue.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSVariableObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSVariableObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSWrapperObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSWrapperObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSWrapperObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelStack.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelStack.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelScope.h"
 				>
 			</File>
 			<File
@@ -545,27 +545,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\MathObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\MathObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\MathObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\MathObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NativeErrorConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NativeErrorConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NativeErrorPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NativeErrorPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NativeErrorPrototype.h"
 				>
 			</File>
 			<File
@@ -585,43 +585,43 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NumberPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ObjectConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ObjectConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ObjectPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ObjectPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ObjectPrototype.h"
 				>
 			</File>
 			<File
@@ -641,27 +641,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyMap.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyMap.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PropertyMapHashTable.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PropertyNameArray.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyNameArray.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PropertyNameArray.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertySlot.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PropertySlot.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertySlot.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PropertySlot.h"
 				>
 			</File>
 			<File
@@ -669,11 +665,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PrototypeFunction.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PrototypeFunction.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PrototypeFunction.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\PrototypeFunction.h"
 				>
 			</File>
 			<File
@@ -685,47 +681,47 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpConstructor.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpConstructor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExpPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChain.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ScopeChain.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChain.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ScopeChain.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChainMark.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ScopeChainMark.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SmallStrings.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\SmallStrings.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SmallStrings.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\SmallStrings.h"
 				>
 			</File>
 			<File
@@ -733,47 +729,59 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceRange.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceCode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringConstructor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringConstructor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringObject.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringConstructor.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringObject.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringConstructor.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringObjectThatMasqueradesAsUndefined.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObject.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringPrototype.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObject.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StringPrototype.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObjectThatMasqueradesAsUndefined.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StructureID.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringPrototype.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StructureID.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringPrototype.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StructureIDChain.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StructureID.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StructureIDChain.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StructureID.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\StructureIDTransitionTable.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SymbolTable.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\SymbolTable.h"
 				>
 			</File>
 			<File
@@ -1037,11 +1045,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\JSPropertyNameIterator.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSPropertyNameIterator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\JSPropertyNameIterator.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\JSPropertyNameIterator.h"
 				>
 			</File>
 			<File
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 8772d17..14a5d68 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -85,7 +85,6 @@ copies = [
     '../WebCore/bridge/runtime_object.h',
     '../WebCore/bridge/runtime_root.h',
     'kjs/collector.h',
-    'kjs/JSLock.h',
     'kjs/interpreter.h',
     'wtf/HashCountedSet.h',
 ]
diff --git a/webkit/build/JavaScriptCore/javascriptcore.vsprops b/webkit/build/JavaScriptCore/javascriptcore.vsprops
index 1bc7e16..60c61c7 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/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"
+		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/runtime;../../../third_party/WebKit/JavaScriptCore/debugger;../../../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/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj
index 07662e4..9c47076 100644
--- a/webkit/build/KJSBindings/KJSBindings.vcproj
+++ b/webkit/build/KJSBindings/KJSBindings.vcproj
@@ -509,6 +509,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\JSGeolocation.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\JSGeoposition.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\JSHistory.cpp"
 				>
 			</File>
@@ -1213,6 +1221,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\JSPositionError.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\JSPositionOptions.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\JSProcessingInstruction.cpp"
 				>
 			</File>
@@ -2846,6 +2862,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSCustomPositionCallback.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSCustomPositionErrorCallback.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSCustomSQLStatementCallback.cpp"
 			>
 		</File>
@@ -2918,6 +2942,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSDOMGlobalObject.cpp"
+			>
+			</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSDOMGlobalObject.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSDOMWindowBase.cpp"
 			>
 		</File>
@@ -2970,6 +3002,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSGeolocationCustom.cpp"
+		>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHistoryCustom.cpp"
 			>
 		</File>
@@ -3030,14 +3066,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLOptionElementConstructor.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLOptionElementConstructor.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLOptionsCollectionCustom.cpp"
 			>
 		</File>
@@ -3142,6 +3170,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSOptionConstructor.cpp"
+		>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSOptionConstructor.h"
+		>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSPluginArrayCustom.cpp"
 			>
 		</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index cf44db8..bff3591 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -97,6 +97,7 @@ input_files = [
     '$WEBCORE_DIR/css/WebKitCSSKeyframesRule.cpp',
     '$WEBCORE_DIR/css/WebKitCSSTransformValue.cpp',
 
+    '$WEBCORE_DIR/dom/ActiveDOMObject.cpp',
     '$WEBCORE_DIR/dom/Attr.cpp',
     '$WEBCORE_DIR/dom/Attribute.cpp',
     '$WEBCORE_DIR/dom/BeforeTextInsertedEvent.cpp',
@@ -151,6 +152,7 @@ input_files = [
     '$WEBCORE_DIR/dom/Range.cpp',
     '$WEBCORE_DIR/dom/RegisteredEventListener.cpp',
     '$WEBCORE_DIR/dom/ScriptElement.cpp',
+    '$WEBCORE_DIR/dom/ScriptExecutionContext.cpp',
     '$WEBCORE_DIR/dom/SelectorNodeList.cpp',
     '$WEBCORE_DIR/dom/StaticNodeList.cpp',
     '$WEBCORE_DIR/dom/StyledElement.cpp',
@@ -370,6 +372,7 @@ input_files = [
     '$WEBCORE_DIR/page/Frame.cpp',
     '$WEBCORE_DIR/page/FrameTree.cpp',
     '$WEBCORE_DIR/page/FrameView.cpp',
+    '$WEBCORE_DIR/page/Geolocation.cpp',
     '$WEBCORE_DIR/page/History.cpp',
     '$WEBCORE_DIR/page/MouseEventWithHitTestResults.cpp',
     '$WEBCORE_DIR/page/Navigator.cpp',
@@ -393,7 +396,9 @@ input_files = [
     '$WEBCORE_DIR/platform/DragData.cpp',
     '$WEBCORE_DIR/platform/DragImage.cpp',
     '$WEBCORE_DIR/platform/FileChooser.cpp',
+    '$WEBCORE_DIR/platform/GeolocationService.cpp',
     '$WEBCORE_DIR/platform/KURL.cpp',
+    '$WEBCORE_DIR/platform/Length.cpp',
     '$WEBCORE_DIR/platform/Logging.cpp',
     '$PORT_DIR/platform/MIMETypeRegistry.cpp',
     '$WEBCORE_DIR/platform/Scrollbar.cpp',
@@ -491,7 +496,6 @@ input_files = [
     '$WEBCORE_DIR/rendering/InlineFlowBox.cpp',
     '$WEBCORE_DIR/rendering/InlineTextBox.cpp',
     '$WEBCORE_DIR/rendering/LayoutState.cpp',
-    '$WEBCORE_DIR/rendering/Length.cpp',
     '$WEBCORE_DIR/rendering/ListMarkerBox.cpp',
     '$WEBCORE_DIR/rendering/MediaControlElements.cpp',
     '$WEBCORE_DIR/rendering/PointerEventsHitRules.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 88ffac5..8586a05 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -354,6 +354,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Geolocation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Geolocation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Geoposition.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Geoposition.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\History.cpp"
 				>
 			</File>
@@ -398,6 +414,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\PositionCallback.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\PositionError.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\PositionErrorCallback.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\page\PositionOptions.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\page\Screen.cpp"
 				>
 			</File>
@@ -934,6 +966,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\HostWindow.h"
 				>
 			</File>
@@ -950,6 +990,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Length.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Length.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LengthBox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LengthSize.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LocalizedStrings.h"
 				>
 			</File>
@@ -1090,6 +1146,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Theme.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThemeTypes.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Timer.cpp"
 				>
 			</File>
@@ -1437,6 +1501,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\AtomicStringHash.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\AtomicStringImpl.h"
 					>
 				</File>
@@ -2310,14 +2378,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\Length.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\Length.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ListMarkerBox.cpp"
 				>
 			</File>
@@ -3442,6 +3502,14 @@
 			Name="dom"
 			>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ActiveDOMObject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ActiveDOMObject.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\AtomicStringList.h"
 				>
 			</File>
@@ -3914,6 +3982,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ScriptExecutionContext.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ScriptExecutionContext.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\SelectorNodeList.cpp"
 				>
 			</File>
diff --git a/webkit/build/js_engine_kjs.vsprops b/webkit/build/js_engine_kjs.vsprops
index 103227c..f5e02e2 100644
--- a/webkit/build/js_engine_kjs.vsprops
+++ b/webkit/build/js_engine_kjs.vsprops
@@ -7,6 +7,6 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="&quot;..\..\pending\kjs&quot;;&quot;$(IntDir)\..\KJSBindings\DerivedSources&quot;;&quot;..\..\..\third_party\WebKit\WebCore\bindings\js&quot;;&quot;..\..\build\JavaScriptCore&quot;;&quot;..\..\..\third_party\WebKit\JavaScriptCore\VM&quot;"
+		AdditionalIncludeDirectories="&quot;..\..\pending\kjs&quot;;&quot;$(IntDir)\..\KJSBindings\DerivedSources&quot;;&quot;..\..\..\third_party\WebKit\WebCore\bindings\js&quot;;&quot;..\..\build\JavaScriptCore&quot;;&quot;..\..\..\third_party\WebKit\JavaScriptCore\VM&quot;;..\..\..\third_party\WebKit\JavaScriptCore\runtime;..\..\..\third_party\WebKit\JavaScriptCore\debugger"
         />
 </VisualStudioPropertySheet>
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index e3f4f4c..2259920 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -183,6 +183,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\port\page\chromium\ChromeClientChromium.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\port\page\chromium\DragControllerChromium.cpp"
 					>
 				</File>