[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
eric at webkit.org
eric at webkit.org
Wed Jan 20 22:22:22 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 9867ae41cdfb69b437cfde43187d32f35b83b26d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 13 18:30:04 2010 +0000
2010-01-13 Steve Block <steveblock at 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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53193 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e5a83b6..c746ba4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13 Steve Block <steveblock at 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 at nokia.com>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/jni_runtime.cpp
index 4380f7b..7f9fb72 100644
--- a/WebCore/bridge/jni/jni_runtime.cpp
+++ b/WebCore/bridge/jni/jni_runtime.cpp
@@ -28,6 +28,8 @@
#if ENABLE(MAC_JAVA_BRIDGE)
+#include "CString.h"
+#include "StringBuilder.h"
#include "jni_utility.h"
#include "jni_utility_private.h"
#include "runtime_array.h"
@@ -35,7 +37,6 @@
#include "runtime_root.h"
#include <runtime/Error.h>
#include <runtime/JSLock.h>
-#include <runtime/StringBuilder.h>
#ifdef NDEBUG
#define JS_LOG(formatAndArgs...) ((void)0)
@@ -48,6 +49,7 @@
using namespace JSC;
using namespace JSC::Bindings;
+using namespace WebCore;
JavaParameter::JavaParameter (JNIEnv *env, jstring type)
@@ -348,8 +350,8 @@ const char *JavaMethod::signature() const
}
}
- UString signatureUString = signatureBuilder.release();
- _signature = strdup(signatureUString.ascii());
+ String signatureString = signatureBuilder.toString();
+ _signature = strdup(signatureString.utf8().data());
}
return _signature;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list