diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 16:01:09 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 16:01:09 +0000 |
| commit | 96dcc176c46003af0176f0f4772affc741aa772a (patch) | |
| tree | b2f46757dc96b8503d4dae36b050c0af30db28a6 /chrome | |
| parent | f66a0ff593d3d4a54c02792e277b70c097fbc0af (diff) | |
| download | chromium_src-96dcc176c46003af0176f0f4772affc741aa772a.zip chromium_src-96dcc176c46003af0176f0f4772affc741aa772a.tar.gz chromium_src-96dcc176c46003af0176f0f4772affc741aa772a.tar.bz2 | |
When out-of-process PPAPI plugins fail to initialize, don't fall back on trying
to load them as NPAPI.
BUG=78115
Review URL: http://codereview.chromium.org/6771057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/chrome_content_renderer_client.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index c62755b..559339b 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -197,11 +197,17 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDS_PLUGIN_LOAD, true, true); } + bool pepper_plugin_was_registered = false; scoped_refptr<webkit::ppapi::PluginModule> pepper_module( - render_view->pepper_delegate_.CreatePepperPlugin(info.path)); - if (pepper_module) { - return render_view->CreatePepperPlugin( - frame, params, info.path, pepper_module.get()); + render_view->pepper_delegate_.CreatePepperPlugin( + info.path, + &pepper_plugin_was_registered)); + if (pepper_plugin_was_registered) { + if (pepper_module) { + return render_view->CreatePepperPlugin( + frame, params, info.path, pepper_module.get()); + } + return NULL; } return render_view->CreateNPAPIPlugin( |