summaryrefslogtreecommitdiffstats
path: root/content/renderer/java/java_bridge_channel.h
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 04:29:40 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-08 04:29:40 +0000
commit27ec8b6653c97bf5ba26549b484cbaf878d40ccf (patch)
tree352c8fb96e1dac45a96d45d2703a8cee91b11b68 /content/renderer/java/java_bridge_channel.h
parente450068eb59ae9bac3013437432c608cc2b71ae7 (diff)
downloadchromium_src-27ec8b6653c97bf5ba26549b484cbaf878d40ccf.zip
chromium_src-27ec8b6653c97bf5ba26549b484cbaf878d40ccf.tar.gz
chromium_src-27ec8b6653c97bf5ba26549b484cbaf878d40ccf.tar.bz2
Move Renderer-side NPObject owner tracking to JavaBridgeChannel.
This is defensive against the possibility of a single JavaBridgeChannel to the Browser hosting multiple JavaBridgeDispatchers. BUG=152006 Review URL: https://chromiumcodereview.appspot.com/18570003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/java/java_bridge_channel.h')
-rw-r--r--content/renderer/java/java_bridge_channel.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/content/renderer/java/java_bridge_channel.h b/content/renderer/java/java_bridge_channel.h
index dbedceec..324a3a2 100644
--- a/content/renderer/java/java_bridge_channel.h
+++ b/content/renderer/java/java_bridge_channel.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_
#define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_CHANNEL_H_
+#include "base/memory/scoped_ptr.h"
#include "content/child/np_channel_base.h"
#include "ipc/ipc_channel_handle.h"
@@ -30,6 +31,10 @@ class JavaBridgeChannel : public content::NPChannelBase {
static NPChannelBase* ClassFactory() { return new JavaBridgeChannel(); }
+ // Dummy NPObject owner Id used to track objects owned by the JavaBridge
+ // peer in the Browser process.
+ scoped_ptr<struct _NPP> peer_owner_id_;
+
DISALLOW_COPY_AND_ASSIGN(JavaBridgeChannel);
};