summaryrefslogtreecommitdiffstats
path: root/components/plugins/renderer/plugin_placeholder.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 17:28:37 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-14 17:28:37 +0000
commit61e1346cd1ddd74adf201b82313428156373cc00 (patch)
tree6698e1c161c450fe848a43f6ee6f8b32e9d377e2 /components/plugins/renderer/plugin_placeholder.cc
parentbf5320000a2a36b635220fcbb4dd3ab98908631a (diff)
downloadchromium_src-61e1346cd1ddd74adf201b82313428156373cc00.zip
chromium_src-61e1346cd1ddd74adf201b82313428156373cc00.tar.gz
chromium_src-61e1346cd1ddd74adf201b82313428156373cc00.tar.bz2
Don't try to load a plugin after the webview plugin is gone
BUG=334082 R=bauerb@chromium.org,inferno@chromium.org Review URL: https://codereview.chromium.org/134773003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/plugins/renderer/plugin_placeholder.cc')
-rw-r--r--components/plugins/renderer/plugin_placeholder.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/plugins/renderer/plugin_placeholder.cc b/components/plugins/renderer/plugin_placeholder.cc
index deb64d7..3ad1799 100644
--- a/components/plugins/renderer/plugin_placeholder.cc
+++ b/components/plugins/renderer/plugin_placeholder.cc
@@ -201,6 +201,8 @@ void PluginPlaceholder::LoadPlugin() {
// event propagation changes between "close" vs. "click-to-play".
if (hidden_)
return;
+ if (!plugin_)
+ return;
if (!allow_loading_) {
NOTREACHED();
return;