diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 00:48:19 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 00:48:19 +0000 |
| commit | 2d0f8902e73bc8c9c51e5593029290649c829fcc (patch) | |
| tree | abd46f9c1a7da6a877b04872a345984e93c0b5b5 /chrome/worker | |
| parent | 4b4172299b3b74557ba20d3d8c87d811cf502f39 (diff) | |
| download | chromium_src-2d0f8902e73bc8c9c51e5593029290649c829fcc.zip chromium_src-2d0f8902e73bc8c9c51e5593029290649c829fcc.tar.gz chromium_src-2d0f8902e73bc8c9c51e5593029290649c829fcc.tar.bz2 | |
Revert "Revert r63457, "WorkerWebKitClientImpl::mimeTypeForExtension should not use WorkerThread::current""
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_webkitclient_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index 1f74232..1755002 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -228,7 +228,7 @@ WebMimeRegistry::SupportsType WorkerWebKitClientImpl::supportsNonImageMIMEType( WebString WorkerWebKitClientImpl::mimeTypeForExtension( const WebString& file_extension) { std::string mime_type; - WorkerThread::current()->Send(new ViewHostMsg_GetMimeTypeFromExtension( + SendSyncMessageFromAnyThread(new ViewHostMsg_GetMimeTypeFromExtension( webkit_glue::WebStringToFilePathString(file_extension), &mime_type)); return ASCIIToUTF16(mime_type); } @@ -236,7 +236,7 @@ WebString WorkerWebKitClientImpl::mimeTypeForExtension( WebString WorkerWebKitClientImpl::mimeTypeFromFile( const WebString& file_path) { std::string mime_type; - WorkerThread::current()->Send(new ViewHostMsg_GetMimeTypeFromFile( + SendSyncMessageFromAnyThread(new ViewHostMsg_GetMimeTypeFromFile( FilePath(webkit_glue::WebStringToFilePathString(file_path)), &mime_type)); return ASCIIToUTF16(mime_type); @@ -245,7 +245,7 @@ WebString WorkerWebKitClientImpl::mimeTypeFromFile( WebString WorkerWebKitClientImpl::preferredExtensionForMIMEType( const WebString& mime_type) { FilePath::StringType file_extension; - WorkerThread::current()->Send( + SendSyncMessageFromAnyThread( new ViewHostMsg_GetPreferredExtensionForMimeType(UTF16ToASCII(mime_type), &file_extension)); return webkit_glue::FilePathStringToWebString(file_extension); |