summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:06:58 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 17:06:58 +0000
commit1823a7b446974dadf23a6f8d0ff85d60c196fa5e (patch)
tree2d7f4d444c67bd2adfc9dac89077a08ad45dda59 /webkit/glue/plugins
parent3b14f8ad4169775545395a17214d7091e7acf503 (diff)
downloadchromium_src-1823a7b446974dadf23a6f8d0ff85d60c196fa5e.zip
chromium_src-1823a7b446974dadf23a6f8d0ff85d60c196fa5e.tar.gz
chromium_src-1823a7b446974dadf23a6f8d0ff85d60c196fa5e.tar.bz2
Use WebFrame::createAssociatedURLLoader.
See https://bugs.webkit.org/show_bug.cgi?id=49764 for the WebKit side of this change. R=michaeln BUG=none TEST=none Review URL: http://codereview.chromium.org/5139005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins')
-rw-r--r--webkit/glue/plugins/pepper_url_loader.cc10
-rw-r--r--webkit/glue/plugins/webplugin_impl.cc11
2 files changed, 2 insertions, 19 deletions
diff --git a/webkit/glue/plugins/pepper_url_loader.cc b/webkit/glue/plugins/pepper_url_loader.cc
index 83da95f..bd8cca0 100644
--- a/webkit/glue/plugins/pepper_url_loader.cc
+++ b/webkit/glue/plugins/pepper_url_loader.cc
@@ -236,15 +236,7 @@ int32_t URLLoader::Open(URLRequestInfo* request,
if (rv != PP_OK)
return rv;
- frame->dispatchWillSendRequest(web_request);
-
- // Sets the appcache host id to allow retrieval from the appcache.
- if (WebApplicationCacheHostImpl* appcache_host =
- WebApplicationCacheHostImpl::FromFrame(frame)) {
- appcache_host->willStartSubResourceRequest(web_request);
- }
-
- loader_.reset(WebKit::webKitClient()->createURLLoader());
+ loader_.reset(frame->createAssociatedURLLoader());
if (!loader_.get())
return PP_ERROR_FAILED;
diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index 3891563..f6ef803 100644
--- a/webkit/glue/plugins/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -1168,22 +1168,13 @@ bool WebPluginImpl::InitiateHTTPRequest(unsigned long resource_id,
SetReferrer(&info.request, referrer_flag);
- // Sets the routing id to associate the ResourceRequest with the RenderView.
- webframe_->dispatchWillSendRequest(info.request);
-
- // Sets the appcache host id to allow retrieval from the appcache.
- if (WebApplicationCacheHostImpl* appcache_host =
- WebApplicationCacheHostImpl::FromFrame(webframe_)) {
- appcache_host->willStartSubResourceRequest(info.request);
- }
-
if (WebDevToolsAgent* devtools_agent = GetDevToolsAgent()) {
devtools_agent->identifierForInitialRequest(resource_id, webframe_,
info.request);
devtools_agent->willSendRequest(resource_id, info.request);
}
- info.loader.reset(WebKit::webKitClient()->createURLLoader());
+ info.loader.reset(webframe_->createAssociatedURLLoader());
if (!info.loader.get())
return false;
info.loader->loadAsynchronously(info.request, this);