summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebViewCore.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-10-14 12:34:16 +0100
committerSteve Block <steveblock@google.com>2010-10-15 10:31:31 +0100
commit27dd31673790eed64c3e0e508bb900671f06bcb3 (patch)
treeb8c6874caaef70da74c39f9d60503c1077f603dd /WebKit/android/jni/WebViewCore.cpp
parent2cc9eb95f73534e3c08c3991cd21bef5e302c88b (diff)
downloadexternal_webkit-27dd31673790eed64c3e0e508bb900671f06bcb3.zip
external_webkit-27dd31673790eed64c3e0e508bb900671f06bcb3.tar.gz
external_webkit-27dd31673790eed64c3e0e508bb900671f06bcb3.tar.bz2
Rename to_string() to jstringToWtfString() for greater clarity
Change-Id: I8516c4f39a38e236d0bff38a91fe8657cfcf8ad4
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
-rw-r--r--WebKit/android/jni/WebViewCore.cpp14
1 files changed, 7 insertions, 7 deletions
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)