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

Unified Diff: chrome/renderer/webplugin_delegate_pepper.cc

Issue 529004: Fixed some bugs that prevented the GPU plugin from shutting down without cras... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 | « no previous file | gpu/command_buffer/client/gles2_implementation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_pepper.cc
===================================================================
--- chrome/renderer/webplugin_delegate_pepper.cc (revision 35801)
+++ chrome/renderer/webplugin_delegate_pepper.cc (working copy)
@@ -129,6 +129,15 @@
instance_ = 0;
}
+
+ // Destroy the nested GPU plugin only after first destroying the underlying
+ // Pepper plugin. This is so the Pepper plugin does not attempt to issue
+ // rendering commands after the GPU plugin has stopped processing them and
+ // responding to them.
+ if (nested_delegate_) {
+ nested_delegate_->PluginDestroyed();
+ nested_delegate_ = NULL;
+ }
}
void WebPluginDelegatePepper::UpdateGeometry(
@@ -579,10 +588,6 @@
}
void WebPluginDelegatePepper::PluginDestroyed() {
- if (nested_delegate_) {
- nested_delegate_->PluginDestroyed();
- nested_delegate_ = NULL;
- }
delete this;
}
« no previous file with comments | « no previous file | gpu/command_buffer/client/gles2_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698