| Index: chrome/browser/renderer_host/resource_message_filter_gtk.cc
|
| diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
|
| index 97e1c1426260bc94debe332993ad0d909ef412dd..dcd3d19de6152719f0ac03507534e7b09299283a 100644
|
| --- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc
|
| +++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
|
| @@ -82,7 +82,7 @@ void ResourceMessageFilter::DoOnGetWindowRect(gfx::NativeViewId view,
|
|
|
| ViewHostMsg_GetWindowRect::WriteReplyParams(reply_msg, rect);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -125,7 +125,7 @@ void ResourceMessageFilter::DoOnGetRootWindowRect(gfx::NativeViewId view,
|
|
|
| ViewHostMsg_GetRootWindowRect::WriteReplyParams(reply_msg, rect);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -139,7 +139,7 @@ void ResourceMessageFilter::DoOnClipboardIsFormatAvailable(
|
|
|
| ViewHostMsg_ClipboardIsFormatAvailable::WriteReplyParams(reply_msg, result);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -153,7 +153,7 @@ void ResourceMessageFilter::DoOnClipboardReadText(Clipboard::Buffer buffer,
|
|
|
| ViewHostMsg_ClipboardReadText::WriteReplyParams(reply_msg, result);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -167,7 +167,7 @@ void ResourceMessageFilter::DoOnClipboardReadAsciiText(
|
|
|
| ViewHostMsg_ClipboardReadAsciiText::WriteReplyParams(reply_msg, result);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -183,7 +183,34 @@ void ResourceMessageFilter::DoOnClipboardReadHTML(Clipboard::Buffer buffer,
|
|
|
| ViewHostMsg_ClipboardReadHTML::WriteReplyParams(reply_msg, markup, src_url);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| + ChromeThread::IO, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| +}
|
| +
|
| +// Called on the UI thread.
|
| +void ResourceMessageFilter::DoOnClipboardReadAvailableTypes(
|
| + Clipboard::Buffer buffer, IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| + ChromeThread::IO, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| +}
|
| +
|
| +// Called on the UI thread.
|
| +void ResourceMessageFilter::DoOnClipboardReadData(Clipboard::Buffer buffer,
|
| + const string16& type,
|
| + IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| + ChromeThread::IO, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| +}
|
| +// Called on the UI thread.
|
| +void ResourceMessageFilter::DoOnClipboardReadFilenames(
|
| + Clipboard::Buffer buffer, IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -223,7 +250,7 @@ void ResourceMessageFilter::DoOnAllocateTempFileForPrinting(
|
| ViewHostMsg_AllocateTempFileForPrinting::WriteReplyParams(
|
| reply_msg, temp_file_fd, fd_in_browser);
|
|
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::IO, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::SendDelayedReply, reply_msg));
|
| @@ -241,7 +268,7 @@ void ResourceMessageFilter::OnGetScreenInfo(gfx::NativeViewId view,
|
| // Called on the IO thread.
|
| void ResourceMessageFilter::OnGetWindowRect(gfx::NativeViewId view,
|
| IPC::Message* reply_msg) {
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::BACKGROUND_X11, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::DoOnGetWindowRect, view, reply_msg));
|
| @@ -250,7 +277,7 @@ void ResourceMessageFilter::OnGetWindowRect(gfx::NativeViewId view,
|
| // Called on the IO thread.
|
| void ResourceMessageFilter::OnGetRootWindowRect(gfx::NativeViewId view,
|
| IPC::Message* reply_msg) {
|
| - ChromeThread::PostTask(
|
| + ChromeThread::PostTask(
|
| ChromeThread::BACKGROUND_X11, FROM_HERE,
|
| NewRunnableMethod(
|
| this, &ResourceMessageFilter::DoOnGetRootWindowRect, view,
|
| @@ -299,6 +326,36 @@ void ResourceMessageFilter::OnClipboardReadHTML(Clipboard::Buffer buffer,
|
| }
|
|
|
| // Called on the IO thread.
|
| +void ResourceMessageFilter::OnClipboardReadAvailableTypes(
|
| + Clipboard::Buffer buffer, IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| + ChromeThread::UI, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::DoOnClipboardReadAvailableTypes, buffer,
|
| + reply_msg));
|
| +}
|
| +
|
| +// Called on the IO thread.
|
| +void ResourceMessageFilter::OnClipboardReadData(
|
| + Clipboard::Buffer buffer, const string16& type, IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| + ChromeThread::UI, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::DoOnClipboardReadData, buffer, type,
|
| + reply_msg));
|
| +}
|
| +
|
| +// Called on the IO thread.
|
| +void ResourceMessageFilter::OnClipboardReadFilenames(
|
| + Clipboard::Buffer buffer, IPC::Message* reply_msg) {
|
| + ChromeThread::PostTask(
|
| + ChromeThread::UI, FROM_HERE,
|
| + NewRunnableMethod(
|
| + this, &ResourceMessageFilter::DoOnClipboardReadFilenames, buffer,
|
| + reply_msg));
|
| +}
|
| +
|
| +// Called on the IO thread.
|
| void ResourceMessageFilter::OnAllocateTempFileForPrinting(
|
| IPC::Message* reply_msg) {
|
| ChromeThread::PostTask(
|
|
|