summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--WebCore/platform/android/GeolocationServiceBridge.cpp2
-rwxr-xr-xWebKit/android/jni/GeolocationPermissionsBridge.cpp8
-rw-r--r--WebKit/android/jni/JavaBridge.cpp24
-rw-r--r--WebKit/android/jni/MIMETypeRegistry.cpp2
-rwxr-xr-xWebKit/android/jni/MockGeolocation.cpp2
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp20
-rw-r--r--WebKit/android/jni/WebCoreJni.cpp2
-rw-r--r--WebKit/android/jni/WebCoreJni.h2
-rw-r--r--WebKit/android/jni/WebCoreResourceLoader.cpp18
-rw-r--r--WebKit/android/jni/WebIconDatabase.cpp8
-rw-r--r--WebKit/android/jni/WebSettings.cpp30
-rw-r--r--WebKit/android/jni/WebStorage.cpp8
-rw-r--r--WebKit/android/jni/WebViewCore.cpp14
-rw-r--r--WebKit/android/nav/WebView.cpp2
14 files changed, 71 insertions, 71 deletions
diff --git a/WebCore/platform/android/GeolocationServiceBridge.cpp b/WebCore/platform/android/GeolocationServiceBridge.cpp
index 837b338..2e81b32 100644
--- a/WebCore/platform/android/GeolocationServiceBridge.cpp
+++ b/WebCore/platform/android/GeolocationServiceBridge.cpp
@@ -119,7 +119,7 @@ void GeolocationServiceBridge::newErrorAvailable(JNIEnv* env, jclass, jlong nati
{
GeolocationServiceBridge* object = reinterpret_cast<GeolocationServiceBridge*>(nativeObject);
RefPtr<PositionError> error =
- PositionError::create(PositionError::POSITION_UNAVAILABLE, android::to_string(env, message));
+ PositionError::create(PositionError::POSITION_UNAVAILABLE, android::jstringToWtfString(env, message));
object->m_listener->newErrorAvailable(error.release());
}
diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
index f623718..782f7ce 100755
--- a/WebKit/android/jni/GeolocationPermissionsBridge.cpp
+++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
@@ -27,7 +27,7 @@
#include <JNIHelp.h> // For jniRegisterNativeMethods
#include "GeolocationPermissions.h"
-#include "WebCoreJni.h" // For to_string
+#include "WebCoreJni.h" // For jstringToWtfString
/**
@@ -59,19 +59,19 @@ static jobject getOrigins(JNIEnv* env, jobject obj)
static bool getAllowed(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originString = to_string(env, origin);
+ WTF::String originString = jstringToWtfString(env, origin);
return GeolocationPermissions::getAllowed(originString);
}
static void clear(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originString = to_string(env, origin);
+ WTF::String originString = jstringToWtfString(env, origin);
GeolocationPermissions::clear(originString);
}
static void allow(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originString = to_string(env, origin);
+ WTF::String originString = jstringToWtfString(env, origin);
GeolocationPermissions::allow(originString);
}
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 5715ae5..33a1c2a 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -216,7 +216,7 @@ JavaBridge::cookies(WebCore::KURL const& url)
AutoJObject obj = getRealObject(env, mJavaObject);
jstring string = (jstring)(env->CallObjectMethod(obj.get(), mCookies, jUrlStr));
- WTF::String ret = to_string(env, string);
+ WTF::String ret = jstringToWtfString(env, string);
env->DeleteLocalRef(jUrlStr);
env->DeleteLocalRef(string);
return ret;
@@ -242,7 +242,7 @@ JavaBridge::getPluginDirectories()
int count = env->GetArrayLength(array);
for (int i = 0; i < count; i++) {
jstring dir = (jstring) env->GetObjectArrayElement(array, i);
- directories.append(to_string(env, dir));
+ directories.append(jstringToWtfString(env, dir));
env->DeleteLocalRef(dir);
}
env->DeleteLocalRef(array);
@@ -256,7 +256,7 @@ JavaBridge::getPluginSharedDataDirectory()
JNIEnv* env = JSC::Bindings::getJNIEnv();
AutoJObject obj = getRealObject(env, mJavaObject);
jstring ret = (jstring)env->CallObjectMethod(obj.get(), mGetPluginSharedDataDirectory);
- WTF::String path = to_string(env, ret);
+ WTF::String path = jstringToWtfString(env, ret);
checkException(env);
return path;
}
@@ -289,7 +289,7 @@ WTF::Vector<WTF::String>JavaBridge::getSupportedKeyStrengthList() {
int count = env->GetArrayLength(array);
for (int i = 0; i < count; ++i) {
jstring keyStrength = (jstring) env->GetObjectArrayElement(array, i);
- list.append(to_string(env, keyStrength));
+ list.append(jstringToWtfString(env, keyStrength));
env->DeleteLocalRef(keyStrength);
}
env->DeleteLocalRef(array);
@@ -307,7 +307,7 @@ WTF::String JavaBridge::getSignedPublicKeyAndChallengeString(unsigned index,
AutoJObject obj = getRealObject(env, mJavaObject);
jstring key = (jstring) env->CallObjectMethod(obj.get(),
mGetSignedPublicKey, index, jChallenge, jUrl);
- WTF::String ret = to_string(env, key);
+ WTF::String ret = jstringToWtfString(env, key);
env->DeleteLocalRef(jChallenge);
env->DeleteLocalRef(jUrl);
env->DeleteLocalRef(key);
@@ -319,7 +319,7 @@ WTF::String JavaBridge::resolveFilePathForContentUri(const WTF::String& uri) {
jstring jUri = env->NewString(uri.characters(), uri.length());
AutoJObject obj = getRealObject(env, mJavaObject);
jstring path = static_cast<jstring>(env->CallObjectMethod(obj.get(), mResolveFilePathForContentUri, jUri));
- WTF::String ret = to_string(env, path);
+ WTF::String ret = jstringToWtfString(env, path);
env->DeleteLocalRef(jUri);
env->DeleteLocalRef(path);
return ret;
@@ -378,8 +378,8 @@ void JavaBridge::SetNetworkType(JNIEnv* env, jobject obj, jstring javatype, jstr
DEFINE_STATIC_LOCAL(AtomicString, edge, ("edge"));
DEFINE_STATIC_LOCAL(AtomicString, umts, ("umts"));
- String type = to_string(env, javatype);
- String subtype = to_string(env, javasubtype);
+ String type = jstringToWtfString(env, javatype);
+ String subtype = jstringToWtfString(env, javasubtype);
Connection::ConnectionType connectionType = Connection::UNKNOWN;
if (type == wifi)
connectionType = Connection::WIFI;
@@ -403,7 +403,7 @@ void JavaBridge::UpdatePluginDirectories(JNIEnv* env, jobject obj,
int count = env->GetArrayLength(array);
for (int i = 0; i < count; i++) {
jstring dir = (jstring) env->GetObjectArrayElement(array, i);
- directories.append(to_string(env, dir));
+ directories.append(jstringToWtfString(env, dir));
env->DeleteLocalRef(dir);
}
checkException(env);
@@ -432,7 +432,7 @@ void JavaBridge::AddPackageNames(JNIEnv* env, jobject obj, jobject packageNames)
HashSet<WTF::String> namesSet;
while (env->CallBooleanMethod(iter, hasNext)) {
jstring name = static_cast<jstring>(env->CallObjectMethod(iter, next));
- namesSet.add(to_string(env, name));
+ namesSet.add(jstringToWtfString(env, name));
env->DeleteLocalRef(name);
}
@@ -445,12 +445,12 @@ void JavaBridge::AddPackageNames(JNIEnv* env, jobject obj, jobject packageNames)
void JavaBridge::AddPackageName(JNIEnv* env, jobject obj, jstring packageName)
{
- packageNotifier().addPackageName(to_string(env, packageName));
+ packageNotifier().addPackageName(jstringToWtfString(env, packageName));
}
void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName)
{
- packageNotifier().removePackageName(to_string(env, packageName));
+ packageNotifier().removePackageName(jstringToWtfString(env, packageName));
}
diff --git a/WebKit/android/jni/MIMETypeRegistry.cpp b/WebKit/android/jni/MIMETypeRegistry.cpp
index 5fe9ccd..f885d57 100644
--- a/WebKit/android/jni/MIMETypeRegistry.cpp
+++ b/WebKit/android/jni/MIMETypeRegistry.cpp
@@ -51,7 +51,7 @@ String MIMETypeRegistry::getMIMETypeForExtension(const String& ext)
env->NewString((const jchar*) ext.characters(), ext.length());
jobject mimeType = env->CallStaticObjectMethod(mimeClass,
mimeTypeFromExtension, extString);
- String result = android::to_string(env, (jstring) mimeType);
+ String result = android::jstringToWtfString(env, (jstring) mimeType);
env->DeleteLocalRef(mimeClass);
env->DeleteLocalRef(extString);
env->DeleteLocalRef(mimeType);
diff --git a/WebKit/android/jni/MockGeolocation.cpp b/WebKit/android/jni/MockGeolocation.cpp
index 1c236c3..1e110e7 100755
--- a/WebKit/android/jni/MockGeolocation.cpp
+++ b/WebKit/android/jni/MockGeolocation.cpp
@@ -60,7 +60,7 @@ static void setPosition(JNIEnv* env, jobject, double latitude, double longitude,
static void setError(JNIEnv* env, jobject, int code, jstring message)
{
PositionError::ErrorCode codeEnum = static_cast<PositionError::ErrorCode>(code);
- String messageString = to_string(env, message);
+ String messageString = jstringToWtfString(env, message);
RefPtr<PositionError> error = PositionError::create(codeEnum, messageString);
GeolocationServiceMock::setError(error.release());
}
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index f1de0c9..9f5f44d 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -882,7 +882,7 @@ WebFrame::getRawResourceFilename(WebCore::PlatformBridge::rawResId id) const
jstring ret = (jstring) env->CallObjectMethod(mJavaFrame->frame(env).get(),
mJavaFrame->mGetRawResFilename, (int)id);
- return to_string(env, ret);
+ return jstringToWtfString(env, ret);
}
float
@@ -1060,7 +1060,7 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url, jobject headers)
WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
LOG_ASSERT(pFrame, "nativeLoadUrl must take a valid frame pointer!");
- WTF::String webcoreUrl = to_string(env, url);
+ WTF::String webcoreUrl = jstringToWtfString(env, url);
WebCore::KURL kurl(WebCore::KURL(), webcoreUrl);
WebCore::ResourceRequest request(kurl);
if (headers) {
@@ -1089,7 +1089,7 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url, jobject headers)
jobject entry = env->CallObjectMethod(iter, next);
jstring key = (jstring) env->CallObjectMethod(entry, getKey);
jstring value = (jstring) env->CallObjectMethod(entry, getValue);
- request.setHTTPHeaderField(to_string(env, key), to_string(env, value));
+ request.setHTTPHeaderField(jstringToWtfString(env, key), jstringToWtfString(env, value));
env->DeleteLocalRef(entry);
env->DeleteLocalRef(key);
env->DeleteLocalRef(value);
@@ -1114,7 +1114,7 @@ static void PostUrl(JNIEnv *env, jobject obj, jstring url, jbyteArray postData)
WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
LOG_ASSERT(pFrame, "nativePostUrl must take a valid frame pointer!");
- WebCore::KURL kurl(WebCore::KURL(), to_string(env, url));
+ WebCore::KURL kurl(WebCore::KURL(), jstringToWtfString(env, url));
WebCore::ResourceRequest request(kurl);
request.setHTTPMethod("POST");
request.setHTTPContentType("application/x-www-form-urlencoded");
@@ -1145,7 +1145,7 @@ static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data,
LOG_ASSERT(pFrame, "nativeLoadData must take a valid frame pointer!");
// Setup the resource request
- WebCore::ResourceRequest request(to_string(env, baseUrl));
+ WebCore::ResourceRequest request(jstringToWtfString(env, baseUrl));
// Setup the substituteData
const char* dataStr = env->GetStringUTFChars(data, NULL);
@@ -1156,8 +1156,8 @@ static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data,
env->ReleaseStringUTFChars(data, dataStr);
WebCore::SubstituteData substituteData(sharedBuffer,
- to_string(env, mimeType), to_string(env, encoding),
- WebCore::KURL(ParsedURLString, to_string(env, failUrl)));
+ jstringToWtfString(env, mimeType), jstringToWtfString(env, encoding),
+ WebCore::KURL(ParsedURLString, jstringToWtfString(env, failUrl)));
// Perform the load
pFrame->loader()->load(request, substituteData, false);
@@ -1378,7 +1378,7 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj,
LOG_ASSERT(pFrame, "stringByEvaluatingJavaScriptFromString must take a valid frame pointer!");
WebCore::ScriptValue value =
- pFrame->script()->executeScript(to_string(env, script), true);
+ pFrame->script()->executeScript(jstringToWtfString(env, script), true);
WTF::String result = WTF::String();
ScriptState* scriptState = mainWorldScriptState(pFrame);
if (!value.getString(scriptState, result))
@@ -1726,8 +1726,8 @@ static void SetUsernamePassword(JNIEnv *env, jobject obj,
node = form->nextItem();
}
if (found) {
- usernameEle->setValue(to_string(env, username));
- passwordEle->setValue(to_string(env, password));
+ usernameEle->setValue(jstringToWtfString(env, username));
+ passwordEle->setValue(jstringToWtfString(env, password));
}
}
diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp
index dd15971..5bcb2e1 100644
--- a/WebKit/android/jni/WebCoreJni.cpp
+++ b/WebKit/android/jni/WebCoreJni.cpp
@@ -58,7 +58,7 @@ bool checkException(JNIEnv* env)
}
// This method is safe to call from the ui thread and the WebCore thread.
-WTF::String to_string(JNIEnv* env, jstring str)
+WTF::String jstringToWtfString(JNIEnv* env, jstring str)
{
if (!str || !env)
return WTF::String();
diff --git a/WebKit/android/jni/WebCoreJni.h b/WebKit/android/jni/WebCoreJni.h
index 95bdaa0..8bfca7e 100644
--- a/WebKit/android/jni/WebCoreJni.h
+++ b/WebKit/android/jni/WebCoreJni.h
@@ -71,7 +71,7 @@ AutoJObject getRealObject(JNIEnv*, jobject);
bool checkException(JNIEnv* env);
// Create a WTF::String object from a jstring object.
-WTF::String to_string(JNIEnv* env, jstring str);
+WTF::String jstringToWtfString(JNIEnv* env, jstring str);
#if USE(CHROME_NETWORK_STACK)
string16 jstringToString16(JNIEnv* env, jstring jstr);
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index b4dd6a9..a60a1b1 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -142,9 +142,9 @@ void WebCoreResourceLoader::SetResponseHeader(JNIEnv* env, jobject obj, jint nat
LOG_ASSERT(key, "How did a null value become a key?");
if (val) {
- WTF::String valStr = to_string(env, val);
+ WTF::String valStr = jstringToWtfString(env, val);
if (!valStr.isEmpty())
- response->setHTTPHeaderField(to_string(env, key), valStr);
+ response->setHTTPHeaderField(jstringToWtfString(env, key), valStr);
}
}
@@ -156,15 +156,15 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
#endif
LOG_ASSERT(url, "Must have a url in the response!");
- WebCore::KURL kurl(WebCore::ParsedURLString, to_string(env, url));
+ WebCore::KURL kurl(WebCore::ParsedURLString, jstringToWtfString(env, url));
WTF::String encodingStr;
WTF::String mimeTypeStr;
if (mimeType) {
- mimeTypeStr = to_string(env, mimeType);
+ mimeTypeStr = jstringToWtfString(env, mimeType);
LOGV("Response setMIMEType: %s", mimeTypeStr.latin1().data());
}
if (encoding) {
- encodingStr = to_string(env, encoding);
+ encodingStr = jstringToWtfString(env, encoding);
LOGV("Response setTextEncodingName: %s", encodingStr.latin1().data());
}
WebCore::ResourceResponse* response = new WebCore::ResourceResponse(
@@ -172,7 +172,7 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
encodingStr, WTF::String());
response->setHTTPStatusCode(statusCode);
if (statusText) {
- WTF::String status = to_string(env, statusText);
+ WTF::String status = jstringToWtfString(env, statusText);
response->setHTTPStatusText(status);
LOGV("Response setStatusText: %s", status.latin1().data());
}
@@ -251,8 +251,8 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
LOG_ASSERT(handle->client(), "Why do we not have a client?");
WebCore::ResourceRequest r = handle->firstRequest();
- WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, to_string(env, baseUrl)),
- to_string(env, redirectTo));
+ WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, jstringToWtfString(env, baseUrl)),
+ jstringToWtfString(env, redirectTo));
WebCore::ResourceResponse* response = (WebCore::ResourceResponse*)nativeResponse;
// If the url fails to resolve the relative path, return null.
if (url.protocol().isEmpty()) {
@@ -290,7 +290,7 @@ void WebCoreResourceLoader::Error(JNIEnv* env, jobject obj, jint id, jstring des
return;
handle->client()->didFail(handle, WebCore::ResourceError("", id,
- to_string(env, failingUrl), to_string(env, description)));
+ jstringToWtfString(env, failingUrl), jstringToWtfString(env, description)));
}
// ----------------------------------------------------------------------------
diff --git a/WebKit/android/jni/WebIconDatabase.cpp b/WebKit/android/jni/WebIconDatabase.cpp
index aef7b71..6632c89 100644
--- a/WebKit/android/jni/WebIconDatabase.cpp
+++ b/WebKit/android/jni/WebIconDatabase.cpp
@@ -138,7 +138,7 @@ static void Open(JNIEnv* env, jobject obj, jstring path)
iconDb->setEnabled(true);
iconDb->setClient(gIconDatabaseClient);
LOG_ASSERT(path, "No path given to nativeOpen");
- WTF::String pathStr = to_string(env, path);
+ WTF::String pathStr = jstringToWtfString(env, path);
LOGV("Opening WebIconDatabase file '%s'", pathStr.latin1().data());
bool res = iconDb->open(pathStr);
if (!res)
@@ -159,7 +159,7 @@ static void RemoveAllIcons(JNIEnv* env, jobject obj)
static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url)
{
LOG_ASSERT(url, "No url given to iconForPageUrl");
- WTF::String urlStr = to_string(env, url);
+ WTF::String urlStr = jstringToWtfString(env, url);
WebCore::Image* icon = WebCore::iconDatabase()->iconForPageURL(urlStr,
WebCore::IntSize(16, 16));
@@ -170,7 +170,7 @@ static jobject IconForPageUrl(JNIEnv* env, jobject obj, jstring url)
static void RetainIconForPageUrl(JNIEnv* env, jobject obj, jstring url)
{
LOG_ASSERT(url, "No url given to retainIconForPageUrl");
- WTF::String urlStr = to_string(env, url);
+ WTF::String urlStr = jstringToWtfString(env, url);
LOGV("Retaining icon for '%s'", urlStr.latin1().data());
WebCore::iconDatabase()->retainIconForPageURL(urlStr);
@@ -179,7 +179,7 @@ static void RetainIconForPageUrl(JNIEnv* env, jobject obj, jstring url)
static void ReleaseIconForPageUrl(JNIEnv* env, jobject obj, jstring url)
{
LOG_ASSERT(url, "No url given to releaseIconForPageUrl");
- WTF::String urlStr = to_string(env, url);
+ WTF::String urlStr = jstringToWtfString(env, url);
LOGV("Releasing icon for '%s'", urlStr.latin1().data());
WebCore::iconDatabase()->releaseIconForPageURL(urlStr);
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index 5b2fb57..113a463 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -337,32 +337,32 @@ public:
pFrame->setTextZoomFactor(zoomFactor);
jstring str = (jstring)env->GetObjectField(obj, gFieldIds->mStandardFontFamily);
- s->setStandardFontFamily(to_string(env, str));
+ s->setStandardFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mFixedFontFamily);
- s->setFixedFontFamily(to_string(env, str));
+ s->setFixedFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mSansSerifFontFamily);
- s->setSansSerifFontFamily(to_string(env, str));
+ s->setSansSerifFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mSerifFontFamily);
- s->setSerifFontFamily(to_string(env, str));
+ s->setSerifFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mCursiveFontFamily);
- s->setCursiveFontFamily(to_string(env, str));
+ s->setCursiveFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mFantasyFontFamily);
- s->setFantasyFontFamily(to_string(env, str));
+ s->setFantasyFontFamily(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mDefaultTextEncoding);
- s->setDefaultTextEncodingName(to_string(env, str));
+ s->setDefaultTextEncodingName(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mUserAgent);
- WebFrame::getWebFrame(pFrame)->setUserAgent(to_string(env, str));
+ WebFrame::getWebFrame(pFrame)->setUserAgent(jstringToWtfString(env, str));
#if USE(CHROME_NETWORK_STACK)
- WebRequestContext::SetUserAgent(to_string(env, str));
+ WebRequestContext::SetUserAgent(jstringToWtfString(env, str));
str = (jstring)env->GetObjectField(obj, gFieldIds->mAcceptLanguage);
- WebRequestContext::SetAcceptLanguage(to_string(env, str));
+ WebRequestContext::SetAcceptLanguage(jstringToWtfString(env, str));
#endif
jint size = env->GetIntField(obj, gFieldIds->mMinimumFontSize);
@@ -410,7 +410,7 @@ public:
s->setOfflineWebApplicationCacheEnabled(flag);
str = (jstring)env->GetObjectField(obj, gFieldIds->mAppCachePath);
if (str) {
- WTF::String path = to_string(env, str);
+ WTF::String path = jstringToWtfString(env, str);
if (path.length() && WebCore::cacheStorage().cacheDirectory().isNull()) {
WebCore::cacheStorage().setCacheDirectory(path);
}
@@ -455,7 +455,7 @@ public:
// If the user has set the database path, sync it to the DatabaseTracker.
str = (jstring)env->GetObjectField(obj, gFieldIds->mDatabasePath);
if (str)
- WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(to_string(env, str));
+ WebCore::DatabaseTracker::tracker().setDatabaseDirectoryPath(jstringToWtfString(env, str));
}
#endif
#if ENABLE(DOM_STORAGE)
@@ -463,7 +463,7 @@ public:
s->setLocalStorageEnabled(flag);
str = (jstring)env->GetObjectField(obj, gFieldIds->mDatabasePath);
if (str) {
- WTF::String localStorageDatabasePath = to_string(env,str);
+ WTF::String localStorageDatabasePath = jstringToWtfString(env,str);
if (localStorageDatabasePath.length()) {
s->setLocalStorageDatabasePath(localStorageDatabasePath);
}
@@ -474,8 +474,8 @@ public:
GeolocationPermissions::setAlwaysDeny(!flag);
str = (jstring)env->GetObjectField(obj, gFieldIds->mGeolocationDatabasePath);
if (str) {
- GeolocationPermissions::setDatabasePath(to_string(env,str));
- WebCore::GeolocationPositionCache::setDatabasePath(to_string(env,str));
+ GeolocationPermissions::setDatabasePath(jstringToWtfString(env,str));
+ WebCore::GeolocationPositionCache::setDatabasePath(jstringToWtfString(env,str));
}
flag = env->GetBooleanField(obj, gFieldIds->mXSSAuditorEnabled);
diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp
index 17fbb47..f2a3877 100644
--- a/WebKit/android/jni/WebStorage.cpp
+++ b/WebKit/android/jni/WebStorage.cpp
@@ -72,7 +72,7 @@ static jobject GetOrigins(JNIEnv* env, jobject obj)
static unsigned long long GetQuotaForOrigin(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originStr = to_string(env, origin);
+ WTF::String originStr = jstringToWtfString(env, origin);
RefPtr<WebCore::SecurityOrigin> securityOrigin = WebCore::SecurityOrigin::createFromString(originStr);
unsigned long long quota = WebCore::DatabaseTracker::tracker().quotaForOrigin(securityOrigin.get());
return quota;
@@ -80,7 +80,7 @@ static unsigned long long GetQuotaForOrigin(JNIEnv* env, jobject obj, jstring or
static unsigned long long GetUsageForOrigin(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originStr = to_string(env, origin);
+ WTF::String originStr = jstringToWtfString(env, origin);
RefPtr<WebCore::SecurityOrigin> securityOrigin = WebCore::SecurityOrigin::createFromString(originStr);
unsigned long long usage = WebCore::DatabaseTracker::tracker().usageForOrigin(securityOrigin.get());
Vector<WebCore::KURL> manifestUrls;
@@ -102,14 +102,14 @@ static unsigned long long GetUsageForOrigin(JNIEnv* env, jobject obj, jstring or
static void SetQuotaForOrigin(JNIEnv* env, jobject obj, jstring origin, unsigned long long quota)
{
- WTF::String originStr = to_string(env, origin);
+ WTF::String originStr = jstringToWtfString(env, origin);
RefPtr<WebCore::SecurityOrigin> securityOrigin = WebCore::SecurityOrigin::createFromString(originStr);
WebCore::DatabaseTracker::tracker().setQuota(securityOrigin.get(), quota);
}
static void DeleteOrigin(JNIEnv* env, jobject obj, jstring origin)
{
- WTF::String originStr = to_string(env, origin);
+ WTF::String originStr = jstringToWtfString(env, origin);
RefPtr<WebCore::SecurityOrigin> securityOrigin = WebCore::SecurityOrigin::createFromString(originStr);
WebCore::DatabaseTracker::tracker().deleteOrigin(securityOrigin.get());
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 6845141..e7e98c9 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -2520,7 +2520,7 @@ void WebViewCore::openFileChooser(PassRefPtr<WebCore::FileChooser> chooser) {
if (!string)
return;
- WTF::String webcoreString = to_string(env, jName);
+ WTF::String webcoreString = jstringToWtfString(env, jName);
env->ReleaseStringChars(jName, string);
if (webcoreString.length())
@@ -3054,7 +3054,7 @@ bool WebViewCore::jsPrompt(const WTF::String& url, const WTF::String& text, cons
if (!returnVal)
return false;
- result = to_string(env, returnVal);
+ result = jstringToWtfString(env, returnVal);
env->DeleteLocalRef(jInputStr);
env->DeleteLocalRef(jDefaultStr);
env->DeleteLocalRef(jUrlStr);
@@ -3433,7 +3433,7 @@ static void ReplaceTextfieldText(JNIEnv *env, jobject obj,
TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
#endif
WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
- WTF::String webcoreString = to_string(env, replace);
+ WTF::String webcoreString = jstringToWtfString(env, replace);
viewImpl->replaceTextfieldText(oldStart,
oldEnd, webcoreString, start, end, textGeneration);
}
@@ -3445,7 +3445,7 @@ static void PassToJs(JNIEnv *env, jobject obj,
#ifdef ANDROID_INSTRUMENT
TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
#endif
- WTF::String current = to_string(env, currentText);
+ WTF::String current = jstringToWtfString(env, currentText);
GET_NATIVE_VIEW(env, obj)->passToJs(generation, current,
PlatformKeyboardEvent(keyCode, keyValue, 0, down, cap, fn, sym));
}
@@ -3769,7 +3769,7 @@ static void DumpV8Counters(JNIEnv*, jobject)
static void SetJsFlags(JNIEnv *env, jobject obj, jstring flags)
{
#if USE(V8)
- WTF::String flagsString = to_string(env, flags);
+ WTF::String flagsString = jstringToWtfString(env, flags);
WTF::CString utf8String = flagsString.utf8();
WebCore::ScriptController::setFlags(utf8String.data(), utf8String.length());
#endif
@@ -3797,14 +3797,14 @@ static void GeolocationPermissionsProvide(JNIEnv* env, jobject obj, jstring orig
Frame* frame = viewImpl->mainFrame();
ChromeClientAndroid* chromeClient = static_cast<ChromeClientAndroid*>(frame->page()->chrome()->client());
- chromeClient->provideGeolocationPermissions(to_string(env, origin), allow, remember);
+ chromeClient->provideGeolocationPermissions(jstringToWtfString(env, origin), allow, remember);
}
static void RegisterURLSchemeAsLocal(JNIEnv* env, jobject obj, jstring scheme) {
#ifdef ANDROID_INSTRUMENT
TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter);
#endif
- WebCore::SchemeRegistry::registerURLSchemeAsLocal(to_string(env, scheme));
+ WebCore::SchemeRegistry::registerURLSchemeAsLocal(jstringToWtfString(env, scheme));
}
static bool FocusBoundsChanged(JNIEnv* env, jobject obj)
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index de9e3ea..d76c22c 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1980,7 +1980,7 @@ static void nativeUpdateCachedTextfield(JNIEnv *env, jobject obj, jstring update
const CachedNode* cachedFocusNode = root->currentFocus();
if (!cachedFocusNode || !cachedFocusNode->isTextInput())
return;
- WTF::String webcoreString = to_string(env, updatedText);
+ WTF::String webcoreString = jstringToWtfString(env, updatedText);
(const_cast<CachedNode*>(cachedFocusNode))->setExport(webcoreString);
root->setTextGeneration(generation);
checkException(env);
generated by cgit v1.1 at 2024-08-01 10:22:50 +0000