diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 18:51:20 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-27 18:51:20 +0000 |
| commit | 501844846a6651014ea21db7815f950f088539f5 (patch) | |
| tree | af5dec64bf29dcb32aba780e350dca854cafb0f5 | |
| parent | 0233759c8f0a17a73899bfed59ae21a777a3d637 (diff) | |
| download | chromium_src-501844846a6651014ea21db7815f950f088539f5.zip chromium_src-501844846a6651014ea21db7815f950f088539f5.tar.gz chromium_src-501844846a6651014ea21db7815f950f088539f5.tar.bz2 | |
The return value of ClosePlatformFile() was reversed in r59041. Most
calls to ClosePlatformFile() ignore the return value, but there are
two calls that do use it:
1. webkit/glue/webfileutilities_impl.cc, closeFile() method: i talked
to jianli who changed that method most recently, and he said he
prefers the handle to be reset to base::kInvalidPlatformFileValue if
ClosePlatformFile() succeeded, so no change is needed to that code.
2. webkit/database/database_tracker.cc, CloseIncognitoFileHandle():
this code needs to be updated.
TEST=WebSQLDBs don't crash in incognito mode.
BUG=56237
Review URL: http://codereview.chromium.org/3387018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60685 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/platform_file.h | 2 | ||||
| -rw-r--r-- | webkit/database/database_tracker.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/platform_file.h b/base/platform_file.h index c5ab477..5024717 100644 --- a/base/platform_file.h +++ b/base/platform_file.h @@ -97,7 +97,7 @@ PlatformFile CreatePlatformFile(const std::wstring& name, int flags, bool* created); -// Closes a file handle +// Closes a file handle. Returns |true| on success and |false| otherwise. bool ClosePlatformFile(PlatformFile file); // Reads the given number of bytes (or until EOF is reached) starting with the diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc index 06227d7..a23d9f1 100644 --- a/webkit/database/database_tracker.cc +++ b/webkit/database/database_tracker.cc @@ -629,7 +629,7 @@ bool DatabaseTracker::CloseIncognitoFileHandle(const string16& vfs_file_name) { bool handle_closed = false; FileHandlesMap::iterator it = incognito_file_handles_.find(vfs_file_name); if (it != incognito_file_handles_.end()) { - handle_closed = !base::ClosePlatformFile(it->second); + handle_closed = base::ClosePlatformFile(it->second); if (handle_closed) incognito_file_handles_.erase(it); } |