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

Unified Diff: ppapi/native_client/src/trusted/plugin/file_downloader.cc

Issue 181933005: Pepper: Simplify FileDownloader::url(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/trusted/plugin/file_downloader.cc
diff --git a/ppapi/native_client/src/trusted/plugin/file_downloader.cc b/ppapi/native_client/src/trusted/plugin/file_downloader.cc
index 2f509674b7b6e8c448a4c230174bc389ee69fa05..daf05ad59b233443ed643a30aaf5ddb80055ae75 100644
--- a/ppapi/native_client/src/trusted/plugin/file_downloader.cc
+++ b/ppapi/native_client/src/trusted/plugin/file_downloader.cc
@@ -128,7 +128,6 @@ bool FileDownloader::Open(
CHECK(instance_ != NULL);
open_time_ = NaClGetTimeOfDayMicroseconds();
status_code_ = -1;
- url_to_open_ = url;
url_ = url;
file_open_notify_callback_ = callback;
mode_ = mode;
@@ -216,7 +215,6 @@ void FileDownloader::OpenFast(const nacl::string& url,
CHECK(instance_ != NULL);
open_time_ = NaClGetTimeOfDayMicroseconds();
status_code_ = NACL_HTTP_STATUS_OK;
- url_to_open_ = url;
url_ = url;
mode_ = DOWNLOAD_NONE;
if (not_streaming() && file_handle != PP_kInvalidFileHandle) {
@@ -264,7 +262,7 @@ bool FileDownloader::InitialResponseIsValid() {
"FileDownloader::InitialResponseIsValid (url is not a string)\n"));
return false;
}
- url_ = full_url.AsString();
+ full_url_ = full_url.AsString();
// Note that URLs in the data-URI scheme produce different error
// codes than other schemes. This is because data-URI are really a
@@ -371,7 +369,7 @@ void FileDownloader::URLLoadFinishNotify(int32_t pp_error) {
stream_finish_callback_.RunAndClear(PP_ERROR_FAILED);
return;
}
- url_ = full_url.AsString();
+ full_url_ = full_url.AsString();
// The file is now fully downloaded.
pp::FileRef file(url_response_.GetBodyAsFileRef());

Powered by Google App Engine
This is Rietveld 408576698