chromium/src
0
Fork 0
Code Activity

WebKit merge 42132:42199 (Chrome side)

Browse Source 
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
This commit is contained in:
darin@chromium.org
2009-04-03 18:28:05 +00:00
parent 3f383853bd
commit f6f8d8021f
3 changed files with 7 additions and 6 deletions

4
DEPS

@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "42132",
"webkit_revision": "42199",
}
@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@12997",
"/trunk/deps/third_party/WebKit@13094",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13083",

2
WEBKIT_MERGE_REVISION

@ -1 +1 @@
http://svn.webkit.org/repository/webkit/trunk@42132
http://svn.webkit.org/repository/webkit/trunk@42199

7
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_) {