Chrome side of WebKit merge 42026:42115

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

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

10 files changed, 74 insertions, 8 deletions

diff --git a/DEPS b/DEPS
index d04fa257..ca88036 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "42026",
+  "webkit_revision": "42115",
 }
 
 
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@214",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@12787",
+    "/trunk/deps/third_party/WebKit@12860",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@12390",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index d42915d6..2231f1a 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@42026
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@42115
\ No newline at end of file
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index d153b47..12c4474 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -111,6 +111,7 @@ input_files = [
     '$WEBCORE_DIR/dom/BeforeUnloadEvent.cpp',
     '$WEBCORE_DIR/dom/CDATASection.cpp',
     '$WEBCORE_DIR/dom/CharacterData.cpp',
+    '$WEBCORE_DIR/dom/CheckedRadioButtons.cpp',
     '$WEBCORE_DIR/dom/ChildNodeList.cpp',
     '$WEBCORE_DIR/dom/ClassNames.cpp',
     '$WEBCORE_DIR/dom/ClassNodeList.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 6db752f..d10862c 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -4337,6 +4337,15 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CheckedRadioButtons.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\CheckedRadioButtons.h"
+				>
+			</File>
+
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\dom\ChildNodeList.cpp"
 				>
 			</File>
diff --git a/webkit/glue/autofill_form.cc b/webkit/glue/autofill_form.cc
index 182aab6..d6988bd 100644
--- a/webkit/glue/autofill_form.cc
+++ b/webkit/glue/autofill_form.cc
@@ -7,6 +7,7 @@
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "Frame.h"
+#include "HTMLFormElement.h"
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
 MSVC_POP_WARNING();
diff --git a/webkit/glue/devtools/dom_agent_impl.cc b/webkit/glue/devtools/dom_agent_impl.cc
index d946a7e..a3a3d75 100644
--- a/webkit/glue/devtools/dom_agent_impl.cc
+++ b/webkit/glue/devtools/dom_agent_impl.cc
@@ -480,7 +480,7 @@ ListValue* DomAgentImpl::BuildValueForNode(Node* node, int depth) {
 ListValue* DomAgentImpl::BuildValueForElementAttributes(Element* element) {
   OwnPtr<ListValue> attributesValue(new ListValue());
   // Go through all attributes and serialize them.
-  const NamedAttrMap *attrMap = element->attributes(true);
+  const NamedNodeMap *attrMap = element->attributes(true);
   if (!attrMap) {
     return attributesValue.release();
   }
diff --git a/webkit/glue/dom_serializer.cc b/webkit/glue/dom_serializer.cc
index 47b4b6f..36dfd53 100644
--- a/webkit/glue/dom_serializer.cc
+++ b/webkit/glue/dom_serializer.cc
@@ -352,7 +352,7 @@ void DomSerializer::OpenTagToString(const WebCore::Element* element,
   // Add open tag
   result += "<" + element->nodeName();
   // Go through all attributes and serialize them.
-  const WebCore::NamedAttrMap *attrMap = element->attributes(true);
+  const WebCore::NamedNodeMap *attrMap = element->attributes(true);
   if (attrMap) {
     unsigned numAttrs = attrMap->length();
     for (unsigned i = 0; i < numAttrs; i++) {
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 818d272..532b91b 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -84,6 +84,7 @@ MSVC_PUSH_WARNING_LEVEL(0);
 #include "DOMWindow.h"
 #include "Editor.h"
 #include "EventHandler.h"
+#include "FormState.h"
 #include "Frame.h"
 #include "FrameChromium.h"
 #include "FrameLoader.h"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 9402463..dcf688e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1468,7 +1468,7 @@ MAC : LayoutTests/fast/parser/entity-comment-in-textarea.html = FAIL
 MAC : LayoutTests/fast/table/003.html = FAIL
 MAC : LayoutTests/http/tests/navigation/anchor-basic.html = FAIL
 MAC : LayoutTests/http/tests/navigation/anchor-frames.html = FAIL
-MAC : LayoutTests/http/tests/navigation/anchor-goback.html = FAIL
+MAC WIN : LayoutTests/http/tests/navigation/anchor-goback.html = FAIL
 MAC : LayoutTests/http/tests/navigation/anchor-subframeload.html = FAIL
 MAC : LayoutTests/http/tests/navigation/javascriptlink-basic.html = FAIL
 MAC : LayoutTests/http/tests/navigation/javascriptlink-goback.html = FAIL
@@ -2102,8 +2102,8 @@ MAC : LayoutTests/fast/dom/HTMLElement/innerHTML-selection-crash.html = CRASH PA
 LINUX : LayoutTests/fast/css/percent-top-value-with-relative-position.html = FAIL
 
 // Looks like they started failing with r11542
-MAC : LayoutTests/fast/forms/mailto/advanced-get.html = FAIL
-MAC : LayoutTests/fast/forms/mailto/advanced-put.html = FAIL
+MAC WIN LINUX: LayoutTests/fast/forms/mailto/advanced-get.html = FAIL
+MAC WIN LINUX: LayoutTests/fast/forms/mailto/advanced-put.html = FAIL
 
 // Added 3/12/09
 MAC DEBUG : LayoutTests/fast/events/popup-blocking-click-in-iframe.html = CRASH PASS
@@ -2353,3 +2353,55 @@ DEFER WIN MAC LINUX : LayoutTests/compositing/overflow/parent-overflow.html = FA
 
 // Merge WebKit: 41999:42026, needs a rebaseline.
 DEFER WIN MAC LINUX : LayoutTests/fast/backgrounds/svg-as-background-4.html = FAIL
+
+// Merge WebKit: 42026:42115 regressions
+LayoutTests/fast/block/positioning/002.html = FAIL
+LayoutTests/fast/block/positioning/relative-overflow-block.html = FAIL
+LayoutTests/fast/encoding/mailto-always-utf-8.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items-x-www-form-urlencoded.html = FAIL
+LayoutTests/fast/forms/mailto/get-multiple-items.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-always-utf-8.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-text-plain-latin-1.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/get-non-ascii.html = FAIL
+LayoutTests/fast/forms/mailto/get-overwrite-query.html = FAIL
+LayoutTests/fast/forms/mailto/post-append-query.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-multipart-form-data.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-text-plain.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items-x-www-form-urlencoded.html = FAIL
+LayoutTests/fast/forms/mailto/post-multiple-items.html = FAIL
+LayoutTests/fast/forms/mailto/post-text-plain-with-accept-charset.html = FAIL
+LayoutTests/fast/forms/mailto/post-text-plain.html = FAIL
+LayoutTests/fast/transforms/transforms-with-opacity.html = FAIL
+WIN : LayoutTests/http/tests/navigation/error404-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/javascriptlink-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/metaredirect-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/post-basic.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/post-frames.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/post-goback2.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/postredirect-basic.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/postredirect-frames.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/postredirect-goback1.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/postredirect-goback2.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/redirect302-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-basic.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-frames.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/relativeanchor-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/restore-form-state-https.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/success200-frames-loadsame.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/success200-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/success200-loadsame.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/success200-reload.html = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/timerredirect-goback.html = FAIL
+WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+WIN LINUX : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+WIN LINUX : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
+WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe-timeout.html = TIMEOUT
+WIN LINUX : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
+WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT
+
+// Merge WebKit: 42026:42115 new tests
+DEFER : LayoutTests/fast/block/positioning/negative-rel-position.html = FAIL
+DEFER : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = FAIL
+DEFER : LayoutTests/fast/forms/range-thumb-height-percentage.html = FAIL
\ No newline at end of file
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 9be7120..72f2ec8 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1252,6 +1252,8 @@
         '../third_party/WebKit/WebCore/dom/CSSMappedAttributeDeclaration.h',
         '../third_party/WebKit/WebCore/dom/CharacterData.cpp',
         '../third_party/WebKit/WebCore/dom/CharacterData.h',
+        '../third_party/WebKit/WebCore/dom/CheckedRadioButtons.cpp',
+        '../third_party/WebKit/WebCore/dom/CheckedRadioButtons.h',
         '../third_party/WebKit/WebCore/dom/ChildNodeList.cpp',
         '../third_party/WebKit/WebCore/dom/ChildNodeList.h',
         '../third_party/WebKit/WebCore/dom/ClassNames.cpp',