Revert 176773

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 "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "base/values.h"
 #include "cc/layer.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.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/compositor_impl_android.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"
@@ skipping 143 matching lines @@
 
   InitJNI(env, obj);
 
   if (!gfx::Screen::GetNativeScreen()->IsDIPEnabled()) {
     dpi_scale_ = 1;
   } else {
     scoped_ptr<content::DeviceInfo> device_info(new content::DeviceInfo());
     dpi_scale_ = device_info->GetDPIScale();
   }
 
+  notification_registrar_.Add(this,
+                              NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
+                              NotificationService::AllSources());
+
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
   // Automatically set it for all WebContents so that it is available when a
   // NavigationEntry requires the user agent to be overridden.
   const char kLinuxInfoStr[] = "X11; Linux x86_64";
   std::string product = content::GetContentClient()->GetProduct();
   std::string spoofed_ua =
       webkit_glue::BuildUserAgentFromOSAndProduct(kLinuxInfoStr, product);
   web_contents->SetUserAgentOverride(spoofed_ua);
 
@@ skipping 74 matching lines @@
         int pid = GetRenderProcessIdFromRenderViewHost(
             web_contents_->GetRenderViewHost());
         JNIEnv* env = AttachCurrentThread();
         ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
         if (!obj.is_null()) {
           Java_ContentViewCore_onRenderProcessSwap(env, obj.obj(), 0, pid);
         }
       }
       break;
     }
+    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);
+      ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+      if (!j_obj.is_null()) {
+        Java_ContentViewCore_onEvaluateJavaScriptResult(env, j_obj.obj(),
+            static_cast<jint>(result_pair->first), j_json.obj());
+      }
+      break;
+    }
   }
 }
 
 void ContentViewCoreImpl::InitJNI(JNIEnv* env, jobject obj) {
   java_object_ = new JavaObject;
   java_object_->rect_clazz.Reset(GetClass(env, "android/graphics/Rect"));
   java_object_->rect_constructor = MethodID::Get<MethodID::TYPE_INSTANCE>(
       env, java_object_->rect_clazz.obj(), "<init>", "(IIII)V");
 }
 
@@ skipping 937 matching lines @@
 }
 
 void ContentViewCoreImpl::UndoScrollFocusedEditableNodeIntoView(
     JNIEnv* env,
     jobject obj) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   host->Send(
       new ViewMsg_UndoScrollFocusedEditableNodeIntoView(host->GetRoutingID()));
 }
 
-namespace {
-void JavaScriptResultCallback(ScopedJavaGlobalRef<jobject>* callback,
-                              const base::Value* result) {
-  // |callback| is passed as base::Owned, so it will automatically be deleted
-  // when this base::Callback goes out of scope.
-  JNIEnv* env = base::android::AttachCurrentThread();
-  std::string json;
-  base::JSONWriter::Write(result, &json);
-  ScopedJavaLocalRef<jstring> j_json = ConvertUTF8ToJavaString(env, json);
-  Java_ContentViewCore_onEvaluateJavaScriptResult(env,
-                                                  j_json.obj(),
-                                                  callback->obj());
-}
-}  // namespace
-
-void ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
+jint ContentViewCoreImpl::EvaluateJavaScript(JNIEnv* env,
                                              jobject obj,
-                                             jstring script,
-                                             jobject callback) {
+                                             jstring script) {
   RenderViewHost* host = web_contents_->GetRenderViewHost();
   DCHECK(host);
 
-  if (!callback) {
-    // No callback requested.
-    host->ExecuteJavascriptInWebFrame(string16(),  // frame_xpath
-                                      ConvertJavaStringToUTF16(env, script));
-    return;
-  }
-
-  // Secure the Java callback in a scoped object and give ownership of it to the
-  // base::Callback.
-  ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
-  j_callback->Reset(env, callback);
-  content::RenderViewHost::JavascriptResultCallback c_callback =
-      base::Bind(&JavaScriptResultCallback, base::Owned(j_callback));
-
-  host->ExecuteJavascriptInWebFrameCallbackResult(
-      string16(),  // frame_xpath
-      ConvertJavaStringToUTF16(env, script),
-      c_callback);
+  string16 script_utf16 = ConvertJavaStringToUTF16(env, script);
+  return host->ExecuteJavascriptInWebFrameNotifyResult(string16(),
+                                                       script_utf16);
 }
 
 bool ContentViewCoreImpl::GetUseDesktopUserAgent(
     JNIEnv* env, jobject obj) {
   NavigationEntry* entry = web_contents_->GetController().GetActiveEntry();
   return entry && entry->GetIsOverridingUserAgent();
 }
 
 void ContentViewCoreImpl::ImeUpdateAdapter(int native_ime_adapter,
                                            int text_input_type,
@@ skipping 55 matching lines @@
           jboolean hardware_accelerated,
           jint native_web_contents,
           jint native_window) {
   ContentViewCoreImpl* view = new ContentViewCoreImpl(
       env, obj, input_events_delivered_at_vsync, hardware_accelerated,
       reinterpret_cast<WebContents*>(native_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(native_window));
   return reinterpret_cast<jint>(view);
 }
 
+jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script) {
+  ContentViewCoreImpl* view = static_cast<ContentViewCoreImpl*>(
+      ContentViewCore::GetNativeContentViewCore(env, obj));
+  DCHECK(view);
+
+  return view->EvaluateJavaScript(env, obj, script);
+}
+
 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