Changeset 53193 in webkit

Timestamp:

Jan 13, 2010 10:30:04 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-13 Steve Block <​steveblock@google.com>

Update appendClassName in jni_runtime.cpp to use WebCore::StringBuilder, rather than JSC::StringBuilder.
​https://bugs.webkit.org/show_bug.cgi?id=33586

Avoiding the JSC version of StringBuilder allows this file to be used with both JSC and V8 on Android.

No new tests, refactoring only.

• bridge/jni/jni_runtime.cpp: Modified. (JavaMethod::signature): Modified. Use WebCore::StringBuilder.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/jni_runtime.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-13  Steve Block  <steveblock@google.com>
+
+        Update appendClassName in jni_runtime.cpp to use WebCore::StringBuilder, rather than JSC::StringBuilder.
+        https://bugs.webkit.org/show_bug.cgi?id=33586
+
+        Avoiding the JSC version of StringBuilder allows this file to be used with both JSC and V8 on Android.
+
+        No new tests, refactoring only.
+
+        * bridge/jni/jni_runtime.cpp: Modified.
+        (JavaMethod::signature): Modified. Use WebCore::StringBuilder.
+
 2010-01-13  Kent Hansen  <kent.hansen@nokia.com>
 

trunk/WebCore/bridge/jni/jni_runtime.cpp

@@ -29 +29 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
+#include "CString.h"
+#include "StringBuilder.h"
 #include "jni_utility.h"
 #include "jni_utility_private.h"
@@ -36 +38 @@
 #include <runtime/Error.h>
 #include <runtime/JSLock.h>
-#include <runtime/StringBuilder.h>
 
 #ifdef NDEBUG
@@ -49 +50 @@
 using namespace JSC;
 using namespace JSC::Bindings;
+using namespace WebCore;
 
 
@@ -349 +351 @@
         }
         
-        UString signatureUString = signatureBuilder.release();
-        _signature = strdup(signatureUString.ascii());
+        String signatureString = signatureBuilder.toString();
+        _signature = strdup(signatureString.utf8().data());
     }