WebKit merge 42132:42199 (Chrome side)...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "webkit/glue/webplugin_impl.h"
 
 #include "Cursor.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Event.h"
 #include "EventNames.h"
 #include "FloatPoint.h"
 #include "FormData.h"
+#include "FormState.h"
 #include "FocusController.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoadRequest.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
+#include "HTMLFormElement.h"
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "IntRect.h"
 #include "KURL.h"
 #include "KeyboardEvent.h"
 #include "MouseEvent.h"
 #include "Page.h"
 #include "PlatformContextSkia.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformString.h"
@@ skipping 475 matching lines @@
       // since proceeding may do something unintentional.
       ASSERT_NOT_REACHED();
       return ROUTED;
     }
   }
   WebCore::FrameLoadRequest load_request(request);
   load_request.setFrameName(str_target);
   WebCore::FrameLoader *loader = frame()->loader();
   // we actually don't know whether usergesture is true or false,
   // passing true since all we can do is assume it is okay.
-  loader->loadFrameRequestWithFormAndValues(
+  loader->loadFrameRequest(
       load_request,
       false,  // lock history
       false,  // lock back forward list
       0,      // event
-      0,      // form element
-      HashMap<WebCore::String, WebCore::String>());
+      0);     // form state
 
   // load() can cause the frame to go away.
   if (webframe_) {
     WebPluginDelegate* last_plugin = webframe_->plugin_delegate();
     if (last_plugin) {
       last_plugin->DidFinishLoadWithReason(NPRES_USER_BREAK);
       webframe_->set_plugin_delegate(NULL);
     }
 
     if (notify)
@@ skipping 891 matching lines @@
     client_index = clients_.erase(client_index);
     if (resource_client)
       resource_client->DidFail();
   }
 
   // This needs to be called now and not in the destructor since the
   // webframe_ might not be valid anymore.
   webframe_->set_plugin_delegate(NULL);
   webframe_ = NULL;
 }