Fix WebCoreStringToJString() to not delete the local reference to the new jstring

The JNI spec allows for local objects to be GC'ed before the JNI frame
returns, so this is dangerous.

Also rename the method to WtfStringToJstring() to match the existing
jstringToWtfString() and update call sites to JNIEnv::NewString() to
make use of it.

Change-Id: I84aa25ba1aca2aee346bf6e3d83a58afc3a95219

1 files changed, 4 insertions, 4 deletions

diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
index 9711d26..c05a417 100644
--- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
@@ -178,7 +178,7 @@ public:
             return;
 
         m_paused = false;
-        jstring jUrl = env->NewString((unsigned short *)m_url.characters(), m_url.length());
+        jstring jUrl = WtfStringToJstring(env, m_url);
         env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_play, jUrl);
         env->DeleteLocalRef(jUrl);
 
@@ -191,7 +191,7 @@ public:
         if (!env || !m_glue->m_javaProxy || !m_posterUrl.length())
             return;
         // Send the poster
-        jstring jUrl = env->NewString((unsigned short *)m_posterUrl.characters(), m_posterUrl.length());
+        jstring jUrl = WtfStringToJstring(env, m_posterUrl);
         env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_loadPoster, jUrl);
         env->DeleteLocalRef(jUrl);
     }
@@ -297,7 +297,7 @@ public:
         // Send the poster
         jstring jUrl = 0;
         if (m_posterUrl.length())
-            jUrl = env->NewString((unsigned short *)m_posterUrl.characters(), m_posterUrl.length());
+            jUrl = WtfStringToJstring(env, m_posterUrl);
         // Sending a NULL jUrl allows the Java side to try to load the default poster.
         env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_loadPoster, jUrl);
         if (jUrl)
@@ -324,7 +324,7 @@ public:
         if (!m_glue->m_javaProxy)
             return;
 
-        jstring jUrl = env->NewString((unsigned short *)m_url.characters(), m_url.length());
+        jstring jUrl = WtfStringToJstring(env, m_url);
         // start loading the data asynchronously
         env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_setDataSource, jUrl);
         env->DeleteLocalRef(jUrl);