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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/download/download_file_manager.cc

Issue 7847027: DownloadId (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merge Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/download/download_file_manager.h ('k') | content/browser/download/download_id.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/download/download_file_manager.cc
diff --git a/content/browser/download/download_file_manager.cc b/content/browser/download/download_file_manager.cc
index c1dda48bbc40a3de34259ff78c33bda6256c1bc4..49b25016d32bca5f7e9662cf2a7f9991fd91382c 100644
--- a/content/browser/download/download_file_manager.cc
+++ b/content/browser/download/download_file_manager.cc
@@ -65,9 +65,9 @@ void DownloadFileManager::CreateDownloadFile(DownloadCreateInfo* info,
return;
}
- int32 id = info->download_id;
- DCHECK(GetDownloadFile(id) == NULL);
- downloads_[id] = download_file.release();
+ DownloadId global_id(download_manager, info->download_id);
+ DCHECK(GetDownloadFile(global_id) == NULL);
+ downloads_[global_id] = download_file.release();
// The file is now ready, we can un-pause the request and start saving data.
info->request_handle.ResumeRequest();
@@ -77,11 +77,11 @@ void DownloadFileManager::CreateDownloadFile(DownloadCreateInfo* info,
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
NewRunnableMethod(download_manager,
- &DownloadManager::StartDownload, id));
+ &DownloadManager::StartDownload, info->download_id));
}
-DownloadFile* DownloadFileManager::GetDownloadFile(int id) {
- DownloadFileMap::iterator it = downloads_.find(id);
+DownloadFile* DownloadFileManager::GetDownloadFile(DownloadId global_id) {
+ DownloadFileMap::iterator it = downloads_.find(global_id);
return it == downloads_.end() ? NULL : it->second;
}
@@ -103,21 +103,17 @@ void DownloadFileManager::UpdateInProgressDownloads() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
for (DownloadFileMap::iterator i = downloads_.begin();
i != downloads_.end(); ++i) {
- int id = i->first;
+ DownloadId global_id = i->first;
DownloadFile* download_file = i->second;
DownloadManager* manager = download_file->GetDownloadManager();
if (manager) {
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
NewRunnableMethod(manager, &DownloadManager::UpdateDownload,
- id, download_file->bytes_so_far()));
+ global_id.local(), download_file->bytes_so_far()));
}
}
}
-int DownloadFileManager::GetNextId() {
- return next_id_.GetNext();
-}
-
void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(info);
@@ -145,7 +141,8 @@ void DownloadFileManager::StartDownload(DownloadCreateInfo* info) {
// download (in the UI thread), we may receive a few more updates before the IO
// thread gets the cancel message: we just delete the data since the
// DownloadFile has been deleted.
-void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) {
+void DownloadFileManager::UpdateDownload(
+ DownloadId global_id, DownloadBuffer* buffer) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
std::vector<DownloadBuffer::Contents> contents;
{
@@ -153,7 +150,7 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) {
contents.swap(buffer->contents);
}
- DownloadFile* download_file = GetDownloadFile(id);
+ DownloadFile* download_file = GetDownloadFile(global_id);
bool had_error = false;
for (size_t i = 0; i < contents.size(); ++i) {
net::IOBuffer* data = contents[i].first;
@@ -170,7 +167,7 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) {
// Calling this here in case we get more data, to avoid
// processing data after an error. That could lead to
// files that are corrupted if the later processing succeeded.
- CancelDownload(id);
+ CancelDownload(global_id);
download_file = NULL; // Was deleted in |CancelDownload|.
if (download_manager) {
@@ -180,7 +177,7 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) {
NewRunnableMethod(
download_manager,
&DownloadManager::OnDownloadError,
- id,
+ global_id.local(),
bytes_downloaded,
write_result));
}
@@ -191,16 +188,16 @@ void DownloadFileManager::UpdateDownload(int id, DownloadBuffer* buffer) {
}
void DownloadFileManager::OnResponseCompleted(
- int id,
+ DownloadId global_id,
DownloadBuffer* buffer,
net::Error net_error,
const std::string& security_info) {
- VLOG(20) << __FUNCTION__ << "()" << " id = " << id
+ VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id
<< " net_error = " << net_error
<< " security_info = \"" << security_info << "\"";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
delete buffer;
- DownloadFile* download_file = GetDownloadFile(id);
+ DownloadFile* download_file = GetDownloadFile(global_id);
if (!download_file)
return;
@@ -208,7 +205,7 @@ void DownloadFileManager::OnResponseCompleted(
DownloadManager* download_manager = download_file->GetDownloadManager();
if (!download_manager) {
- CancelDownload(id);
+ CancelDownload(global_id);
return;
}
@@ -228,7 +225,7 @@ void DownloadFileManager::OnResponseCompleted(
NewRunnableMethod(
download_manager,
&DownloadManager::OnResponseCompleted,
- id,
+ global_id.local(),
download_file->bytes_so_far(),
hash));
} else {
@@ -238,7 +235,7 @@ void DownloadFileManager::OnResponseCompleted(
NewRunnableMethod(
download_manager,
&DownloadManager::OnDownloadError,
- id,
+ global_id.local(),
download_file->bytes_so_far(),
net_error));
}
@@ -249,10 +246,10 @@ void DownloadFileManager::OnResponseCompleted(
// This method will be sent via a user action, or shutdown on the UI thread, and
// run on the download thread. Since this message has been sent from the UI
// thread, the download may have already completed and won't exist in our map.
-void DownloadFileManager::CancelDownload(int id) {
- VLOG(20) << __FUNCTION__ << "()" << " id = " << id;
+void DownloadFileManager::CancelDownload(DownloadId global_id) {
+ VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id;
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- DownloadFileMap::iterator it = downloads_.find(id);
+ DownloadFileMap::iterator it = downloads_.find(global_id);
if (it == downloads_.end())
return;
@@ -261,24 +258,24 @@ void DownloadFileManager::CancelDownload(int id) {
<< " download_file = " << download_file->DebugString();
download_file->Cancel();
- EraseDownload(id);
+ EraseDownload(global_id);
}
-void DownloadFileManager::CompleteDownload(int id) {
+void DownloadFileManager::CompleteDownload(DownloadId global_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- if (!ContainsKey(downloads_, id))
+ if (!ContainsKey(downloads_, global_id))
return;
- DownloadFile* download_file = downloads_[id];
+ DownloadFile* download_file = downloads_[global_id];
VLOG(20) << " " << __FUNCTION__ << "()"
- << " id = " << id
+ << " id = " << global_id
<< " download_file = " << download_file->DebugString();
download_file->Detach();
- EraseDownload(id);
+ EraseDownload(global_id);
}
void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) {
@@ -298,7 +295,7 @@ void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) {
for (std::set<DownloadFile*>::iterator i = to_remove.begin();
i != to_remove.end(); ++i) {
- downloads_.erase((*i)->id());
+ downloads_.erase(DownloadId((*i)->GetDownloadManager(), (*i)->id()));
delete *i;
}
}
@@ -312,12 +309,12 @@ void DownloadFileManager::OnDownloadManagerShutdown(DownloadManager* manager) {
// 1. tmp -> foo.crdownload (not final, safe)
// 2. tmp-> Unconfirmed.xxx.crdownload (not final, dangerous)
void DownloadFileManager::RenameInProgressDownloadFile(
- int id, const FilePath& full_path) {
- VLOG(20) << __FUNCTION__ << "()" << " id = " << id
+ DownloadId global_id, const FilePath& full_path) {
+ VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id
<< " full_path = \"" << full_path.value() << "\"";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- DownloadFile* download_file = GetDownloadFile(id);
+ DownloadFile* download_file = GetDownloadFile(global_id);
if (!download_file)
return;
@@ -328,7 +325,7 @@ void DownloadFileManager::RenameInProgressDownloadFile(
if (net::OK != rename_error) {
// Error. Between the time the UI thread generated 'full_path' to the time
// this code runs, something happened that prevents us from renaming.
- CancelDownloadOnRename(id, rename_error);
+ CancelDownloadOnRename(global_id, rename_error);
}
}
@@ -340,13 +337,15 @@ void DownloadFileManager::RenameInProgressDownloadFile(
// 1. foo.crdownload -> foo (final, safe)
// 2. Unconfirmed.xxx.crdownload -> xxx (final, validated)
void DownloadFileManager::RenameCompletingDownloadFile(
- int id, const FilePath& full_path, bool overwrite_existing_file) {
- VLOG(20) << __FUNCTION__ << "()" << " id = " << id
+ DownloadId global_id,
+ const FilePath& full_path,
+ bool overwrite_existing_file) {
+ VLOG(20) << __FUNCTION__ << "()" << " id = " << global_id
<< " overwrite_existing_file = " << overwrite_existing_file
<< " full_path = \"" << full_path.value() << "\"";
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- DownloadFile* download_file = GetDownloadFile(id);
+ DownloadFile* download_file = GetDownloadFile(global_id);
if (!download_file)
return;
@@ -377,7 +376,7 @@ void DownloadFileManager::RenameCompletingDownloadFile(
if (net::OK != rename_error) {
// Error. Between the time the UI thread generated 'full_path' to the time
// this code runs, something happened that prevents us from renaming.
- CancelDownloadOnRename(id, rename_error);
+ CancelDownloadOnRename(global_id, rename_error);
return;
}
@@ -390,17 +389,17 @@ void DownloadFileManager::RenameCompletingDownloadFile(
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
NewRunnableMethod(
- download_manager, &DownloadManager::OnDownloadRenamedToFinalName, id,
- new_path, uniquifier));
+ download_manager, &DownloadManager::OnDownloadRenamedToFinalName,
+ global_id.local(), new_path, uniquifier));
}
// Called only from RenameInProgressDownloadFile and
// RenameCompletingDownloadFile on the FILE thread.
-void DownloadFileManager::CancelDownloadOnRename(int id,
- net::Error rename_error) {
+void DownloadFileManager::CancelDownloadOnRename(
+ DownloadId global_id, net::Error rename_error) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- DownloadFile* download_file = GetDownloadFile(id);
+ DownloadFile* download_file = GetDownloadFile(global_id);
if (!download_file)
return;
@@ -417,24 +416,24 @@ void DownloadFileManager::CancelDownloadOnRename(int id,
BrowserThread::UI, FROM_HERE,
NewRunnableMethod(download_manager,
&DownloadManager::OnDownloadError,
- id,
+ global_id.local(),
download_file->bytes_so_far(),
rename_error));
}
-void DownloadFileManager::EraseDownload(int id) {
+void DownloadFileManager::EraseDownload(DownloadId global_id) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
- if (!ContainsKey(downloads_, id))
+ if (!ContainsKey(downloads_, global_id))
return;
- DownloadFile* download_file = downloads_[id];
+ DownloadFile* download_file = downloads_[global_id];
VLOG(20) << " " << __FUNCTION__ << "()"
- << " id = " << id
+ << " id = " << global_id
<< " download_file = " << download_file->DebugString();
- downloads_.erase(id);
+ downloads_.erase(global_id);
delete download_file;
« no previous file with comments | « content/browser/download/download_file_manager.h ('k') | content/browser/download/download_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698