Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1983)

Unified Diff: content/renderer/java/java_bridge_dispatcher.cc

Issue 18570003: Move Renderer-side NPObject owner tracking to JavaBridgeChannel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move some comment cleanup to crrev.com/17428003 Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/java/java_bridge_dispatcher.cc
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
index e8ce6abe447c4bc2f2367a68fa6fb700bf46a2de..c0b599454eec8996f68dbfa81d13335dedeac82c 100644
--- a/content/renderer/java/java_bridge_dispatcher.cc
+++ b/content/renderer/java/java_bridge_dispatcher.cc
@@ -18,8 +18,7 @@
namespace content {
JavaBridgeDispatcher::JavaBridgeDispatcher(RenderView* render_view)
- : RenderViewObserver(render_view), owner_id_(new struct _NPP) {
- WebKit::WebBindings::registerObjectOwner(owner_id_.get());
+ : RenderViewObserver(render_view) {
}
void JavaBridgeDispatcher::EnsureChannelIsSetUp() {
@@ -32,9 +31,6 @@ void JavaBridgeDispatcher::EnsureChannelIsSetUp() {
channel_ = JavaBridgeChannel::GetJavaBridgeChannel(
channel_handle, ChildProcess::current()->io_message_loop_proxy());
-
- // All objects received from the Browser process belong to us.
- channel_->SetDefaultNPObjectOwner(owner_id_.get());
}
JavaBridgeDispatcher::~JavaBridgeDispatcher() {
@@ -42,8 +38,6 @@ JavaBridgeDispatcher::~JavaBridgeDispatcher() {
iter != objects_.end(); ++iter) {
WebKit::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
}
-
- WebKit::WebBindings::unregisterObjectOwner(owner_id_.get());
}
bool JavaBridgeDispatcher::OnMessageReceived(const IPC::Message& msg) {

Powered by Google App Engine
This is Rietveld 408576698