diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:48:04 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 21:48:04 +0000 |
| commit | 4a99e834fe351c8e81a70ea571d52b3cdde40af1 (patch) | |
| tree | 45d8722eaf7ad8c4eed025513e9c8337836375ae | |
| parent | 932342ae9338b8fe4457149609c1b00f7526caef (diff) | |
| download | chromium_src-4a99e834fe351c8e81a70ea571d52b3cdde40af1.zip chromium_src-4a99e834fe351c8e81a70ea571d52b3cdde40af1.tar.gz chromium_src-4a99e834fe351c8e81a70ea571d52b3cdde40af1.tar.bz2 | |
Webkit roll to 49284.
BUG=none
TEST=none
TBR=hclam
Review URL: http://codereview.chromium.org/265042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28456 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/glue/webframeloaderclient_impl.cc | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "49278", + "webkit_revision": "49284", "ffmpeg_revision": "27457", } diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc index 4343fd8..8ee9f7c 100644 --- a/webkit/glue/webframeloaderclient_impl.cc +++ b/webkit/glue/webframeloaderclient_impl.cc @@ -759,7 +759,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForMIMEType( } // NOTE: ERR_POLICY_CHANGE will be generated when action is not PolicyUse. - (webframe_->frame()->loader()->*function)(action); + (webframe_->frame()->loader()->policyChecker()->*function)(action); } void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction( @@ -784,7 +784,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction( // to keep this state. next_navigation_policy_ = navigation_policy; } - (webframe_->frame()->loader()->*function)(policy_action); + (webframe_->frame()->loader()->policyChecker()->*function)(policy_action); } void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction( @@ -836,7 +836,7 @@ void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction( } } - (webframe_->frame()->loader()->*function)(policy_action); + (webframe_->frame()->loader()->policyChecker()->*function)(policy_action); } void WebFrameLoaderClient::cancelPolicyCheck() { @@ -853,7 +853,7 @@ void WebFrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction function, webframe_->client()->willSubmitForm( webframe_, webkit_glue::HTMLFormElementToWebForm(form_ref->form())); } - (webframe_->frame()->loader()->*function)(PolicyUse); + (webframe_->frame()->loader()->policyChecker()->*function)(PolicyUse); } void WebFrameLoaderClient::dispatchDidLoadMainResource(DocumentLoader*) { |