Cherry-pick WebKit change 53449 to move JSC-specific implementation of JavaString to a private implementation class

See http://trac.webkit.org/changeset/53449
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

Change-Id: I61cfea194d679d506d92ca3951032531d6908965

3 files changed, 106 insertions, 41 deletions

diff --git a/WebCore/bridge/jni/jni_runtime.h b/WebCore/bridge/jni/jni_runtime.h
index 3b3aaf6..5c0dc66 100644
--- a/WebCore/bridge/jni/jni_runtime.h
+++ b/WebCore/bridge/jni/jni_runtime.h
@@ -30,8 +30,10 @@
 
 #include "JavaInstanceJSC.h"
 #include "jni_utility.h"
-#include <runtime/JSLock.h>
 
+#if USE(JSC)
+#include "JavaStringJSC.h"
+#endif
 
 namespace JSC
 {
@@ -46,49 +48,28 @@ class JavaString
 public:
     JavaString()
     {
-        JSLock lock(SilenceAssertionsOnly);
-        _rep = UString().rep();
+        m_impl.init();
     }
 
-    void _commonInit (JNIEnv *e, jstring s)
+    JavaString(JNIEnv* e, jstring s)
     {
-        int _size = e->GetStringLength (s);
-        const jchar *uc = getUCharactersFromJStringInEnv (e, s);
-        {
-            JSLock lock(SilenceAssertionsOnly);
-            _rep = UString(reinterpret_cast<const UChar*>(uc), _size).rep();
-        }
-        releaseUCharactersForJStringInEnv (e, s, uc);
+        m_impl.init(e, s);
     }
-    
-    JavaString (JNIEnv *e, jstring s) {
-        _commonInit (e, s);
-    }
-    
-    JavaString (jstring s) {
-        _commonInit (getJNIEnv(), s);
-    }
-    
-    ~JavaString()
+
+    JavaString(jstring s)
     {
-        JSLock lock(SilenceAssertionsOnly);
-        _rep = 0;
-    }
-    
-    const char *UTF8String() const { 
-        if (_utf8String.c_str() == 0) {
-            JSLock lock(SilenceAssertionsOnly);
-            _utf8String = UString(_rep).UTF8String();
-        }
-        return _utf8String.c_str();
+        m_impl.init(getJNIEnv(), s);
     }
-    const jchar *uchars() const { return (const jchar *)_rep->data(); }
-    int length() const { return _rep->size(); }
-    operator UString() const { return UString(_rep); }
+
+    const char* UTF8String() const { return m_impl.UTF8String(); }
+    const jchar* uchars() const { return m_impl.uchars(); }
+    int length() const { return m_impl.length(); }
+#if USE(JSC)
+    operator UString() const { return m_impl.uString(); }
+#endif
 
 private:
-    RefPtr<UString::Rep> _rep;
-    mutable CString _utf8String;
+    JavaStringImpl m_impl;
 };
 
 class JavaParameter
@@ -115,7 +96,7 @@ public:
     virtual JSValue valueFromInstance(ExecState *exec, const Instance *instance) const;
     virtual void setValueToInstance(ExecState *exec, const Instance *instance, JSValue aValue) const;
     
-    UString::Rep* name() const { return ((UString)_name).rep(); }
+    const JavaString& name() const { return _name; }
     virtual RuntimeType type() const { return _type.UTF8String(); }
 
     JNIType getJNIType() const { return _JNIType; }
@@ -137,7 +118,7 @@ public:
     JavaMethod(JNIEnv* env, jobject aMethod);
     ~JavaMethod();
 
-    UString::Rep* name() const { return ((UString)_name).rep(); }
+    const JavaString& name() const { return _name; }
     RuntimeType returnType() const { return _returnType.UTF8String(); };
     JavaParameter* parameterAt(int i) const { return &_parameters[i]; };
     int numParameters() const { return _numParameters; };
diff --git a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
index 3e30a4a..b242cff 100644
--- a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
@@ -61,7 +61,7 @@ JavaClass::JavaClass(jobject anInstance)
         JavaField *aField = new JavaField(env, aJField); // deleted in the JavaClass destructor
         {
             JSLock lock(SilenceAssertionsOnly);
-            _fields.set(aField->name(), aField);
+            _fields.set(((UString)aField->name()).rep(), aField);
         }
         env->DeleteLocalRef(aJField);
     }
@@ -76,10 +76,10 @@ JavaClass::JavaClass(jobject anInstance)
         {
             JSLock lock(SilenceAssertionsOnly);
 
-            methodList = _methods.get(aMethod->name());
+            methodList = _methods.get(((UString)aMethod->name()).rep());
             if (!methodList) {
                 methodList = new MethodList();
-                _methods.set(aMethod->name(), methodList);
+                _methods.set(((UString)aMethod->name()).rep(), methodList);
             }
         }
         methodList->append(aMethod);
diff --git a/WebCore/bridge/jni/jsc/JavaStringJSC.h b/WebCore/bridge/jni/jsc/JavaStringJSC.h
new file mode 100644
index 0000000..d3ed56b
--- /dev/null
+++ b/WebCore/bridge/jni/jsc/JavaStringJSC.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2010 Apple Computer, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JavaStringJSC_h
+#define JavaStringJSC_h
+
+#include "JavaInstanceJSC.h"
+#include "jni_utility.h"
+#include <runtime/JSLock.h>
+
+
+namespace JSC {
+
+namespace Bindings {
+
+class JavaStringImpl {
+public:
+    ~JavaStringImpl()
+    {
+        JSLock lock(SilenceAssertionsOnly);
+        m_rep = 0;
+    }
+
+    void init()
+    {
+        JSLock lock(SilenceAssertionsOnly);
+        m_rep = UString().rep();
+    }
+
+    void init(JNIEnv* e, jstring s)
+    {
+        int size = e->GetStringLength(s);
+        const jchar* uc = getUCharactersFromJStringInEnv(e, s);
+        {
+            JSLock lock(SilenceAssertionsOnly);
+            m_rep = UString(reinterpret_cast<const UChar*>(uc), size).rep();
+        }
+        releaseUCharactersForJStringInEnv(e, s, uc);
+    }
+
+    const char* UTF8String() const
+    {
+        if (!m_utf8String.c_str()) {
+            JSLock lock(SilenceAssertionsOnly);
+            m_utf8String = UString(m_rep).UTF8String();
+        }
+        return m_utf8String.c_str();
+    }
+    const jchar* uchars() const { return (const jchar*)m_rep->data(); }
+    int length() const { return m_rep->size(); }
+    UString uString() const { return UString(m_rep); }
+
+private:
+    RefPtr<UString::Rep> m_rep;
+    mutable CString m_utf8String;
+};
+
+} // namespace Bindings
+
+} // namespace JSC
+
+#endif // JavaStringJSC_h