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

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

Issue 1263333003: [Android] Avoid unnecessary JNI calls for empty string conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check exceptions... Created 5 years, 4 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 | « no previous file | base/android/jni_string_unittest.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_string.h" 5 #include "base/android/jni_string.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 10
(...skipping 11 matching lines...) Expand all
22 22
23 namespace base { 23 namespace base {
24 namespace android { 24 namespace android {
25 25
26 void ConvertJavaStringToUTF8(JNIEnv* env, jstring str, std::string* result) { 26 void ConvertJavaStringToUTF8(JNIEnv* env, jstring str, std::string* result) {
27 if (!str) { 27 if (!str) {
28 LOG(WARNING) << "ConvertJavaStringToUTF8 called with null string."; 28 LOG(WARNING) << "ConvertJavaStringToUTF8 called with null string.";
29 result->clear(); 29 result->clear();
30 return; 30 return;
31 } 31 }
32 const jsize length = env->GetStringLength(str);
33 if (!length) {
34 result->clear();
35 CheckException(env);
36 return;
37 }
32 // JNI's GetStringUTFChars() returns strings in Java "modified" UTF8, so 38 // JNI's GetStringUTFChars() returns strings in Java "modified" UTF8, so
33 // instead get the String in UTF16 and convert using chromium's conversion 39 // instead get the String in UTF16 and convert using chromium's conversion
34 // function that yields plain (non Java-modified) UTF8. 40 // function that yields plain (non Java-modified) UTF8.
35 const jchar* chars = env->GetStringChars(str, NULL); 41 const jchar* chars = env->GetStringChars(str, NULL);
36 DCHECK(chars); 42 DCHECK(chars);
37 UTF16ToUTF8(chars, env->GetStringLength(str), result); 43 UTF16ToUTF8(chars, length, result);
38 env->ReleaseStringChars(str, chars); 44 env->ReleaseStringChars(str, chars);
39 CheckException(env); 45 CheckException(env);
40 } 46 }
41 47
42 std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str) { 48 std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str) {
43 std::string result; 49 std::string result;
44 ConvertJavaStringToUTF8(env, str, &result); 50 ConvertJavaStringToUTF8(env, str, &result);
45 return result; 51 return result;
46 } 52 }
47 53
(...skipping 14 matching lines...) Expand all
62 return ScopedJavaLocalRef<jstring>(env, ConvertUTF16ToJavaStringImpl( 68 return ScopedJavaLocalRef<jstring>(env, ConvertUTF16ToJavaStringImpl(
63 env, UTF8ToUTF16(str))); 69 env, UTF8ToUTF16(str)));
64 } 70 }
65 71
66 void ConvertJavaStringToUTF16(JNIEnv* env, jstring str, string16* result) { 72 void ConvertJavaStringToUTF16(JNIEnv* env, jstring str, string16* result) {
67 if (!str) { 73 if (!str) {
68 LOG(WARNING) << "ConvertJavaStringToUTF16 called with null string."; 74 LOG(WARNING) << "ConvertJavaStringToUTF16 called with null string.";
69 result->clear(); 75 result->clear();
70 return; 76 return;
71 } 77 }
78 const jsize length = env->GetStringLength(str);
79 if (!length) {
80 result->clear();
81 CheckException(env);
82 return;
83 }
72 const jchar* chars = env->GetStringChars(str, NULL); 84 const jchar* chars = env->GetStringChars(str, NULL);
73 DCHECK(chars); 85 DCHECK(chars);
74 // GetStringChars isn't required to NULL-terminate the strings 86 // GetStringChars isn't required to NULL-terminate the strings
75 // it returns, so the length must be explicitly checked. 87 // it returns, so the length must be explicitly checked.
76 result->assign(chars, env->GetStringLength(str)); 88 result->assign(chars, length);
77 env->ReleaseStringChars(str, chars); 89 env->ReleaseStringChars(str, chars);
78 CheckException(env); 90 CheckException(env);
79 } 91 }
80 92
81 string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str) { 93 string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str) {
82 string16 result; 94 string16 result;
83 ConvertJavaStringToUTF16(env, str, &result); 95 ConvertJavaStringToUTF16(env, str, &result);
84 return result; 96 return result;
85 } 97 }
86 98
87 string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str) { 99 string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str) {
88 return ConvertJavaStringToUTF16(AttachCurrentThread(), str.obj()); 100 return ConvertJavaStringToUTF16(AttachCurrentThread(), str.obj());
89 } 101 }
90 102
91 ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString( 103 ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(
92 JNIEnv* env, 104 JNIEnv* env,
93 const base::StringPiece16& str) { 105 const base::StringPiece16& str) {
94 return ScopedJavaLocalRef<jstring>(env, 106 return ScopedJavaLocalRef<jstring>(env,
95 ConvertUTF16ToJavaStringImpl(env, str)); 107 ConvertUTF16ToJavaStringImpl(env, str));
96 } 108 }
97 109
98 } // namespace android 110 } // namespace android
99 } // namespace base 111 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | base/android/jni_string_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698