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, 4 insertions, 2 deletions

diff --git a/WebKit/android/jni/WebCoreJni.h b/WebKit/android/jni/WebCoreJni.h
index 26da3d5..b10769c 100644
--- a/WebKit/android/jni/WebCoreJni.h
+++ b/WebKit/android/jni/WebCoreJni.h
@@ -72,8 +72,10 @@ bool checkException(JNIEnv* env);
 
 // Create a WTF::String object from a jstring object.
 WTF::String jstringToWtfString(JNIEnv*, jstring);
-// Returns a local reference to a new jstring.
-jstring WtfStringToJstring(JNIEnv*, const WTF::String&);
+// Returns a local reference to a new jstring. If validOnZeroLength is true then
+// passing in an empty WTF String will result in an empty jstring. Otherwise
+// an empty WTF String returns 0.
+jstring WtfStringToJstring(JNIEnv*, const WTF::String&, bool validOnZeroLength = false);
 
 #if USE(CHROME_NETWORK_STACK)
 string16 jstringToString16(JNIEnv*, jstring);