| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/android/jni_weak_ref.h" | 5 #include "base/android/jni_weak_ref.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 | 11 |
| 12 using base::android::AttachCurrentThread; | 12 using base::android::AttachCurrentThread; |
| 13 | 13 |
| 14 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef() : obj_(nullptr) {} | 14 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef() : obj_(nullptr) {} |
| 15 | 15 |
| 16 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef( | 16 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef( |
| 17 const JavaObjectWeakGlobalRef& orig) | 17 const JavaObjectWeakGlobalRef& orig) |
| 18 : obj_(nullptr) { | 18 : obj_(nullptr) { |
| 19 Assign(orig); | 19 Assign(orig); |
| 20 } | 20 } |
| 21 | 21 |
| 22 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JavaObjectWeakGlobalRef&& orig) | 22 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JavaObjectWeakGlobalRef&& orig) |
| 23 : obj_(orig.obj_) { | 23 : obj_(orig.obj_) { |
| 24 orig.obj_ = nullptr; | 24 orig.obj_ = nullptr; |
| 25 } | 25 } |
| 26 | 26 |
| 27 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JNIEnv* env, jobject obj) | 27 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JNIEnv* env, jobject obj) |
| 28 : obj_(env->NewWeakGlobalRef(obj)) { | 28 : obj_(env->NewWeakGlobalRef(obj)) { |
| 29 DCHECK(obj_); | |
| 30 } | 29 } |
| 31 | 30 |
| 32 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef( | 31 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef( |
| 33 JNIEnv* env, | 32 JNIEnv* env, |
| 34 const base::android::JavaRef<jobject>& obj) | 33 const base::android::JavaRef<jobject>& obj) |
| 35 : obj_(env->NewWeakGlobalRef(obj.obj())) { | 34 : obj_(env->NewWeakGlobalRef(obj.obj())) { |
| 36 DCHECK(obj_); | |
| 37 } | 35 } |
| 38 | 36 |
| 39 JavaObjectWeakGlobalRef::~JavaObjectWeakGlobalRef() { | 37 JavaObjectWeakGlobalRef::~JavaObjectWeakGlobalRef() { |
| 40 reset(); | 38 reset(); |
| 41 } | 39 } |
| 42 | 40 |
| 43 void JavaObjectWeakGlobalRef::operator=(const JavaObjectWeakGlobalRef& rhs) { | 41 void JavaObjectWeakGlobalRef::operator=(const JavaObjectWeakGlobalRef& rhs) { |
| 44 Assign(rhs); | 42 Assign(rhs); |
| 45 } | 43 } |
| 46 | 44 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 71 void JavaObjectWeakGlobalRef::Assign(const JavaObjectWeakGlobalRef& other) { | 69 void JavaObjectWeakGlobalRef::Assign(const JavaObjectWeakGlobalRef& other) { |
| 72 if (&other == this) | 70 if (&other == this) |
| 73 return; | 71 return; |
| 74 | 72 |
| 75 JNIEnv* env = AttachCurrentThread(); | 73 JNIEnv* env = AttachCurrentThread(); |
| 76 if (obj_) | 74 if (obj_) |
| 77 env->DeleteWeakGlobalRef(obj_); | 75 env->DeleteWeakGlobalRef(obj_); |
| 78 | 76 |
| 79 obj_ = other.obj_ ? env->NewWeakGlobalRef(other.obj_) : nullptr; | 77 obj_ = other.obj_ ? env->NewWeakGlobalRef(other.obj_) : nullptr; |
| 80 } | 78 } |
| OLD | NEW |