Chromium side of webkit merge 42440:42523.

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

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

8 files changed, 41 insertions, 7 deletions

diff --git a/DEPS b/DEPS
index 6cf8a58..2831a1a 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "42440",
+  "webkit_revision": "42523",
 }
 
 
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@214",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@13701",
+    "/trunk/deps/third_party/WebKit@13772",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@13472",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 18beb15..6ae8021 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@42440
\ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@42523
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.checksum
new file mode 100644
index 0000000..d989c47
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.checksum
@@ -0,0 +1 @@
+d42399d61e1e272e5b2f38a421c5fc1b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.png
new file mode 100644
index 0000000..bf77d13
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.txt
new file mode 100644
index 0000000..323cba7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/6703873-expected.txt
@@ -0,0 +1,26 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x579
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 760x39
+          text run at (0,0) width 631: "This tests that inserting a newline in place of a full line of quoted content doesn't add an extra quoted line. "
+          text run at (631,0) width 129: "The test has passed if"
+          text run at (0,20) width 384: "there are no empty lines (quoted or unquoted) in the box below."
+      RenderBlock {DIV} at (0,56) size 784x60
+        RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (12,0) size 772x20
+            RenderText {#text} at (0,0) size 42x19
+              text run at (0,0) width 42: "quoted"
+          RenderBlock {DIV} at (12,20) size 772x0
+        RenderBlock (anonymous) at (0,20) size 784x20
+          RenderText {#text} at (0,0) size 56x19
+            text run at (0,0) width 56: "unquoted"
+          RenderBR {BR} at (56,15) size 0x0
+        RenderBlock {BLOCKQUOTE} at (0,40) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (12,0) size 772x20
+            RenderText {#text} at (0,0) size 42x19
+              text run at (0,0) width 42: "quoted"
+      RenderBlock {PRE} at (0,129) size 784x0
+caret: position 8 of child 2 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/glue/resource_handle_impl.cc b/webkit/glue/resource_handle_impl.cc
index 61656f51..fa3fb89 100644
--- a/webkit/glue/resource_handle_impl.cc
+++ b/webkit/glue/resource_handle_impl.cc
@@ -702,7 +702,7 @@ PassRefPtr<SharedBuffer> ResourceHandle::bufferedData() {
 }
 
 /*static*/ void ResourceHandle::loadResourceSynchronously(
-    const ResourceRequest& request, ResourceError& error,
+    const ResourceRequest& request, StoredCredentials, ResourceError& error,
     ResourceResponse& response, Vector<char>& data, Frame*) {
 
   RefPtr<ResourceHandle> handle =
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 4b2e545..8bf29b4 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -1042,7 +1042,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) {
 
   if (value->IsNull()) {
     // Clear the event listener
-    doc->removeWindowInlineEventListenerForType(event_type);
+    imp->removeInlineEventListenerForType(event_type);
   } else {
     V8Proxy* proxy = V8Proxy::retrieve(imp->frame());
     if (!proxy)
@@ -1051,7 +1051,7 @@ ACCESSOR_SETTER(DOMWindowEventHandler) {
     RefPtr<EventListener> listener =
       proxy->FindOrCreateV8EventListener(value, true);
     if (listener) {
-      doc->setWindowInlineEventListenerForType(event_type, listener);
+      imp->setInlineEventListenerForType(event_type, listener);
     }
   }
 }
@@ -1075,7 +1075,7 @@ ACCESSOR_GETTER(DOMWindowEventHandler) {
   String key = ToWebCoreString(name);
   String event_type = EventNameFromAttributeName(key);
 
-  EventListener* listener = doc->windowInlineEventListenerForType(event_type);
+  EventListener* listener = imp->inlineEventListenerForType(event_type);
   return V8Proxy::EventListenerToV8Object(listener);
 }
 
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 1abe24d..085e7be 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2447,3 +2447,10 @@ BUG10488 : LayoutTests/fast/css/zoom-body-scroll.html = FAIL
 // due to http://trac.webkit.org/changeset/42428.
 BUG10489 : chrome/fast/dom/messageport-gc.html = TIMEOUT
 
+// New test added by http://trac.webkit.org/changeset/42501.
+// Has already been rebaselined for chromium-win.
+BUG10529 MAC LINUX : LayoutTests/editing/inserting/6703873.html = FAIL
+
+// This test was changed upstream in http://trac.webkit.org/changeset/42447
+// to include window.showModalDialog, which we give as undefined.
+BUG10530 : LayoutTests/fast/dom/Window/window-function-frame-getter-precedence.html = FAIL