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

Unified Diff: webkit/fileapi/file_system_dir_url_request_job.cc

Issue 10920087: Update callers of CreateFileSystemOperation so more detailed error codes can be returned. Where app… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error Created 8 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 | « webkit/fileapi/file_system_dir_url_request_job.h ('k') | webkit/fileapi/file_system_file_stream_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/fileapi/file_system_dir_url_request_job.cc
diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/fileapi/file_system_dir_url_request_job.cc
index b0c9d8f649e811b6aea50ca661d34ca5ce0a4c33..1be93947aadbe6f17fb0472a3f2aec1221410db1 100644
--- a/webkit/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/fileapi/file_system_dir_url_request_job.cc
@@ -80,10 +80,11 @@ void FileSystemDirURLRequestJob::StartAsync() {
if (!request_)
return;
url_ = FileSystemURL(request_->url());
- FileSystemOperation* operation = GetNewOperation();
- if (!operation) {
+ base::PlatformFileError error_code;
+ FileSystemOperation* operation = GetNewOperation(&error_code);
+ if (error_code != base::PLATFORM_FILE_OK) {
NotifyDone(URLRequestStatus(URLRequestStatus::FAILED,
- net::ERR_INVALID_URL));
+ net::PlatformFileErrorToNetError(error_code)));
return;
}
operation->ReadDirectory(
@@ -124,7 +125,16 @@ void FileSystemDirURLRequestJob::DidReadDirectory(
}
if (has_more) {
- GetNewOperation()->ReadDirectory(
+ base::PlatformFileError error_code;
+ FileSystemOperation* operation = GetNewOperation(&error_code);
+ if (error_code != base::PLATFORM_FILE_OK) {
+ NotifyDone(URLRequestStatus(
+ URLRequestStatus::FAILED,
+ net::PlatformFileErrorToNetError(error_code)));
+ return;
+ }
+
+ operation->ReadDirectory(
url_,
base::Bind(&FileSystemDirURLRequestJob::DidReadDirectory, this));
} else {
@@ -133,8 +143,9 @@ void FileSystemDirURLRequestJob::DidReadDirectory(
}
}
-FileSystemOperation* FileSystemDirURLRequestJob::GetNewOperation() {
- return file_system_context_->CreateFileSystemOperation(url_);
+FileSystemOperation* FileSystemDirURLRequestJob::GetNewOperation(
+ base::PlatformFileError* error_code) {
+ return file_system_context_->CreateFileSystemOperation(url_, error_code);
}
} // namespace fileapi
« no previous file with comments | « webkit/fileapi/file_system_dir_url_request_job.h ('k') | webkit/fileapi/file_system_file_stream_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698