WebKit Merge 43346:43361, Chromium side.

R=darin
BUG=0
TEST=layout tests

Review URL: http://codereview.chromium.org/113117

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

8 files changed, 81 insertions, 4 deletions

diff --git a/DEPS b/DEPS
index de89666..4d0907a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "43346",
+  "webkit_revision": "43361",
 }
 
 
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@243",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@15555",
+    "/trunk/deps/third_party/WebKit@15584",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@13472",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 637cc8a..49d5dc0 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@43346
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@43361
\ No newline at end of file
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index bd00359..96d51ed 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -240,10 +240,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLImageElementConstructor.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLInputElementCustom.cpp"
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLOptionElementConstructor.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLOptionsCollectionCustom.cpp"
 				>
 			</File>
diff --git a/webkit/port/bindings/scripts/CodeGeneratorV8.pm b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
index f3cb9aa..2afd27e 100644
--- a/webkit/port/bindings/scripts/CodeGeneratorV8.pm
+++ b/webkit/port/bindings/scripts/CodeGeneratorV8.pm
@@ -997,7 +997,7 @@ sub GenerateBatchedAttributeData
       $hasCustomSetter = 1;
 
       # Handle the special case of window.top being marked upstream as Replaceable.
-      # TODO(dglazkov): Investigate why Replaceable is not marked as ReadOnly
+      # TODO(dglazkov): Investigate why [Replaceable] is not marked as ReadOnly
       # upstream and reach parity.
       if (!($interfaceName eq "DOMWindow" and $attrName eq "top")) {
         $propAttr .= "|v8::ReadOnly";
diff --git a/webkit/port/bindings/v8/v8_custom.h b/webkit/port/bindings/v8/v8_custom.h
index a2783c5..63e9b8a 100644
--- a/webkit/port/bindings/v8/v8_custom.h
+++ b/webkit/port/bindings/v8/v8_custom.h
@@ -319,6 +319,8 @@ DECLARE_CALLBACK(DOMWindowClearTimeout)
 DECLARE_CALLBACK(DOMWindowClearInterval)
 
 DECLARE_CALLBACK(DOMParserConstructor)
+DECLARE_CALLBACK(HTMLImageElementConstructor)
+DECLARE_CALLBACK(HTMLOptionElementConstructor)
 DECLARE_CALLBACK(MessageChannelConstructor)
 DECLARE_CALLBACK(WebKitCSSMatrixConstructor)
 DECLARE_CALLBACK(WebKitPointConstructor)
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index 5b8b478..5685375 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -1545,6 +1545,12 @@ v8::Persistent<v8::FunctionTemplate> V8Proxy::GetTemplate(
     case V8ClassIndex::DOMPARSER:
       desc->SetCallHandler(USE_CALLBACK(DOMParserConstructor));
       break;
+    case V8ClassIndex::HTMLIMAGEELEMENT:
+      desc->SetCallHandler(USE_CALLBACK(HTMLImageElementConstructor));
+      break;
+    case V8ClassIndex::HTMLOPTIONELEMENT:
+      desc->SetCallHandler(USE_CALLBACK(HTMLOptionElementConstructor));
+      break;
     case V8ClassIndex::WEBKITCSSMATRIX:
       desc->SetCallHandler(USE_CALLBACK(WebKitCSSMatrixConstructor));
       break;
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6829ba4..faca893 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2382,3 +2382,62 @@ BUG_DARIN LINUX : LayoutTests/svg/transforms/text-with-pattern-with-svg-transfor
 
 // Regressions from WebKit merge 43242:43321.
 BUG_DARIN LINUX : LayoutTests/transitions/mask-transitions.html = FAIL PASS
+
+// Need rebaselines from http://trac.webkit.org/changeset/43355
+BUG11613 WIN MAC : LayoutTests/editing/inserting/4960120-1.html = FAIL
+BUG11613 : LayoutTests/editing/pasteboard/nested-blocks-with-text-area.html = FAIL
+BUG11613 : LayoutTests/editing/pasteboard/pasting-tabs.html = FAIL
+BUG11613 WIN LINUX : LayoutTests/fast/css/resize-corner-tracking.html = FAIL
+BUG11613 : LayoutTests/fast/dom/HTMLTextAreaElement/reset-textarea.html = FAIL
+BUG11613 : LayoutTests/fast/dynamic/008.html = FAIL
+BUG11613 : LayoutTests/fast/forms/form-element-geometry.html = FAIL
+BUG11613 : LayoutTests/fast/forms/linebox-overflow-in-textarea-padding.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/forms/negativeLineHeight.html = FAIL
+BUG11613 : LayoutTests/fast/forms/textAreaLineHeight.html = FAIL
+BUG11613 : LayoutTests/fast/forms/textarea-align.html = FAIL
+BUG11613 : LayoutTests/fast/forms/textarea-scroll-height.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/forms/textarea-scrollbar.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/forms/textarea-scrolled-type.html = FAIL
+BUG11613 : LayoutTests/fast/forms/textarea-setinnerhtml.html = FAIL
+BUG11613 : LayoutTests/fast/overflow/overflow-x-y.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/parser/comment-in-textarea.html = FAIL
+BUG11613 : LayoutTests/fast/parser/entity-comment-in-textarea.html = FAIL
+BUG11613 : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/replaced/width100percent-textarea.html = FAIL
+BUG11613 : LayoutTests/fast/table/003.html = FAIL
+BUG11613 WIN MAC : LayoutTests/fast/text/international/rtl-white-space-pre-wrap.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/anchor-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/anchor-goback.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/anchor-subframeload.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/javascriptlink-basic.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/javascriptlink-goback.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/javascriptlink-subframeload.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/metaredirect-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/metaredirect-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/metaredirect-goback.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/post-goback2.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/postredirect-goback2.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/redirect302-basic.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/redirect302-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/redirect302-goback.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/redirect302-subframeload.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/relativeanchor-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/relativeanchor-goback.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/slowmetaredirect-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/slowtimerredirect-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/success200-basic.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/success200-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/success200-goback.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/success200-loadsame.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/success200-reload.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/success200-subframeload.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/timerredirect-basic.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/timerredirect-frames.html = FAIL
+BUG11613 : LayoutTests/http/tests/navigation/timerredirect-goback.html = FAIL
+BUG11613 WIN MAC : LayoutTests/http/tests/navigation/timerredirect-subframeload.html = FAIL
+BUG11613 : LayoutTests/tables/mozilla/bugs/bug194024.html = FAIL
+BUG11613 : LayoutTests/tables/mozilla/bugs/bug30559.html = FAIL
+BUG11613 : LayoutTests/tables/mozilla/bugs/bug30692.html = FAIL
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index a103ddd..000a6ac 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1013,7 +1013,9 @@
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLFormElementCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLFrameSetElementCustom.cpp',
+        '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLImageElementConstructor.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLInputElementCustom.cpp',
+        '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLOptionElementConstructor.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
         '../third_party/WebKit/WebCore/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',