Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Side by Side Diff: content/renderer/pepper/pepper_url_loader_host.cc

Issue 21966004: Pepper: Move FileRef to the "new" resource proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_url_loader_host.h" 5 #include "content/renderer/pepper/pepper_url_loader_host.h"
6 6
7 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 7 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
8 #include "content/renderer/pepper/renderer_ppapi_host_impl.h" 8 #include "content/renderer/pepper/renderer_ppapi_host_impl.h"
9 #include "content/renderer/pepper/url_request_info_util.h" 9 #include "content/renderer/pepper/url_request_info_util.h"
10 #include "content/renderer/pepper/url_response_info_util.h" 10 #include "content/renderer/pepper/url_response_info_util.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 } 245 }
246 246
247 if (loader_.get()) 247 if (loader_.get())
248 return PP_ERROR_INPROGRESS; 248 return PP_ERROR_INPROGRESS;
249 249
250 WebFrame* frame = GetFrame(); 250 WebFrame* frame = GetFrame();
251 if (!frame) 251 if (!frame)
252 return PP_ERROR_FAILED; 252 return PP_ERROR_FAILED;
253 253
254 WebURLRequest web_request; 254 WebURLRequest web_request;
255 if (!CreateWebURLRequest(&filled_in_request_data, frame, &web_request)) 255 if (!CreateWebURLRequest(pp_instance(),
256 &filled_in_request_data,
257 frame,
258 &web_request)) {
256 return PP_ERROR_FAILED; 259 return PP_ERROR_FAILED;
260 }
257 261
258 web_request.setTargetType(WebURLRequest::TargetIsObject); 262 web_request.setTargetType(WebURLRequest::TargetIsObject);
259 web_request.setRequestorProcessID(renderer_ppapi_host_->GetPluginPID()); 263 web_request.setRequestorProcessID(renderer_ppapi_host_->GetPluginPID());
260 264
261 WebURLLoaderOptions options; 265 WebURLLoaderOptions options;
262 if (has_universal_access_) { 266 if (has_universal_access_) {
263 options.allowCredentials = true; 267 options.allowCredentials = true;
264 options.crossOriginRequestPolicy = 268 options.crossOriginRequestPolicy =
265 WebURLLoaderOptions::CrossOriginRequestPolicyAllow; 269 WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
266 } else { 270 } else {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 // up-front should be valid (plugin document loads happen after all 390 // up-front should be valid (plugin document loads happen after all
387 // redirects are processed since WebKit has to know the MIME type). 391 // redirects are processed since WebKit has to know the MIME type).
388 if (!main_document_loader_) { 392 if (!main_document_loader_) {
389 // We note when there's a callback in flight for a response to ensure that 393 // We note when there's a callback in flight for a response to ensure that
390 // messages we send to the plugin are not sent out of order. See 394 // messages we send to the plugin are not sent out of order. See
391 // SendUpdateToPlugin() for more details. 395 // SendUpdateToPlugin() for more details.
392 DCHECK(!pending_response_); 396 DCHECK(!pending_response_);
393 pending_response_ = true; 397 pending_response_ = true;
394 398
395 DataFromWebURLResponse( 399 DataFromWebURLResponse(
400 renderer_ppapi_host_,
396 pp_instance(), 401 pp_instance(),
397 response, 402 response,
398 base::Bind(&PepperURLLoaderHost::DidDataFromWebURLResponse, 403 base::Bind(&PepperURLLoaderHost::DidDataFromWebURLResponse,
399 weak_factory_.GetWeakPtr())); 404 weak_factory_.GetWeakPtr()));
400 } 405 }
401 } 406 }
402 407
403 void PepperURLLoaderHost::DidDataFromWebURLResponse( 408 void PepperURLLoaderHost::DidDataFromWebURLResponse(
404 const ppapi::URLResponseInfoData& data) { 409 const ppapi::URLResponseInfoData& data) {
405 SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_ReceivedResponse(data)); 410 SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_ReceivedResponse(data));
(...skipping 11 matching lines...) Expand all
417 ppapi::proxy::ResourceMessageReplyParams params; 422 ppapi::proxy::ResourceMessageReplyParams params;
418 SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_UpdateProgress( 423 SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_UpdateProgress(
419 record_upload ? bytes_sent_ : -1, 424 record_upload ? bytes_sent_ : -1,
420 record_upload ? total_bytes_to_be_sent_ : -1, 425 record_upload ? total_bytes_to_be_sent_ : -1,
421 record_download ? bytes_received_ : -1, 426 record_download ? bytes_received_ : -1,
422 record_download ? total_bytes_to_be_received_ : -1)); 427 record_download ? total_bytes_to_be_received_ : -1));
423 } 428 }
424 } 429 }
425 430
426 } // namespace content 431 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | content/renderer/pepper/pepper_url_request_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698