Landing 38097:38305 merge (src/webkit, DEPS)

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

14 files changed, 96 insertions, 103 deletions

diff --git a/DEPS b/DEPS
index 7c12a49..ae687a1 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@63",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@5220",
+    "/trunk/deps/third_party/WebKit@5264",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@5179",
@@ -21,7 +21,7 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@696",
 
   "src/webkit/data/layout_tests/LayoutTests":
-    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@37604",
+    "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38305",
 }
 
 
diff --git a/webkit/build/JSConfig/create-config.sh b/webkit/build/JSConfig/create-config.sh
index e561229..228a14d 100755
--- a/webkit/build/JSConfig/create-config.sh
+++ b/webkit/build/JSConfig/create-config.sh
@@ -87,12 +87,6 @@ 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 fbb09b6..58c5705 100644
--- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
+++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj
@@ -193,11 +193,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\collector.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\collector.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\collector.h"
 				>
 			</File>
 			<File
@@ -213,11 +213,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\completion.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Completion.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\config.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\config.h"
 				>
 			</File>
 			<File
@@ -277,11 +277,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\dtoa.h"
 				>
 			</File>
 			<File
@@ -357,11 +357,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Identifier.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\identifier.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\identifier.h"
 				>
 			</File>
 			<File
@@ -381,11 +381,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Interpreter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\interpreter.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Interpreter.h"
 				>
 			</File>
 			<File
@@ -525,23 +525,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelScope.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bytecompiler\LabelScope.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\Lexer.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\Lexer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Lookup.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Lookup.h"
 				>
 			</File>
 			<File
@@ -569,19 +569,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NodeInfo.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\NodeInfo.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\Nodes.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes2string.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\Nodes.h"
 				>
 			</File>
 			<File
@@ -625,19 +621,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Operations.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\operations.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Operations.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\Parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Parser.h"
 				>
 			</File>
 			<File
@@ -661,7 +657,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\protect.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\Protect.h"
 				>
 			</File>
 			<File
@@ -673,11 +669,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExp.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\regexp.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\RegExp.h"
 				>
 			</File>
 			<File
@@ -725,11 +721,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceProvider.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\SourceCode.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceCode.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\parser\SourceProvider.h"
 				>
 			</File>
 			<File
@@ -785,11 +781,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\UString.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ustring.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ustring.h"
 				>
 			</File>
 		</Filter>
@@ -1017,11 +1013,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeGenerator.cpp"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bytecompiler\CodeGenerator.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeGenerator.h"
+				RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\bytecompiler\CodeGenerator.h"
 				>
 			</File>
 			<File
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index 14a5d68..4df5559 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -16,7 +16,7 @@ hash_table_cmd = '$PERL $CREATE_HASH_TABLE $SOURCE $CREATE_HASH_TABLE_FLAGS > $T
 
 env.Replace(
     CREATE_HASH_TABLE_COM       = hash_table_cmd,
-    CREATE_HASH_TABLE           = env.File('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/kjs/create_hash_table'),
+    CREATE_HASH_TABLE           = env.File('$CHROME_SRC_DIR/third_party/WebKit/JavaScriptCore/create_hash_table'),
     CREATE_HASH_TABLE_FLAGS     = '-i',
 )
 
