diff options
author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 18:26:16 +0000 |
---|---|---|
committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 18:26:16 +0000 |
commit | d0fef94d21559d72a47dc44a23d2adf147e79264 (patch) | |
tree | 9a03b9bece791905cb49b3d29e7854272f41cc1c /content/renderer/pepper/url_request_info_util.cc | |
parent | 7e797793d31525002837e3a078be62a7c9e94c4e (diff) | |
download | chromium_src-d0fef94d21559d72a47dc44a23d2adf147e79264.zip chromium_src-d0fef94d21559d72a47dc44a23d2adf147e79264.tar.gz chromium_src-d0fef94d21559d72a47dc44a23d2adf147e79264.tar.bz2 |
Revert 215401 "Pepper: Make CreateWebURLRequest async."
> Pepper: Make CreateWebURLRequest async.
>
> This is part of a series of changes that will eventually make
> URLRequestInfo::AppendToBody asynchronous. This is needed as part of the
> refactor of FileRef to the browser from the renderer.
>
> BUG=225441
>
> Review URL: https://chromiumcodereview.appspot.com/21507003
TBR=teravest@chromium.org
Review URL: https://codereview.chromium.org/22242002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/url_request_info_util.cc')
-rw-r--r-- | content/renderer/pepper/url_request_info_util.cc | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/content/renderer/pepper/url_request_info_util.cc b/content/renderer/pepper/url_request_info_util.cc index 8a471e3..1948e75 100644 --- a/content/renderer/pepper/url_request_info_util.cc +++ b/content/renderer/pepper/url_request_info_util.cc @@ -119,22 +119,14 @@ bool EnsureFileRefObjectsPopulated(::ppapi::URLRequestInfoData* data) { } // namespace -void CreateWebURLRequest( - scoped_ptr<ppapi::URLRequestInfoData> data, - WebFrame* frame, - CreateWebURLRequestCallback callback) { - scoped_ptr<WebURLRequest> dest(new WebURLRequest); - +bool CreateWebURLRequest(::ppapi::URLRequestInfoData* data, + WebFrame* frame, + WebURLRequest* dest) { // In the out-of-process case, we've received the URLRequestInfoData // from the untrusted plugin and done no validation on it. We need to be // sure it's not being malicious by checking everything for consistency. - if (!ValidateURLRequestData(*data) || - !EnsureFileRefObjectsPopulated(data.get())) { - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(callback, base::Passed(&data), false, base::Passed(&dest))); - return; - } + if (!ValidateURLRequestData(*data) || !EnsureFileRefObjectsPopulated(data)) + return false; dest->initialize(); dest->setTargetType(WebURLRequest::TargetIsObject); @@ -169,15 +161,8 @@ void CreateWebURLRequest( item.start_offset, item.number_of_bytes, item.expected_last_modified_time, - &http_body)) { - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(callback, - base::Passed(&data), - false, - base::Passed(&dest))); - return; - } + &http_body)) + return false; } else { DCHECK(!item.data.empty()); http_body.appendData(WebData(item.data)); @@ -206,9 +191,8 @@ void CreateWebURLRequest( WebString::fromUTF8(data->custom_user_agent), was_after_preconnect_request)); } - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(callback, base::Passed(&data), true, base::Passed(&dest))); + + return true; } bool URLRequestRequiresUniversalAccess( |