diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 18:28:05 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-03 18:28:05 +0000 |
| commit | f6f8d8021f123ddb58ffa513e57cdffe9a769dd4 (patch) | |
| tree | 7973c30f047f991e0db2ea3685c423d89e643b42 /webkit/glue | |
| parent | 3f383853bdea91d3cf86d4214e4dfdee6a585805 (diff) | |
| download | chromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.zip chromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.tar.gz chromium_src-f6f8d8021f123ddb58ffa513e57cdffe9a769dd4.tar.bz2 | |
WebKit merge 42132:42199 (Chrome side)
Account for a FrameLoader method that was renamed.
R=amanda
Review URL: http://codereview.chromium.org/62011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index edebe98..f674147 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -12,6 +12,7 @@ #include "EventNames.h" #include "FloatPoint.h" #include "FormData.h" +#include "FormState.h" #include "FocusController.h" #include "Frame.h" #include "FrameLoader.h" @@ -19,6 +20,7 @@ #include "FrameTree.h" #include "FrameView.h" #include "GraphicsContext.h" +#include "HTMLFormElement.h" #include "HTMLNames.h" #include "HTMLPlugInElement.h" #include "IntRect.h" @@ -514,13 +516,12 @@ RoutingStatus WebPluginImpl::RouteToFrame(const char *method, 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_) { |