Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Side by Side Diff: base/android/jni_weak_ref.cc

Issue 2769703007: Revert of Enable noexcept on Windows, use for a few move constructors. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « base/android/jni_weak_ref.h ('k') | base/values.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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( 22 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JavaObjectWeakGlobalRef&& orig)
23 JavaObjectWeakGlobalRef&& orig) noexcept
24 : obj_(orig.obj_) { 23 : obj_(orig.obj_) {
25 orig.obj_ = nullptr; 24 orig.obj_ = nullptr;
26 } 25 }
27 26
28 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JNIEnv* env, jobject obj) 27 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(JNIEnv* env, jobject obj)
29 : obj_(env->NewWeakGlobalRef(obj)) { 28 : obj_(env->NewWeakGlobalRef(obj)) {
30 } 29 }
31 30
32 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef( 31 JavaObjectWeakGlobalRef::JavaObjectWeakGlobalRef(
33 JNIEnv* env, 32 JNIEnv* env,
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 void JavaObjectWeakGlobalRef::Assign(const JavaObjectWeakGlobalRef& other) { 69 void JavaObjectWeakGlobalRef::Assign(const JavaObjectWeakGlobalRef& other) {
71 if (&other == this) 70 if (&other == this)
72 return; 71 return;
73 72
74 JNIEnv* env = AttachCurrentThread(); 73 JNIEnv* env = AttachCurrentThread();
75 if (obj_) 74 if (obj_)
76 env->DeleteWeakGlobalRef(obj_); 75 env->DeleteWeakGlobalRef(obj_);
77 76
78 obj_ = other.obj_ ? env->NewWeakGlobalRef(other.obj_) : nullptr; 77 obj_ = other.obj_ ? env->NewWeakGlobalRef(other.obj_) : nullptr;
79 } 78 }
OLDNEW
« no previous file with comments | « base/android/jni_weak_ref.h ('k') | base/values.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698