content/browser/android/content_view_core_impl.cc - Issue 18570003: Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/content_view_core_impl.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:

Index: content/browser/android/content_view_core_impl.cc

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc

index 57165bce34d92ff5a2fb9262ed76c5952c30e96e..79482022e4739eff4d10f9e939ab92b5e718397d 100644

--- a/content/browser/android/content_view_core_impl.cc

+++ b/content/browser/android/content_view_core_impl.cc

@@ -1215,8 +1215,9 @@ void ContentViewCoreImpl::AddJavascriptInterface(

JavaBridgeDispatcherHostManager* java_bridge =

web_contents_->java_bridge_dispatcher_host_manager();

java_bridge->SetRetainedObjectSet(weak_retained_object_set);

- NPObject* bound_object = JavaBoundObject::Create(scoped_object, scoped_clazz,

- java_bridge->AsWeakPtr());

+ NPObject* bound_object = JavaBoundObject::Create(

+ java_bridge->object_owner_id(), scoped_object, scoped_clazz,

+ java_bridge->AsWeakPtr());

java_bridge->AddNamedObject(ConvertJavaStringToUTF16(env, name),

bound_object);

WebKit::WebBindings::releaseObject(bound_object);