diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 06:37:03 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 06:37:03 +0000 |
| commit | 60cba79ac19628c205fce7cfdfd7845c1c3b6b60 (patch) | |
| tree | 6731697cd5520c0e29818f4ee922e62a56dbddf9 /chrome/renderer/renderer_webkitclient_impl.cc | |
| parent | 0c6fbd6e38d3fc5c04cbc22fe769e766f814253b (diff) | |
| download | chromium_src-60cba79ac19628c205fce7cfdfd7845c1c3b6b60.zip chromium_src-60cba79ac19628c205fce7cfdfd7845c1c3b6b60.tar.gz chromium_src-60cba79ac19628c205fce7cfdfd7845c1c3b6b60.tar.bz2 | |
Cleans up a bit the DB-related methods.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/394006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_webkitclient_impl.cc')
| -rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index cec8119..43c568f 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -300,7 +300,7 @@ WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters( //------------------------------------------------------------------------------ WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile( - const WebString& file_name, int desired_flags, + const WebString& vfs_file_name, int desired_flags, WebKitClient::FileHandle* dir_handle) { DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance(); int message_id = db_message_filter->GetUniqueID(); @@ -316,8 +316,7 @@ WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile( ViewMsg_DatabaseOpenFileResponse_Params result = db_message_filter->SendAndWait( new ViewHostMsg_DatabaseOpenFile( - FilePath(webkit_glue::WebStringToFilePathString(file_name)), - desired_flags, message_id), + vfs_file_name, desired_flags, message_id), message_id, default_response); #if defined(OS_WIN) @@ -334,35 +333,29 @@ WebKitClient::FileHandle RendererWebKitClientImpl::databaseOpenFile( } int RendererWebKitClientImpl::databaseDeleteFile( - const WebString& file_name, bool sync_dir) { + const WebString& vfs_file_name, bool sync_dir) { DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance(); int message_id = db_message_filter->GetUniqueID(); return db_message_filter->SendAndWait( - new ViewHostMsg_DatabaseDeleteFile( - FilePath(webkit_glue::WebStringToFilePathString(file_name)), sync_dir, - message_id), + new ViewHostMsg_DatabaseDeleteFile(vfs_file_name, sync_dir, message_id), message_id, SQLITE_IOERR_DELETE); } long RendererWebKitClientImpl::databaseGetFileAttributes( - const WebString& file_name) { + const WebString& vfs_file_name) { DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance(); int message_id = db_message_filter->GetUniqueID(); return db_message_filter->SendAndWait( - new ViewHostMsg_DatabaseGetFileAttributes( - FilePath(webkit_glue::WebStringToFilePathString(file_name)), - message_id), + new ViewHostMsg_DatabaseGetFileAttributes(vfs_file_name, message_id), message_id, -1L); } long long RendererWebKitClientImpl::databaseGetFileSize( - const WebString& file_name) { + const WebString& vfs_file_name) { DBMessageFilter* db_message_filter = DBMessageFilter::GetInstance(); int message_id = db_message_filter->GetUniqueID(); return db_message_filter->SendAndWait( - new ViewHostMsg_DatabaseGetFileSize( - FilePath(webkit_glue::WebStringToFilePathString(file_name)), - message_id), + new ViewHostMsg_DatabaseGetFileSize(vfs_file_name, message_id), message_id, 0LL); } |