summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 20:07:52 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-09 20:07:52 +0000
commit6f8b4138c5a67ef829c751469e2bc894ab47b635 (patch)
tree9225c9d09fc259a0a8138ec7a8882210e5d0c976 /webkit
parent1bd60c8b272167c1c43f1b0459991a9a31981476 (diff)
downloadchromium_src-6f8b4138c5a67ef829c751469e2bc894ab47b635.zip
chromium_src-6f8b4138c5a67ef829c751469e2bc894ab47b635.tar.gz
chromium_src-6f8b4138c5a67ef829c751469e2bc894ab47b635.tar.bz2
Revert 135901 - Terminate plugins as well as runing onunload handlers during slow shutdown.
This implementation uses the existing OnDestruct method. This is called in a state where webkit is still intact, so any callbacks by the plugin should still function properly. BUG=https://code.google.com/p/flapper/issues/detail?id=120 Review URL: https://chromiumcodereview.appspot.com/10383059 TBR=tsepez@chromium.org Review URL: https://chromiumcodereview.appspot.com/10386056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h
index f0c17aa..e05ca63 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -124,9 +124,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
// Does some pre-destructor cleanup on the instance. This is necessary
// because some cleanup depends on the plugin instance still existing (like
// calling the plugin's DidDestroy function). This function is called from
- // the WebPlugin implementation when WebKit is about to remove the plugin,
- // and may also be called directly by RenderViewImpl when a clean wekbit
- // shutdown is being skipped.
+ // the WebPlugin implementation when WebKit is about to remove the plugin.
void Delete();
// Paints the current backing store to the web page.