Changeset 80339 in webkit

Timestamp:

Mar 4, 2011 1:45:13 AM (13 years ago)

Author:

steveblock@google.com

Message:

2011-03-04 Steve Block <​steveblock@google.com>

Reviewed by Jeremy Orlow.

V8 version of JavaString should obtain string from JNI in UTF-16 encoding
​https://bugs.webkit.org/show_bug.cgi?id=55566

We obtain the string from JNI in UTF-16 encoding and convert
to UTF-8 using our own routines as required. This matches the
behaviour of the JSC version of JavaString.

No new tests, no change in behaviour.

• bridge/jni/v8/JavaStringV8.h: (JSC::Bindings::JavaStringImpl::init): (JSC::Bindings::JavaStringImpl::utf8): (JSC::Bindings::JavaStringImpl::impl):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/v8/JavaStringV8.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-04  Steve Block  <steveblock@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        V8 version of JavaString should obtain string from JNI in UTF-16 encoding
+        https://bugs.webkit.org/show_bug.cgi?id=55566
+
+        We obtain the string from JNI in UTF-16 encoding and convert
+        to UTF-8 using our own routines as required. This matches the
+        behaviour of the JSC version of JavaString.
+
+        No new tests, no change in behaviour.
+
+        * bridge/jni/v8/JavaStringV8.h:
+        (JSC::Bindings::JavaStringImpl::init):
+        (JSC::Bindings::JavaStringImpl::utf8):
+        (JSC::Bindings::JavaStringImpl::impl):
+
 2011-03-03  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/bridge/jni/v8/JavaStringV8.h

@@ -29 +29 @@
 #include "JNIUtility.h"
 
-#include <wtf/Assertions.h>
 #include <wtf/text/CString.h>
-
-namespace WTF {
-class StringImpl;
-}
+#include <wtf/text/WTFString.h>
 
 
@@ -45 +41 @@
     void init() {}
 
-    void init(JNIEnv* e, jstring s)
+    void init(JNIEnv* env, jstring string)
     {
-        int size = e->GetStringLength(s);
-        const char* cs = getCharactersFromJStringInEnv(e, s);
-        m_utf8String = WTF::CString(cs, size);
-        releaseCharactersForJStringInEnv(e, s, cs);
+        int size = env->GetStringLength(string);
+        const jchar* jChars = getUCharactersFromJStringInEnv(env, string);
+        m_impl = StringImpl::create(jChars, size);
+        releaseUCharactersForJStringInEnv(env, string, jChars);
     }
 
-    const char* utf8() const { return m_utf8String.data(); }
+    const char* utf8() const
+    {
+        if (!m_utf8String.data())
+            m_utf8String = String(m_impl).utf8();
+        return m_utf8String.data();
+    }
     int length() const { return m_utf8String.length(); }
-    StringImpl* impl() const { ASSERT_NOT_REACHED(); return 0; }
+    StringImpl* impl() const { return m_impl.get(); }
 
 private:
-    WTF::CString m_utf8String;
+    RefPtr<StringImpl> m_impl;
+    mutable CString m_utf8String;
 };