summaryrefslogtreecommitdiffstats
path: root/content/renderer/browser_plugin/browser_plugin.h
diff options
context:
space:
mode:
authorfsamuel <fsamuel@chromium.org>2015-02-24 17:25:44 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-25 01:27:00 +0000
commit2e9413d8e27666cdd7961b5d17e7cb270bc48fc1 (patch)
tree32a85a2e106378f951d0efa42dcb6f2b528a3a72 /content/renderer/browser_plugin/browser_plugin.h
parent08b8639e0a7c0db180bf6ff8e2a4c54b103df3ef (diff)
downloadchromium_src-2e9413d8e27666cdd7961b5d17e7cb270bc48fc1.zip
chromium_src-2e9413d8e27666cdd7961b5d17e7cb270bc48fc1.tar.gz
chromium_src-2e9413d8e27666cdd7961b5d17e7cb270bc48fc1.tar.bz2
Decouple BrowserPlugin from RenderView
With the move to out-of-process iframes, RenderFrames and away from RenderViews, this CL removes routing via RenderView Routing ID from BrowserPlugin. Aside from BrowserPluginHostMsg_Attach, which creates a new BrowserPluginEmbedder in the associated WebContents on first call, all other IPCs are now CONTROL because they do not rely on routing IDs. BUG=436339, 330264 TBR=kenrb@chromium.org for mechanical change to make all BrowserPluginHostMsg IPCs except ATTACH CONTROL instead of ROUTED. Review URL: https://codereview.chromium.org/929243003 Cr-Commit-Position: refs/heads/master@{#317940}
Diffstat (limited to 'content/renderer/browser_plugin/browser_plugin.h')
-rw-r--r--content/renderer/browser_plugin/browser_plugin.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/content/renderer/browser_plugin/browser_plugin.h b/content/renderer/browser_plugin/browser_plugin.h
index b5287f4..47c405a 100644
--- a/content/renderer/browser_plugin/browser_plugin.h
+++ b/content/renderer/browser_plugin/browser_plugin.h
@@ -32,7 +32,7 @@ class CONTENT_EXPORT BrowserPlugin :
public:
static BrowserPlugin* GetFromNode(blink::WebNode& node);
- int render_view_routing_id() const { return render_view_routing_id_; }
+ int render_frame_routing_id() const { return render_frame_routing_id_; }
int browser_plugin_instance_id() const { return browser_plugin_instance_id_; }
bool attached() const { return attached_; }
@@ -168,10 +168,10 @@ class CONTENT_EXPORT BrowserPlugin :
// This indicates whether this BrowserPlugin has been attached to a
// WebContents and is ready to receive IPCs.
bool attached_;
- // We cache the |render_view_|'s routing ID because we need it on destruction.
- // If the |render_view_| is destroyed before the BrowserPlugin is destroyed
- // then we will attempt to access a NULL pointer.
- const int render_view_routing_id_;
+ // We cache the |render_frame_routing_id| because we need it on destruction.
+ // If the RenderFrame is destroyed before the BrowserPlugin is destroyed
+ // then we will attempt to access a nullptr.
+ const int render_frame_routing_id_;
blink::WebPluginContainer* container_;
gfx::Rect plugin_rect_;
// Bitmap for crashed plugin. Lazily initialized, non-owning pointer.