JavaBridge should use Annotation

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>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/linked_ptr.h"
 #include "content/browser/renderer_host/java/java_method.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
 // Wrapper around a Java object.
 //
 // Represents a Java object for use in the Java bridge. Holds a global ref to
 // the Java object and provides the ability to invoke methods on it.
 // 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. Also takes
-  // a boolean that determines whether or not inherited methods are allowed
-  // to be called as well.  This property propagates to all Objects that get
-  // implicitly exposed as return values as well. Returns an NPObject with
+  // a boolean that determines whether or not methods require the safe
+  // annotation to be exposed.  This property propagates to all Objects that

[joth, 2012/08/04 20:38:28]

takes a boolean that determines whether or not methods require an explicit
annotation marking them as safe to be exposed to JavaScript. 

[Steve Block, 2012/08/06 12:12:30]

Or 'The require_safe_annotation flag specifies whether only methods with the
JavaScriptInterface annotation are exposed to JavaScript.'

[palmer, 2012/08/06 17:31:26]

+1 to this version of the explanation.

[David Trainor- moved to gerrit, 2012/08/06 23:42:33]

Done.

+  // get implicitly exposed as return values as well. Returns an NPObject with
   // a ref count of one which owns the JavaBoundObject.
   static NPObject* Create(const base::android::JavaRef<jobject>& object,
-                          bool allow_inherited_methods);
+                          bool require_safe_annotation);
 
   virtual ~JavaBoundObject();
 
   // Gets a global ref to the underlying JavaObject from a JavaBoundObject
   // wrapped as an NPObject. Ownership of the global ref is retained by the
   // JavaBoundObject: the caller must NOT release it.
   static jobject GetJavaObject(NPObject* object);
 
   // Methods to implement the NPObject callbacks.
   bool HasMethod(const std::string& name) const;
   bool Invoke(const std::string& name, const NPVariant* args, size_t arg_count,
               NPVariant* result);
 
  private:
   explicit JavaBoundObject(const base::android::JavaRef<jobject>& object,
-                           bool allow_inherited_methods);
+                           bool require_safe_annotation);
 
   void EnsureMethodsAreSetUp() const;
 
   // The global ref to the underlying Java object that this JavaBoundObject
   // instance represents.
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
 
   // Map of public methods, from method name to Method instance. Multiple
   // entries will be present for overloaded methods. Note that we can't use
   // scoped_ptr in STL containers as we can't copy it.
   typedef std::multimap<std::string, linked_ptr<JavaMethod> > JavaMethodMap;
   mutable JavaMethodMap methods_;
   mutable bool are_methods_set_up_;
 
-  bool allow_inherited_methods_;
+  bool require_safe_annotation_;

[joth, 2012/08/04 20:38:28]

const bool

[David Trainor- moved to gerrit, 2012/08/06 23:42:33]

Done.

 
   DISALLOW_IMPLICIT_CONSTRUCTORS(JavaBoundObject);
 };
 
+bool RegisterJavaBoundObject(JNIEnv* env);
+
 #endif  // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BOUND_OBJECT_H_