@@ -26,26 +26,24 @@ env.Replace(
 #
 # We still need to build the pieces of pcre so we can't just drop this
 # SConscript file though... <http://crbug.com/3043>
-"""
-env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM',
-                                            suffix = '.lut.h',
-                                            src_suffix = '.cpp')
-
-inputs = [
-    'array_object',
-    'date_object',
-    'math_object',
-    'number_object',
-    'regexp_object',
-    'string_object',
-]
-
-for i in inputs:
-    env.Lookup_Table_h(i, '$KJS_DIR/%s.cpp' % i)
-
-env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
-                   CREATE_HASH_TABLE_FLAGS='')
-"""
+# env['BUILDERS']['Lookup_Table_h'] = Builder(action = '$CREATE_HASH_TABLE_COM',
+#                                             suffix = '.lut.h',
+#                                             src_suffix = '.cpp')
+#
+# inputs = [
+#     'array_object',
+#     'date_object',
+#     'math_object',
+#     'number_object',
+#     'regexp_object',
+#     'string_object',
+# ]
+#
+# for i in inputs:
+#     env.Lookup_Table_h(i, '$KJS_DIR/%s.cpp' % i)
+#
+# env.Lookup_Table_h('lexer', '$KJS_DIR/keywords.table',
+#                    CREATE_HASH_TABLE_FLAGS='')
 
 # TODO(bradnelson): sucks, needs relative path
 env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
@@ -57,12 +55,12 @@ env.Command('$WEBKIT_DIR/port/JavaScriptCore/chartables.c',
 #env.CXXFile('grammar.cpp', '$KJS_DIR/grammar.y')
 # but SCons has a HARD-WIRED notion that the source must be a .yy file.
 # TODO(bradnelson): not sure why YACCCOM is needed, but fails without
-cpp = env.Command(['grammar.cpp', 'grammar.h'],
-                  '$KJS_DIR/grammar.y',
+cpp = env.Command(['Grammar.cpp', 'Grammar.h'],
+                  '$JAVASCRIPTCORE_DIR/parser/Grammar.y',
                   '$YACCCOM',
                   YACCCOM = '$YACC $YACCFLAGS -o $TARGET $SOURCES',
                   YACCFLAGS = '-d -p kjsyy')
-env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/grammar.hpp'))
+env.AddPostAction(cpp, Move('${TARGETS[1]}', '${TARGET.dir}/Grammar.hpp'))
 
 copies = [
     'API/APICast.h',
@@ -84,8 +82,8 @@ copies = [
     '../WebCore/bridge/npruntime_impl.h',
     '../WebCore/bridge/runtime_object.h',
     '../WebCore/bridge/runtime_root.h',
-    'kjs/collector.h',
-    'kjs/interpreter.h',
+    'runtime/Collector.h',
+    'runtime/Interpreter.h',
     'wtf/HashCountedSet.h',
 ]
 
@@ -99,7 +97,6 @@ for c in copies:
 env = env.Clone(
     CPPPATH = [
         '$JAVASCRIPTCORE_DIR',
-        '$JAVASCRIPTCORE_DIR/kjs',
         '$WTF_DIR',
         '$JAVASCRIPTCORE_DIR/API',
         '$JAVASCRIPTCORE_DIR/bindings',
diff --git a/webkit/build/JavaScriptCore/javascriptcore.vsprops b/webkit/build/JavaScriptCore/javascriptcore.vsprops
index 60c61c7..fc65ddf 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/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"
+		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/bytecompiler;../../../third_party/WebKit/JavaScriptCore/parser;../../../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/JavaScriptCore/using_javascriptcore.vsprops b/webkit/build/JavaScriptCore/using_javascriptcore.vsprops
index d212da5..e6eccb6 100644
--- a/webkit/build/JavaScriptCore/using_javascriptcore.vsprops
+++ b/webkit/build/JavaScriptCore/using_javascriptcore.vsprops
@@ -6,7 +6,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(IntDir)\..\JavaScriptCore;$(IntDir)\..\KJSBindings\DerivedSources;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\bindings;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\kjs"
+		AdditionalIncludeDirectories="$(IntDir)\..\JavaScriptCore;$(IntDir)\..\KJSBindings\DerivedSources;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\bindings;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\runtime;$(SolutionDir)..\third_party\WebKit\JavaScriptCore\parser"
 		PreprocessorDefinitions="ENABLE_CTI=1;CRASH=__debugbreak"
 		DisableSpecificWarnings="4127; 4355; 4510; 4512; 4610; 4706"
 	/>
diff --git a/webkit/build/KJSBindings/build-generated-files.sh b/webkit/build/KJSBindings/build-generated-files.sh
index de7c05a..1f57e04 100755
--- a/webkit/build/KJSBindings/build-generated-files.sh
+++ b/webkit/build/KJSBindings/build-generated-files.sh
@@ -22,7 +22,7 @@ XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
 export BUILT_PRODUCTS_DIR="$4"
-export CREATE_HASH_TABLE="$XSRCROOT/../JavaScriptCore/kjs/create_hash_table"
+export CREATE_HASH_TABLE="$XSRCROOT/../JavaScriptCore/create_hash_table"
 
 DerivedSourcesDir="${BUILT_PRODUCTS_DIR}\DerivedSources"
 echo "$DerivedSourcesDir"
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh
index e68018e..f5aca10 100755
--- a/webkit/build/V8Bindings/build-generated-files.sh
+++ b/webkit/build/V8Bindings/build-generated-files.sh
@@ -30,7 +30,7 @@ XDSTROOT=`cygpath -u "$XDSTROOT"`
 export XDSTROOT
 
 export BUILT_PRODUCTS_DIR="$4"
-export CREATE_HASH_TABLE="$XSRCROOT/../JavaScriptCore/kjs/create_hash_table"
+export CREATE_HASH_TABLE="$XSRCROOT/../JavaScriptCore/create_hash_table"
 
 DerivedSourcesDir="${BUILT_PRODUCTS_DIR}\DerivedSources"
 echo "$DerivedSourcesDir"
diff --git a/webkit/build/js_engine_kjs.vsprops b/webkit/build/js_engine_kjs.vsprops
index f5e02e2..33ba48b 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;;..\..\..\third_party\WebKit\JavaScriptCore\runtime;..\..\..\third_party\WebKit\JavaScriptCore\debugger"
+		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;..\..\..\third_party\WebKit\JavaScriptCore\parser"
         />
 </VisualStudioPropertySheet>
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 787eff7..5edcae4 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -13,6 +13,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "Element.h"
 #include "Event.h"
 #include "EventNames.h"
+#include "FloatPoint.h"
 #include "FormData.h"
 #include "FocusController.h"
 #include "Frame.h"
@@ -603,9 +604,9 @@ void WebPluginImpl::windowCutoutRects(
       WebCore::Node* n = ro->node();
       if (n && n->hasTagName(WebCore::HTMLNames::iframeTag)) {
         if (!ro->style() || ro->style()->visibility() == WebCore::VISIBLE) {
-          int x, y;
-          ro->absolutePosition(x, y);
-          cutouts->append(WebCore::IntRect(x, y, ro->width(), ro->height()));
+          WebCore::IntPoint point = roundedIntPoint(ro->localToAbsolute());
+          WebCore::IntSize size(ro->width(), ro->height());
+          cutouts->append(WebCore::IntRect(point, size));
         }
       }
     }
diff --git a/webkit/port/page/chromium/EventHandlerChromium.cpp b/webkit/port/page/chromium/EventHandlerChromium.cpp
index 2ac7d07..c610070 100644
--- a/webkit/port/page/chromium/EventHandlerChromium.cpp
+++ b/webkit/port/page/chromium/EventHandlerChromium.cpp
@@ -45,8 +45,6 @@
 
 namespace WebCore {
 
-unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
-
 const double EventHandler::TextDragDelay = 0.0;
 
 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
@@ -145,4 +143,9 @@ bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
     return passMouseDownEventToWidget(renderWidget->widget());
 }
 
+unsigned EventHandler::accessKeyModifiers()
+{
+    return PlatformKeyboardEvent::AltKey;
+}
+
 }
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index df456bc..e7e9af2 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -708,26 +708,21 @@ V8 # LayoutTests/fast/borders/fieldsetBorderRadius.html = FAIL
 V8 # LayoutTests/fast/canvas/canvas-text-alignment.html = FAIL
 V8 # LayoutTests/fast/canvas/canvas-text-baseline.html = FAIL
 V8 # LayoutTests/fast/dom/SelectorAPI/NSResolver-exceptions.xhtml = FAIL
-V8 # LayoutTests/fast/text/soft-hyphen-2.html = FAIL
 V8 # LayoutTests/fast/gradients/border-image-gradient-sides-and-corners.html = FAIL
 V8 # LayoutTests/fast/gradients/border-image-gradient.html = FAIL
 V8 # LayoutTests/fast/gradients/generated-gradients.html = FAIL
 V8 # LayoutTests/fast/gradients/list-item-gradient.html = FAIL
 V8 # LayoutTests/fast/gradients/simple-gradients.html = FAIL
-V8 # LayoutTests/fast/media/implicit-media-all.html = FAIL
-V8 # LayoutTests/fast/media/monochrome.html = FAIL
 V8 # LayoutTests/fast/media/viewport-media-query.html = FAIL
 V8 # LayoutTests/fast/overflow/float-in-relpositioned.html = FAIL
 V8 # LayoutTests/fast/replaced/absolute-position-percentage-width.html = FAIL
 V8 # LayoutTests/fast/replaced/max-width-percent.html = FAIL
 V8 # LayoutTests/fast/table/border-collapsing/equal-precedence-resolution.html = FAIL
-V8 # LayoutTests/fast/table/fixed-with-auto-with-colspan.html = FAIL
 V8 # LayoutTests/fast/table/prepend-in-anonymous-table.html = FAIL
 V8 # LayoutTests/fast/table/vertical-align-baseline.html = FAIL
 V8 # LayoutTests/fast/transforms/overflow-with-transform.html = FAIL
 V8 # LayoutTests/fast/transforms/shadows.html = FAIL
 V8 # LayoutTests/http/tests/misc/acid3.html = FAIL
-V8 # DEFER : LayoutTests/http/tests/misc/frame-default-enc-same-domain.html = FAIL
 V8 # LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL
 V8 # LayoutTests/http/tests/security/xss-DENIED-synchronous-form.html = FAIL
 V8 # LayoutTests/http/tests/security/xss-eval.html = FAIL
@@ -818,7 +813,6 @@ V8 # LayoutTests/svg/custom/dominant-baseline-hanging.svg = FAIL
 V8 # LayoutTests/svg/custom/embedded-svg-disallowed-in-dashboard.xml = FAIL
 V8 # LayoutTests/svg/custom/focus-ring.svg = FAIL
 V8 # LayoutTests/svg/custom/glyph-selection-lang-attribute.svg = FAIL
-V8 # LayoutTests/svg/custom/glyph-setting-d-attribute.svg = FAIL
 V8 # LayoutTests/svg/custom/gradient-rotated-bbox.svg = FAIL
 V8 # LayoutTests/svg/custom/gradient-stop-corner-cases.svg = FAIL
 V8 # LayoutTests/svg/custom/gradient-stroke-width.svg = FAIL
@@ -843,8 +837,6 @@ V8 # LayoutTests/svg/custom/text-dom-01-f.svg = FAIL
 V8 # LayoutTests/svg/custom/text-dom-removal.svg = FAIL
 V8 # LayoutTests/svg/custom/use-on-g-containing-foreignObject-and-image.svg = FAIL
 V8 # LayoutTests/svg/custom/width-full-percentage.svg = FAIL
-V8 # LayoutTests/svg/dom/SVGRectElement/rect-modify-rx.svg = FAIL
-V8 # LayoutTests/svg/hixie/dynamic/005.xml = FAIL
 V8 # LayoutTests/svg/text/text-fonts-02-t.svg = FAIL
 V8 # LayoutTests/tables/mozilla/bugs/bug43854-1.html = FAIL
 V8 # LayoutTests/tables/mozilla_expected_failures/bugs/bug14007-2.html = FAIL
@@ -901,7 +893,6 @@ V8 # LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-ry-prop.html = CRA
 // NEW FOR MERGE 36102:37604
 V8 # LayoutTests/animations/matrix-anim.html = FAIL
 V8 # LayoutTests/editing/spelling/inline_spelling_markers.html = FAIL
-V8 # LayoutTests/fast/block/basic/quirk-percent-height-grandchild.html = FAIL
 V8 # LayoutTests/fast/block/positioning/replaced-inside-fixed-top-bottom.html = FAIL
 V8 # LayoutTests/fast/body-propagation/background-color/001-xhtml.xhtml = FAIL
 V8 # LayoutTests/fast/body-propagation/background-color/001.html = FAIL
@@ -1137,7 +1128,6 @@ V8 # LayoutTests/fast/parser/comment-in-textarea.html = FAIL
 V8 # LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
 V8 # LayoutTests/fast/repaint/overflow-outline-repaint.html = FAIL
 V8 # LayoutTests/fast/repaint/overflow-scroll-delete.html = FAIL
-V8 # LayoutTests/fast/replaced/percent-height-in-anonymous-block.html = FAIL
 V8 # LayoutTests/fast/replaced/width100percent-textarea.html = FAIL
 V8 # LayoutTests/fast/text/drawBidiText.html = FAIL
 V8 # LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-sub-frame-to-data-url-sub-frame.html = FAIL
@@ -1201,10 +1191,7 @@ V8 # LayoutTests/fast/dom/Window/new-window-opener.html = PASS | FAIL
 V8 # LayoutTests/fast/forms/access-key.html = PASS | FAIL
 V8 # LayoutTests/http/tests/loading/gmail-assert-on-load.html = PASS | FAIL
 V8 # LayoutTests/http/tests/security/originHeader/origin-header-for-empty.html = FAIL | PASS
-V8 # LayoutTests/svg/custom/class-baseValue.svg = FAIL
-V8 # LayoutTests/svg/custom/use-clipped-transform.svg = FAIL
 V8 # pending/security/block-test.html = FAIL
-V8 # LayoutTests/fast/events/message-port-inactive-document.html = TIMEOUT
 
 // Flaky in debug mode.
 V8 # LayoutTests/svg/dynamic-updates/SVGEllipseElement-svgdom-cx-prop.html = CRASH | PASS
@@ -1217,3 +1204,16 @@ V8 # LayoutTests/svg/dom/animated-tearoff-lifespan.xhtml = FAIL | PASS
 V8 # LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = FAIL | PASS | TIMEOUT
 V8 # LayoutTests/http/tests/security/originHeader/origin-header-for-data.html = FAIL | PASS
 V8 # LayoutTests/http/tests/security/originHeader/origin-header-for-get.html = FAIL | PASS
+
+// MERGE 38097:38305 REGRESSIONS
+V8 # LayoutTests/fast/loader/javascript-url-encoding-2.html = TIMEOUT
+V8 # LayoutTests/editing/pasteboard/merge-end-blockquote.html = FAIL
+V8 # LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2.html = FAIL
+V8 # LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote.html = FAIL
+V8 # LayoutTests/fast/canvas/canvas-pattern-transform.html = FAIL
+V8 # LayoutTests/fast/canvas/canvas-radial-gradient-spreadMethod.html = FAIL
+V8 # LayoutTests/fast/events/offsetX-offsetY.html = FAIL
+V8 # LayoutTests/fast/frames/cross-site-this.html = FAIL
+V8 # LayoutTests/fast/js/large-expressions.html = FAIL
+V8 # LayoutTests/fast/transforms/transformed-focused-text-input.html = FAIL
+V8 # LayoutTests/plugins/plugin-javascript-access.html = FAIL
diff --git a/webkit/webkit.xcodeproj/jsbindings_prebuild.sh b/webkit/webkit.xcodeproj/jsbindings_prebuild.sh
index 37d3de6..17d19f8 100755
--- a/webkit/webkit.xcodeproj/jsbindings_prebuild.sh
+++ b/webkit/webkit.xcodeproj/jsbindings_prebuild.sh
@@ -10,14 +10,14 @@ mkdir -p "${GENERATED_DIR}"
 
 export PORTROOT="${SRCROOT}/port"
 
-# export CREATE_HASH_TABLE="${SRCROOT}/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table"
+# export CREATE_HASH_TABLE="${SRCROOT}/../third_party/WebKit/JavaScriptCore/create_hash_table"
 # TODO(mmentovai): The above is normally correct, but create_hash_table wound
 # up without the svn:executable property set in our repository.  Until that's
 # fixed - it should be fixed at the next WebKit merge following 2008-09-08 -
 # make a copy of create_hash_table, set the executable bit on it, and use that.
 # See also the TODO in webcore_prebuild.sh.
 export CREATE_HASH_TABLE="${GENERATED_DIR}/create_hash_table"
-cp -p "${SRCROOT}/../third_party/WebKit/JavaScriptCore/kjs/create_hash_table" \
+cp -p "${SRCROOT}/../third_party/WebKit/JavaScriptCore/create_hash_table" \
       "${CREATE_HASH_TABLE}"
 chmod a+x "${CREATE_HASH_TABLE}"
 
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 2a4a624..f656f33 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -1662,7 +1662,7 @@
 		4DB7F1D80E9BAD5400C66CE0 /* SMILTime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMILTime.cpp; sourceTree = "<group>"; };
 		4DB7F1D90E9BAD5400C66CE0 /* SMILTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMILTime.h; sourceTree = "<group>"; };
 		4DB7F1DA0E9BAD5400C66CE0 /* SMILTimeContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SMILTimeContainer.cpp; sourceTree = "<group>"; };
-		4DB7F1DB0E9BAD5400C66CE0 /* SMILTimeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SMILTimeContainer.h; path = ../../../../../webkit/pending/SMILTimeContainer.h; sourceTree = "<group>"; };
+		4DB7F1DB0E9BAD5400C66CE0 /* SMILTimeContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMILTimeContainer.h; sourceTree = "<group>"; };
 		4DB7F1DC0E9BAD5400C66CE0 /* SVGSMILElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGSMILElement.cpp; sourceTree = "<group>"; };
 		4DB7F1DD0E9BAD5400C66CE0 /* SVGSMILElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGSMILElement.h; sourceTree = "<group>"; };
 		4DB7F1E80E9BAE2900C66CE0 /* AccessibilityImageMapLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityImageMapLink.cpp; sourceTree = "<group>"; };
@@ -1711,7 +1711,7 @@
 		4DB7F9D90E9BEC9500C66CE0 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
 		4DB7F9DA0E9BEC9500C66CE0 /* ResourceErrorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceErrorBase.cpp; sourceTree = "<group>"; };
 		4DB7F9DB0E9BEC9500C66CE0 /* ResourceErrorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceErrorBase.h; sourceTree = "<group>"; };
-		4DB7F9E80E9BECB500C66CE0 /* NetworkStateNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkStateNotifier.h; path = pending/NetworkStateNotifier.h; sourceTree = SOURCE_ROOT; };
+		4DB7F9E80E9BECB500C66CE0 /* NetworkStateNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStateNotifier.h; sourceTree = "<group>"; };
 		4DB7F9ED0E9BECEC00C66CE0 /* AuthenticationChallenge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthenticationChallenge.h; sourceTree = "<group>"; };
 		4DB7FA410E9BF0CA00C66CE0 /* StyleCachedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleCachedImage.cpp; sourceTree = "<group>"; };
 		4DB7FA420E9BF0CA00C66CE0 /* StyleCachedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleCachedImage.h; sourceTree = "<group>"; };
@@ -2339,9 +2339,9 @@
 		7B5E85CC0D7F28F5001ECF42 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
 		7B5E85CE0D7F28F5001ECF42 /* PassRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PassRefPtr.h; sourceTree = "<group>"; };
 		7B5E85CF0D7F28F5001ECF42 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
-		7B5E85D00D7F28F5001ECF42 /* RefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RefCounted.h; path = ../../../../webkit/pending/wtf/RefCounted.h; sourceTree = "<group>"; };
+		7B5E85D00D7F28F5001ECF42 /* RefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefCounted.h; sourceTree = "<group>"; };
 		7B5E85D10D7F28F5001ECF42 /* RefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtr.h; sourceTree = "<group>"; };
-		7B5E85D20D7F28F5001ECF42 /* RefPtrHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RefPtrHashMap.h; path = ../../../../webkit/pending/wtf/RefPtrHashMap.h; sourceTree = "<group>"; };
+		7B5E85D20D7F28F5001ECF42 /* RefPtrHashMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RefPtrHashMap.h; sourceTree = "<group>"; };
 		7B5E85D30D7F28F5001ECF42 /* RetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetainPtr.h; sourceTree = "<group>"; };
 		7B5E85D40D7F28F5001ECF42 /* StringExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringExtras.h; sourceTree = "<group>"; };
 		7B5E85D50D7F28F5001ECF42 /* TCPackedCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPackedCache.h; sourceTree = "<group>"; };
@@ -3238,7 +3238,6 @@
 		7B5E951B0D7F3E94001ECF42 /* break_lines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = break_lines.h; sourceTree = "<group>"; };
 		7B5E951C0D7F3E94001ECF42 /* CounterNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CounterNode.cpp; sourceTree = "<group>"; };
 		7B5E951D0D7F3E94001ECF42 /* CounterNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CounterNode.h; sourceTree = "<group>"; };
-		7B5E951E0D7F3E94001ECF42 /* DataRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataRef.h; sourceTree = "<group>"; };
 		7B5E951F0D7F3E94001ECF42 /* EllipsisBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EllipsisBox.cpp; sourceTree = "<group>"; };
 		7B5E95200D7F3E94001ECF42 /* EllipsisBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EllipsisBox.h; sourceTree = "<group>"; };
 		7B5E95210D7F3E94001ECF42 /* FixedTableLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FixedTableLayout.cpp; sourceTree = "<group>"; };
@@ -5990,7 +5989,6 @@
 				7B5E951B0D7F3E94001ECF42 /* break_lines.h */,
 				7B5E951C0D7F3E94001ECF42 /* CounterNode.cpp */,
 				7B5E951D0D7F3E94001ECF42 /* CounterNode.h */,
-				7B5E951E0D7F3E94001ECF42 /* DataRef.h */,
 				7B5E951F0D7F3E94001ECF42 /* EllipsisBox.cpp */,
 				7B5E95200D7F3E94001ECF42 /* EllipsisBox.h */,
 				7B5E95210D7F3E94001ECF42 /* FixedTableLayout.cpp */,
@@ -9658,7 +9656,6 @@
 					"$(DIR_WEBCORE)/svg/graphics/filters/cg",
 					"$(DIR_WEBCORE)/svg/graphics/mac",
 					"$(DIR_WEBCORE)/xml",
-					"$(DIR_WEBKIT)/JavaScriptCore",
 					"$(DIR_WEBKIT)/JavaScriptCore/wtf",
 					"$(DIR_WEBKIT)/JavaScriptCore/wtf/unicode",
 					"$(DIR_PORT)/platform/chromium",
@@ -9667,6 +9664,8 @@
 					"$(DIR_SKIA)/include/corecg",
 					"$(DIR_THIRD_PARTY)/libxml/include",
 					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
+					"$(DIR_WEBKIT)/JavaScriptCore",
 				);
 				WARNING_CFLAGS = "";
 				XCODEPROJ_DEPTH = ..;
@@ -9788,7 +9787,6 @@
 					"$(DIR_WEBCORE)/svg/graphics/filters/cg",
 					"$(DIR_WEBCORE)/svg/graphics/mac",
 					"$(DIR_WEBCORE)/xml",
-					"$(DIR_WEBKIT)/JavaScriptCore",
 					"$(DIR_WEBKIT)/JavaScriptCore/wtf",
 					"$(DIR_WEBKIT)/JavaScriptCore/wtf/unicode",
 					"$(DIR_PORT)/platform/chromium",
@@ -9797,6 +9795,8 @@
 					"$(DIR_SKIA)/include/corecg",
 					"$(DIR_THIRD_PARTY)/libxml/include",
 					"$(SYMROOT)/libxml.build/$(CONFIGURATION)/generated/include",
+					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
+					"$(DIR_WEBKIT)/JavaScriptCore",
 				);
 				WARNING_CFLAGS = "";
 				XCODEPROJ_DEPTH = ..;
@@ -9808,6 +9808,7 @@
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(DIR_WEBKIT)/JavaScriptCore",
 					"$(DIR_WEBKIT)/JavaScriptCore/kjs",
 					"$(HEADER_SEARCH_PATHS)",
 					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",
@@ -9821,6 +9822,7 @@
 			baseConfigurationReference = 7BF884300E71C120000BAF8A /* staticlib.xcconfig */;
 			buildSettings = {
 				HEADER_SEARCH_PATHS = (
+					"$(DIR_WEBKIT)/JavaScriptCore",
 					"$(DIR_WEBKIT)/JavaScriptCore/kjs",
 					"$(HEADER_SEARCH_PATHS)",
 					"$(CONFIGURATION_TEMP_DIR)/generated/WebCore/v8",