WebKitMerge 40409:40464 (chromium-side).

* The death of FrameLoaderClient.cpp correspond with
  <http://trac.webkit.org/changeset/40435>
* The custom V8 binding for V8HTMLFormElement::submit() corresponds with
  <http://trac.webkit.org/changeset/40424>
* Changes to FrameLoader::loadFrameRequestWithFormAndValues() and
  FrameLoadTypeRedirectWithLockedHistory correspond with
  <http://trac.webkit.org/changeset/40432>
* No action was taken for the disable-web-security change
  <http://trac.webkit.org/changeset/40449>, defaults to enabled.
* Frame::isFrameSet() moving to Document::isFrameSet corresponds with
  <http://trac.webkit.org/changeset/40443>
* Frame::sendResizeEvent() moved to EventHandler::sendResizeEvent()
  <http://trac.webkit.org/changeset/40444>
* Not sure which webkit change added RenderObjectChildList.cpp.

=======================
Rebaselined the following layout tests to reflect upstream changes:
=======================

* LayoutTests/fast/table/form-with-table-style.html

http://trac.webkit.org/browser/trunk/LayoutTests/platform/mac/fast/table/form-with-table-style-expected.png?rev=40457

* LayoutTests/fast/table/insert-row-before-form.html

http://trac.webkit.org/changeset/40456/trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/fast/table/insert-row-before-form-expected.txt

* LayoutTests/tables/mozilla/bugs/bug4527.html

http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug4527-expected.txt

* LayoutTests/tables/mozilla/bugs/bug96343.html

http://trac.webkit.org/changeset/40458/trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla/bugs/bug96343-expected.txt

* LayoutTests/tables/mozilla_expected_failures/bugs/bug1725.html

http://trac.webkit.org/changeset/40459/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt?old=30635&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/bugs/bug1725-expected.txt

* LayoutTests/tables/mozilla_expected_failures/other/test4.html

http://trac.webkit.org/changeset/40460/trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt?old=34683&old_path=trunk/LayoutTests/platform/mac/tables/mozilla_expected_failures/other/test4-expected.txt

* LayoutTests/editing/deleting/deletionUI-single-instance-actual.png

http://trac.webkit.org/changeset/40454/trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt?old=32226&old_path=trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance-expected.txt

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

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

4 files changed, 5 insertions, 4 deletions

diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index d972263..2f178d9 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -241,7 +241,7 @@ static bool FillFormToUploadFileImpl(WebCore::HTMLFormElement* fe,
 
   // If we found both the file and the submit button, let's submit.
   if (file_found && submit_found) {
-    fe->submit();
+    fe->submit(0, false, false);
   }
 
   fe->deref();
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 06ecdea..7cd10d6 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1624,7 +1624,7 @@ PassRefPtr<Frame> WebFrameImpl::CreateChildFrame(
   // this child frame.
   HistoryItem* parent_item = frame_->loader()->currentHistoryItem();
   FrameLoadType load_type = frame_->loader()->loadType();
-  FrameLoadType child_load_type = WebCore::FrameLoadTypeRedirectWithLockedHistory;
+  FrameLoadType child_load_type = WebCore::FrameLoadTypeRedirect;
   KURL new_url = request.resourceRequest().url();
 
   // If we're moving in the backforward list, we might want to replace the
@@ -1735,7 +1735,7 @@ bool WebFrameImpl::SetPrintingMode(bool printing,
     view->setScrollbarModes(WebCore::ScrollbarAuto,
                             WebCore::ScrollbarAuto);
   }
-  DCHECK_EQ(frame()->isFrameSet(), false);
+  DCHECK_EQ(frame()->document()->isFrameSet(), false);
 
   SetPrinting(printing, page_width_min, page_width_max);
   if (!printing)
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc
index 4b3cdb7..292ff9e 100644
--- a/webkit/glue/webplugin_impl.cc
+++ b/webkit/glue/webplugin_impl.cc
@@ -508,6 +508,7 @@ RoutingStatus WebPluginImpl::RouteToFrame(const char *method,
   loader->loadFrameRequestWithFormAndValues(
       load_request,
       false,  // lock history
+      false,  // lock back forward list
       0,      // event
       0,      // form element
       HashMap<WebCore::String, WebCore::String>());
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index c1ad343..1dda5c1 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -831,7 +831,7 @@ void WebViewImpl::Resize(const gfx::Size& new_size) {
 
   if (main_frame()->frameview()) {
     main_frame()->frameview()->resize(size_.width(), size_.height());
-    main_frame()->frame()->sendResizeEvent();
+    main_frame()->frame()->eventHandler()->sendResizeEvent();
   }
 
   if (delegate_) {