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

Unified Diff: components/plugins/renderer/plugin_placeholder.cc

Issue 135543002: Explicitly cut link between WebViewPlugin and PluginPlaceholder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | « components/plugins/renderer/plugin_placeholder.h ('k') | components/plugins/renderer/webview_plugin.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/plugins/renderer/plugin_placeholder.cc
diff --git a/components/plugins/renderer/plugin_placeholder.cc b/components/plugins/renderer/plugin_placeholder.cc
index f99ee489fb6de122f4533dfe261fc63e682ab083..14aff7023fce2a53ae506736fe8e47e5c571d836 100644
--- a/components/plugins/renderer/plugin_placeholder.cc
+++ b/components/plugins/renderer/plugin_placeholder.cc
@@ -88,7 +88,6 @@ void PluginPlaceholder::ReplacePlugin(WebPlugin* new_plugin) {
// will be destroyed as soon as V8 garbage collects us.
if (!element.pluginContainer()) {
plugin_->destroy();
- plugin_ = NULL;
return;
}
@@ -102,7 +101,6 @@ void PluginPlaceholder::ReplacePlugin(WebPlugin* new_plugin) {
container->reportGeometry();
plugin_->ReplayReceivedData(new_plugin);
plugin_->destroy();
- plugin_ = NULL;
}
void PluginPlaceholder::HidePlugin() {
@@ -174,6 +172,10 @@ void PluginPlaceholder::ShowContextMenu(const WebMouseEvent& event) {
return;
}
+void PluginPlaceholder::PluginDestroyed() {
+ plugin_ = NULL;
+}
+
void PluginPlaceholder::OnDestruct() {
frame_ = NULL;
}
« no previous file with comments | « components/plugins/renderer/plugin_placeholder.h ('k') | components/plugins/renderer/webview_plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698