Use JavaObjectWeakGlobalRef in ContentViewCore.

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"
@@ skipping 38 matching lines @@
   POPUP_ITEM_TYPE_ENABLED
 };
 
 namespace {
 jfieldID g_native_content_view;
 }  // namespace
 
 namespace content {
 
 struct ContentViewCoreImpl::JavaObject {
-  jweak obj;
 
-  ScopedJavaLocalRef<jobject> View(JNIEnv* env) {
-    return GetRealObject(env, obj);
-  }
 };
 
 // ----------------------------------------------------------------------------
 // Implementation of static ContentViewCore public interfaces
 
 ContentViewCore* ContentViewCore::Create(JNIEnv* env, jobject obj,
                                          WebContents* web_contents) {
   return new ContentViewCoreImpl(env, obj, web_contents);
 }
 
 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_(static_cast<WebContentsImpl*>(web_contents)),
+    : java_ref_(env, obj),
+      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;
-  }
+  delete java_object_;
+  java_object_ = NULL;
+  java_ref_.reset();
 }
 
 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());
+      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;
     }
   }
 
   // TODO(jrg)
 }
 
 void ContentViewCoreImpl::InitJNI(JNIEnv* env, jobject obj) {
   java_object_ = new JavaObject;
-  java_object_->obj = env->NewWeakGlobalRef(obj);
 }
 
 RenderWidgetHostViewAndroid*
     ContentViewCoreImpl::GetRenderWidgetHostViewAndroid() {
   RenderWidgetHostView* rwhv = NULL;
   if (web_contents_)
     rwhv = web_contents_->GetRenderWidgetHostView();
   return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
 }
 
@@ skipping 306 matching lines @@
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::SetTitle(const string16& title) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::ShowSelectPopupMenu(
     const std::vector<WebMenuItem>& items, int selected_item, bool multiple) {
   JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
 
   // For multi-select list popups we find the list of previous selections by
   // iterating through the items. But for single selection popups we take the
   // given |selected_item| as is.
   ScopedJavaLocalRef<jintArray> selected_array;
   if (multiple) {
     scoped_array<jint> native_selected_array(new jint[items.size()]);
     size_t selected_count = 0;
     for (size_t i = 0; i < items.size(); ++i) {
       if (items[i].checked)
@@ skipping 16 matching lines @@
   for (size_t i = 0; i < items.size(); ++i) {
     labels.push_back(items[i].label);
     jint enabled =
         (items[i].type == WebMenuItem::GROUP ? POPUP_ITEM_TYPE_GROUP :
             (items[i].enabled ? POPUP_ITEM_TYPE_ENABLED :
                 POPUP_ITEM_TYPE_DISABLED));
     env->SetIntArrayRegion(enabled_array.obj(), i, 1, &enabled);
   }
   ScopedJavaLocalRef<jobjectArray> items_array(
       base::android::ToJavaArrayOfStrings(env, labels));
-  Java_ContentViewCore_showSelectPopup(env, java_object_->View(env).obj(),
+  Java_ContentViewCore_showSelectPopup(env, j_obj.obj(),
                                        items_array.obj(), enabled_array.obj(),
                                        multiple, selected_array.obj());
 }
 
 void ContentViewCoreImpl::ConfirmTouchEvent(bool handled) {
-  // TODO(yusufo): Upstream changes for http://crbug/139386 to match upstream
-  // to downstream.
   JNIEnv* env = AttachCurrentThread();
-  Java_ContentViewCore_confirmTouchEvent(env,
-                                         java_object_->View(env).obj(),
-                                         handled);
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
+  Java_ContentViewCore_confirmTouchEvent(env, j_obj.obj(), handled);
 }
 
 void ContentViewCoreImpl::DidSetNeedTouchEvents(bool need_touch_events) {
   JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
   Java_ContentViewCore_didSetNeedTouchEvents(env,
-                                             java_object_->View(env).obj(),
+                                             j_obj.obj(),
                                              need_touch_events);
 }
 
 bool ContentViewCoreImpl::HasFocus() {
   NOTIMPLEMENTED() << "not upstreamed yet";
   return false;
 }
 
 void ContentViewCoreImpl::OnSelectionChanged(const std::string& text) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::OnSelectionBoundsChanged(
     int startx,
     int starty,
     base::i18n::TextDirection start_dir,
     int endx,
     int endy,
     base::i18n::TextDirection end_dir) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::DidStartLoading() {
   JNIEnv* env = AttachCurrentThread();
-  Java_ContentViewCore_didStartLoading(env, java_object_->View(env).obj());
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
+  Java_ContentViewCore_didStartLoading(env, j_obj.obj());
 }
 
 void ContentViewCoreImpl::OnAcceleratedCompositingStateChange(
     RenderWidgetHostViewAndroid* rwhva, bool activated, bool force) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
   JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
+  if (j_obj.is_null())
+    return;
   ScopedJavaLocalRef<jstring> jcontent_url =
       ConvertUTF8ToJavaString(env, content_url.spec());
   Java_ContentViewCore_startContentIntent(env,
-                                          java_object_->View(env).obj(),
+                                          j_obj.obj(),
                                           jcontent_url.obj());
 }
 
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
 gfx::Rect ContentViewCoreImpl::GetBounds() const {
   NOTIMPLEMENTED() << "not upstreamed yet";
   return gfx::Rect();
@@ skipping 10 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