WtfStringToJString should be able to return a valid string on empty input

It is sometimes desirable to return a valid but 0-length string created
from a 0-length WTF string but currently the WtfStringToJString function
will always return a null jstring on an empty input. Add a parameter to
specify that it should return an empty jstring on empty WTF string and
default it to false.

Change-Id: Ia449f1f9ae9b37c3da7d0272424e4fd4878ceb31

1 files changed, 2 insertions, 2 deletions

diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp
index 0ead46b..179fb2b 100644
--- a/WebKit/android/jni/WebCoreJni.cpp
+++ b/WebKit/android/jni/WebCoreJni.cpp
@@ -71,10 +71,10 @@ WTF::String jstringToWtfString(JNIEnv* env, jstring str)
     return ret;
 }
 
-jstring WtfStringToJstring(JNIEnv* env, const WTF::String& str)
+jstring WtfStringToJstring(JNIEnv* env, const WTF::String& str, bool validOnZeroLength)
 {
     int length = str.length();
-    return length ? env->NewString(str.characters(), length) : 0;
+    return length || validOnZeroLength ? env->NewString(str.characters(), length) : 0;
 }