Move Renderer-side NPObject owner tracking to JavaBridgeChannel.

content/browser/renderer_host/java/java_bound_object.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_
 #define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 16 matching lines @@
 // Interrogation of the Java object for its methods is done lazily. This class
 // is not generally threadsafe. However, it does allow for instances to be
 // created and destroyed on different threads.
 class JavaBoundObject {
  public:
   // Takes a Java object and creates a JavaBoundObject around it. The
   // |require_annotation| flag specifies whether or not only methods with the
   // JavascriptInterface annotation are exposed to JavaScript.  This property
   // propagates to all Objects that get implicitly exposed as return values as
   // well. Returns an NPObject with a ref count of one which owns the
-  // JavaBoundObject.
+  // JavaBoundObject. The object is marked as owned by |owner|.
   // See also comment below for |manager_|.
   static NPObject* Create(
+      struct _NPP* owner,

[joth, 2013/07/02 20:49:03]

I thought in C++ it's fine to just declare this as "_NPP* owner" no 'struct'
needed, and chrome convention is to do it that way? (I have no strong opinion on
it though)

[Wez, 2013/07/02 21:05:09]

Yes. However, the NPAPI headers typedef struct _NPP to NPP, so we've used struct
_NPP for consistency.

       const base::android::JavaRef<jobject>& object,
       const base::android::JavaRef<jclass>& safe_annotation_clazz,
       const base::WeakPtr<JavaBridgeDispatcherHostManager>& manager);
 
   virtual ~JavaBoundObject();
 
   // Gets a local ref to the underlying JavaObject from a JavaBoundObject
   // wrapped as an NPObject. May return null if the underlying object has
   // been garbage collected.
   static base::android::ScopedJavaLocalRef<jobject> GetJavaObject(
@@ skipping 30 matching lines @@
   mutable bool are_methods_set_up_;
 
   base::android::ScopedJavaGlobalRef<jclass> safe_annotation_clazz_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JavaBoundObject);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_