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

Unified Diff: content/renderer/pepper/pepper_in_process_router.cc

Issue 23688004: Change the PepperInProcessRouter to defer resource destruction messages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow previous behavior more closely. Created 7 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 | « content/renderer/pepper/pepper_in_process_router.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/pepper_in_process_router.cc
diff --git a/content/renderer/pepper/pepper_in_process_router.cc b/content/renderer/pepper/pepper_in_process_router.cc
index d5c0d429a40d40f1e17938a32785dc2a63f3160d..e4c9cc099d070d7dadd1bf186f3c01c0df38f9f4 100644
--- a/content/renderer/pepper/pepper_in_process_router.cc
+++ b/content/renderer/pepper/pepper_in_process_router.cc
@@ -110,9 +110,19 @@ bool PepperInProcessRouter::SendToHost(IPC::Message* msg) {
scoped_ptr<IPC::Message> message(msg);
if (!message->is_sync()) {
- bool result = host_impl_->GetPpapiHost()->OnMessageReceived(*message);
- DCHECK(result) << "The message was not handled by the host.";
- return true;
+ if (message->type() == PpapiHostMsg_ResourceDestroyed::ID) {
dmichael (off chromium) 2013/09/11 15:44:17 I think this deserves a beefier comment. Maybe ref
+ // Dispatch host messages from the message loop.
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(&PepperInProcessRouter::DispatchHostMsg,
+ weak_factory_.GetWeakPtr(),
+ base::Owned(message.release())));
+ return true;
+ } else {
+ bool result = host_impl_->GetPpapiHost()->OnMessageReceived(*message);
+ DCHECK(result) << "The message was not handled by the host.";
+ return true;
+ }
}
pending_message_id_ = IPC::SyncMessage::GetMessageId(*message);
@@ -146,6 +156,11 @@ bool PepperInProcessRouter::SendToPlugin(IPC::Message* msg) {
return true;
}
+void PepperInProcessRouter::DispatchHostMsg(IPC::Message* msg) {
+ bool handled = host_impl_->GetPpapiHost()->OnMessageReceived(*msg);
+ DCHECK(handled);
+}
+
void PepperInProcessRouter::DispatchPluginMsg(IPC::Message* msg) {
bool handled = OnPluginMsgReceived(*msg);
DCHECK(handled);
« no previous file with comments | « content/renderer/pepper/pepper_in_process_router.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698