Upstream evaluateJavaScript

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 "base/json/json_writer.h"
 #include "content/browser/android/content_view_client.h"
 #include "content/browser/android/touch_point.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/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/interstitial_page.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ContentViewCore_jni.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertUTF16ToJavaString;
@@ skipping 44 matching lines @@
 // ----------------------------------------------------------------------------
 
 ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
                                          WebContents* web_contents)
     : web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       tab_crashed_(false) {
   DCHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   InitJNI(env, obj);
+
+  notification_registrar_.Add(this,
+                              NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
+                              NotificationService::AllSources());
 }
 
 ContentViewCoreImpl::~ContentViewCoreImpl() {
+  // Make sure nobody calls back into this object while we are tearing things
+  // down.
+  notification_registrar_.RemoveAll();
+
   if (java_object_) {
     JNIEnv* env = AttachCurrentThread();
     env->DeleteWeakGlobalRef(java_object_->obj);
     delete java_object_;
     java_object_ = 0;
   }
 }
 
 void ContentViewCoreImpl::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void ContentViewCoreImpl::Observe(int type,
                                   const NotificationSource& source,
                                   const NotificationDetails& details) {
+  switch (type) {
+    case NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT: {
+      if (!web_contents_ || Source<RenderViewHost>(source).ptr() !=
+          web_contents_->GetRenderViewHost()) {
+        return;
+      }
+
+      JNIEnv* env = base::android::AttachCurrentThread();
+      std::pair<int, Value*>* result_pair =
+          Details<std::pair<int, Value*> >(details).ptr();
+      std::string json;
+      base::JSONWriter::Write(result_pair->second, &json);
+      ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env,
+                                                                   json);
+      Java_ContentViewCore_onEvaluateJavaScriptResult(env,
+          java_object_->View(env).obj(),
+          static_cast<jint>(result_pair->first), j_json.obj());
+      break;
+    }
+  }
+
   // TODO(jrg)
 }
 
 void ContentViewCoreImpl::InitJNI(JNIEnv* env, jobject obj) {
   java_object_ = new JavaObject;
   java_object_->obj = env->NewWeakGlobalRef(obj);
 }
 
 RenderWidgetHostViewAndroid*
     ContentViewCoreImpl::GetRenderWidgetHostViewAndroid() {
@@ skipping 19 matching lines @@
 
   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);
 }
 
+jint ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env, jobject obj,
+                                             jstring script) {
+  RenderViewHost* host = web_contents_->GetRenderViewHost();
+  DCHECK(host);

[jam, 2012/07/31 18:20:44]

nit: unnecessary, if null will crash right below

[David Trainor- moved to gerrit, 2012/07/31 20:38:47]

Done.

+
+  string16 script_utf16 = ConvertJavaStringToUTF16(env, script);
+  return host->ExecuteJavascriptInWebFrameNotifyResult(string16(),
+                                                       script_utf16);
+}
+
 void ContentViewCoreImpl::LoadUrlWithoutUrlSanitization(JNIEnv* env,
                                                         jobject,
                                                         jstring jurl,
                                                         int page_transition) {
   GURL url(base::android::ConvertJavaStringToUTF8(env, jurl));
 
   LoadUrl(url, page_transition);
 }
 
 void ContentViewCoreImpl::LoadUrlWithoutUrlSanitizationWithUserAgentOverride(
@@ skipping 242 matching lines @@
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // This is called for each ContentViewCore.
 jint Init(JNIEnv* env, jobject obj, jint native_web_contents) {
   ContentViewCore* view = ContentViewCore::Create(
       env, obj, reinterpret_cast<WebContents*>(native_web_contents));
   return reinterpret_cast<jint>(view);
 }
 
+jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script) {
+  ContentViewCoreImpl* view =
+      (ContentViewCoreImpl*) ContentViewCore::GetNativeContentViewCore(env,

[jam, 2012/07/31 18:20:44]

google style is to not use c style casts. so use static_cast here

[David Trainor- moved to gerrit, 2012/07/31 20:38:47]

Done.

+                                                                       obj);
+  DCHECK(view);

[jam, 2012/07/31 18:20:44]

ditto

[David Trainor- moved to gerrit, 2012/07/31 20:38:47]

Done.

+
+  return view->EvaluateJavaScript(env, obj, script);
+}
+
 // --------------------------------------------------------------------------
 // Public methods that call to Java via JNI
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::OnTabCrashed(const base::ProcessHandle handle) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::SetTitle(const string16& title) {
   NOTIMPLEMENTED() << "not upstreamed yet";
@@ skipping 117 matching lines @@
   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