summaryrefslogtreecommitdiffstats
path: root/content/public/renderer
diff options
context:
space:
mode:
authortommycli <tommycli@chromium.org>2016-03-22 11:52:03 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 18:53:05 +0000
commitb0969cf832c013ffdbcdeb34a576d918cce91b48 (patch)
treec01e6347041320753a8e7fb913ac98a6691ef5c1 /content/public/renderer
parent6cc34bcffc390095882ad2f490f71bf5de5ffeb1 (diff)
downloadchromium_src-b0969cf832c013ffdbcdeb34a576d918cce91b48.zip
chromium_src-b0969cf832c013ffdbcdeb34a576d918cce91b48.tar.gz
chromium_src-b0969cf832c013ffdbcdeb34a576d918cce91b48.tar.bz2
Plugins: Enforce that replacement plugins always succeed initialization.
There's currently ambiguity about what to do if the replacement plugin for Pepper or NPAPI fails initialization. In fact, the replacement plugin never does fail initialization, and it never should. This patch removes some complexity by enforcing that. BUG=588624 Review URL: https://codereview.chromium.org/1817643002 Cr-Commit-Position: refs/heads/master@{#382623}
Diffstat (limited to 'content/public/renderer')
-rw-r--r--content/public/renderer/content_renderer_client.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index b5c05cd..d602fece 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -107,6 +107,8 @@ class CONTENT_EXPORT ContentRendererClient {
// Creates a replacement plugin that is shown when the plugin at |file_path|
// couldn't be loaded. This allows the embedder to show a custom placeholder.
+ // This may return nullptr. However, if it does return a WebPlugin, it must
+ // never fail to initialize.
virtual blink::WebPlugin* CreatePluginReplacement(
RenderFrame* render_frame,
const base::FilePath& plugin_path);