Hook up ContentViewCore.add/removeJavascriptInterface()

content/browser/android/content_view_core_impl.cc

 // 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.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "content/browser/android/content_view_client.h"
+#include "content/browser/renderer_host/java/java_bound_object.h"
+#include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ContentViewCore_jni.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
+using base::android::ConvertJavaStringToUTF16;

[Ted C, 2012/07/27 18:09:04]

move under AttachCurrentThread

[Steve Block, 2012/07/30 11:45:14]

Done.

 using base::android::HasField;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 // Describes the type and enabled state of a select popup item.
 // Keep in sync with the value defined in SelectPopupDialog.java
 enum PopupItemType {
   POPUP_ITEM_TYPE_GROUP = 0,
   POPUP_ITEM_TYPE_DISABLED,
   POPUP_ITEM_TYPE_ENABLED
@@ skipping 24 matching lines @@
 ContentViewCore* ContentViewCore::GetNativeContentViewCore(JNIEnv* env,
                                                            jobject obj) {
   return reinterpret_cast<ContentViewCore*>(
       env->GetIntField(obj, g_native_content_view));
 }
 
 // ----------------------------------------------------------------------------
 
 ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
                                          WebContents* web_contents)
-    : web_contents_(web_contents),
+    : web_contents_impl_(static_cast<WebContentsImpl*>(web_contents)),

[jam, 2012/07/27 23:29:57]

nit: just keep it web_contents_, even if it is a WebContentsImpl

[Steve Block, 2012/07/30 11:45:14]

Done.

       tab_crashed_(false) {
   DCHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   InitJNI(env, obj);
 }
 
 ContentViewCoreImpl::~ContentViewCoreImpl() {
   if (java_object_) {
     JNIEnv* env = AttachCurrentThread();
@@ skipping 61 matching lines @@
   if (web_contents()->GetURL().is_empty() || !content_view_client_.get())
     return static_cast<jdouble>(1.0);
   return static_cast<jdouble>(content_view_client_->GetLoadProgress());
 }
 
 jboolean ContentViewCoreImpl::IsIncognito(JNIEnv* env, jobject obj) {
   return web_contents()->GetBrowserContext()->IsOffTheRecord();
 }
 
 jboolean ContentViewCoreImpl::CanGoBack(JNIEnv* env, jobject obj) {
-  return web_contents_->GetController().CanGoBack();
+  return web_contents_impl_->GetController().CanGoBack();
 }
 
 jboolean ContentViewCoreImpl::CanGoForward(JNIEnv* env, jobject obj) {
-  return web_contents_->GetController().CanGoForward();
+  return web_contents_impl_->GetController().CanGoForward();
 }
 
 jboolean ContentViewCoreImpl::CanGoToOffset(JNIEnv* env, jobject obj,
                                             jint offset) {
-  return web_contents_->GetController().CanGoToOffset(offset);
+  return web_contents_impl_->GetController().CanGoToOffset(offset);
 }
 
 void ContentViewCoreImpl::GoBack(JNIEnv* env, jobject obj) {
-  web_contents_->GetController().GoBack();
+  web_contents_impl_->GetController().GoBack();
   tab_crashed_ = false;
 }
 
 void ContentViewCoreImpl::GoForward(JNIEnv* env, jobject obj) {
-  web_contents_->GetController().GoForward();
+  web_contents_impl_->GetController().GoForward();
   tab_crashed_ = false;
 }
 
 void ContentViewCoreImpl::GoToOffset(JNIEnv* env, jobject obj, jint offset) {
-  web_contents_->GetController().GoToOffset(offset);
+  web_contents_impl_->GetController().GoToOffset(offset);
 }
 
 void ContentViewCoreImpl::StopLoading(JNIEnv* env, jobject obj) {
-  web_contents_->Stop();
+  web_contents_impl_->Stop();
 }
 
 void ContentViewCoreImpl::Reload(JNIEnv* env, jobject obj) {
   // Set check_for_repost parameter to false as we have no repost confirmation
   // dialog ("confirm form resubmission" screen will still appear, however).
-  web_contents_->GetController().Reload(false);
+  web_contents_impl_->GetController().Reload(false);
   tab_crashed_ = false;
 }
 
 void ContentViewCoreImpl::ClearHistory(JNIEnv* env, jobject obj) {
-  web_contents_->GetController().PruneAllButActive();
+  web_contents_impl_->GetController().PruneAllButActive();
 }
 
 jboolean ContentViewCoreImpl::NeedsReload(JNIEnv* env, jobject obj) {
-  return web_contents_->GetController().NeedsReload();
+  return web_contents_impl_->GetController().NeedsReload();
 }
 
 void ContentViewCoreImpl::SetClient(JNIEnv* env, jobject obj, jobject jclient) {
   scoped_ptr<ContentViewClient> client(
       ContentViewClient::CreateNativeContentViewClient(env, jclient));
 
-  web_contents_->SetDelegate(client.get());
+  web_contents_impl_->SetDelegate(client.get());
 
   content_view_client_.swap(client);
 }
 
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::LoadUrl(const GURL& url, int page_transition) {
   content::Referrer referer;
@@ skipping 127 matching lines @@
                                           jcontent_url.obj());
 }
 
 // --------------------------------------------------------------------------
 // Methods called from Java via JNI
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
                                                jintArray indices) {
   RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
-      web_contents_->GetRenderViewHost());
+      web_contents_impl_->GetRenderViewHost());
   DCHECK(rvhi);
   if (indices == NULL) {
     rvhi->DidCancelPopupMenu();
     return;
   }
 
   int selected_count = env->GetArrayLength(indices);
   std::vector<int> selected_indices;
   jint* indices_ptr = env->GetIntArrayElements(indices, NULL);
   for (int i = 0; i < selected_count; ++i)
     selected_indices.push_back(indices_ptr[i]);
   env->ReleaseIntArrayElements(indices, indices_ptr, JNI_ABORT);
   rvhi->DidSelectPopupMenuItems(selected_indices);
 }
 
+void ContentViewCoreImpl::AddJavascriptInterface(
+    JNIEnv* env,
+    jobject /* obj */,
+    jobject object,
+    jstring name,
+    jboolean allow_inherited_methods) {
+  ScopedJavaLocalRef<jobject> scoped_object(env, object);
+  // JavaBoundObject creates the NPObject with a ref count of 1, and
+  // JavaBridgeDispatcherHostManager takes its own ref.
+  NPObject* bound_object = JavaBoundObject::Create(scoped_object,
+                                                   allow_inherited_methods);
+  web_contents_impl_->java_bridge_dispatcher_host_manager()->AddNamedObject(
+      ConvertJavaStringToUTF16(env, name), bound_object);
+  WebKit::WebBindings::releaseObject(bound_object);
+}
+
+void ContentViewCoreImpl::RemoveJavascriptInterface(JNIEnv* env,
+                                                    jobject /* obj */,
+                                                    jstring name) {
+  web_contents_impl_->java_bridge_dispatcher_host_manager()->RemoveNamedObject(
+      ConvertJavaStringToUTF16(env, name));
+}
+
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
 gfx::Rect ContentViewCoreImpl::GetBounds() const {
   NOTIMPLEMENTED() << "not upstreamed yet";
   return gfx::Rect();
 }
 
 // ----------------------------------------------------------------------------
 
 bool RegisterContentViewCore(JNIEnv* env) {
   if (!base::android::HasClass(env, kContentViewCoreClassPath)) {
     DLOG(ERROR) << "Unable to find class ContentViewCore!";
     return false;
   }
   ScopedJavaLocalRef<jclass> clazz = GetClass(env, kContentViewCoreClassPath);
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content