diff options
-rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 8 | ||||
-rwxr-xr-x | WebKit/android/jni/GeolocationPermissionsBridge.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 12 | ||||
-rw-r--r-- | WebKit/android/jni/MIMETypeRegistry.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreFrameBridge.cpp | 54 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreJni.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreJni.h | 2 | ||||
-rw-r--r-- | WebKit/android/jni/WebCoreResourceLoader.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/jni/WebHistory.cpp | 6 | ||||
-rw-r--r-- | WebKit/android/jni/WebStorage.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 46 | ||||
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 12 |
12 files changed, 76 insertions, 76 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index c670aeb..e9f4f3b 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -178,7 +178,7 @@ public: return; m_paused = false; - jstring jUrl = WtfStringToJstring(env, m_url); + jstring jUrl = wtfStringToJstring(env, m_url); env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_play, jUrl); env->DeleteLocalRef(jUrl); @@ -194,7 +194,7 @@ public: if (!env || !m_glue->m_javaProxy || !m_posterUrl.length()) return; // Send the poster - jstring jUrl = WtfStringToJstring(env, m_posterUrl); + jstring jUrl = wtfStringToJstring(env, m_posterUrl); env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_loadPoster, jUrl); env->DeleteLocalRef(jUrl); } @@ -300,7 +300,7 @@ public: // Send the poster jstring jUrl = 0; if (m_posterUrl.length()) - jUrl = WtfStringToJstring(env, m_posterUrl); + jUrl = wtfStringToJstring(env, m_posterUrl); // Sending a NULL jUrl allows the Java side to try to load the default poster. env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_loadPoster, jUrl); if (jUrl) @@ -331,7 +331,7 @@ public: if (!m_glue->m_javaProxy) return; - jstring jUrl = WtfStringToJstring(env, m_url); + jstring jUrl = wtfStringToJstring(env, m_url); // start loading the data asynchronously env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_setDataSource, jUrl); env->DeleteLocalRef(jUrl); diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp index e4275bf..a366601 100755 --- a/WebKit/android/jni/GeolocationPermissionsBridge.cpp +++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp @@ -51,7 +51,7 @@ static jobject getOrigins(JNIEnv* env, jobject obj) GeolocationPermissions::OriginSet::const_iterator end = origins.end(); for (GeolocationPermissions::OriginSet::const_iterator iter = origins.begin(); iter != end; ++iter) { - jstring originString = WtfStringToJstring(env, *iter); + jstring originString = wtfStringToJstring(env, *iter); env->CallBooleanMethod(set, addMethod, originString); env->DeleteLocalRef(originString); } diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index ce16a0f..d27dbc7 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -200,8 +200,8 @@ JavaBridge::setCookies(WebCore::KURL const& url, WTF::String const& value) { JNIEnv* env = JSC::Bindings::getJNIEnv(); const WTF::String& urlStr = url.string(); - jstring jUrlStr = WtfStringToJstring(env, urlStr); - jstring jValueStr = WtfStringToJstring(env, value); + jstring jUrlStr = wtfStringToJstring(env, urlStr); + jstring jValueStr = wtfStringToJstring(env, value); AutoJObject obj = getRealObject(env, mJavaObject); env->CallVoidMethod(obj.get(), mSetCookies, jUrlStr, jValueStr); @@ -214,7 +214,7 @@ JavaBridge::cookies(WebCore::KURL const& url) { JNIEnv* env = JSC::Bindings::getJNIEnv(); const WTF::String& urlStr = url.string(); - jstring jUrlStr = WtfStringToJstring(env, urlStr); + jstring jUrlStr = wtfStringToJstring(env, urlStr); AutoJObject obj = getRealObject(env, mJavaObject); jstring string = (jstring)(env->CallObjectMethod(obj.get(), mCookies, jUrlStr)); @@ -303,9 +303,9 @@ WTF::Vector<WTF::String>JavaBridge::getSupportedKeyStrengthList() { WTF::String JavaBridge::getSignedPublicKeyAndChallengeString(unsigned index, const WTF::String& challenge, const WebCore::KURL& url) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jChallenge = WtfStringToJstring(env, challenge); + jstring jChallenge = wtfStringToJstring(env, challenge); const WTF::String& urlStr = url.string(); - jstring jUrl = WtfStringToJstring(env, urlStr); + jstring jUrl = wtfStringToJstring(env, urlStr); AutoJObject obj = getRealObject(env, mJavaObject); jstring key = (jstring) env->CallObjectMethod(obj.get(), mGetSignedPublicKey, index, jChallenge, jUrl); @@ -318,7 +318,7 @@ WTF::String JavaBridge::getSignedPublicKeyAndChallengeString(unsigned index, WTF::String JavaBridge::resolveFilePathForContentUri(const WTF::String& uri) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jUri = WtfStringToJstring(env, uri); + jstring jUri = wtfStringToJstring(env, uri); AutoJObject obj = getRealObject(env, mJavaObject); jstring path = static_cast<jstring>(env->CallObjectMethod(obj.get(), mResolveFilePathForContentUri, jUri)); WTF::String ret = jstringToWtfString(env, path); diff --git a/WebKit/android/jni/MIMETypeRegistry.cpp b/WebKit/android/jni/MIMETypeRegistry.cpp index 85da12a..40f8cef 100644 --- a/WebKit/android/jni/MIMETypeRegistry.cpp +++ b/WebKit/android/jni/MIMETypeRegistry.cpp @@ -49,7 +49,7 @@ String MIMETypeRegistry::getMIMETypeForExtension(const String& ext) "(Ljava/lang/String;)Ljava/lang/String;"); LOG_ASSERT(mimeTypeFromExtension, "Could not find method mimeTypeFromExtension"); - jstring extString = WtfStringToJstring(env, ext); + jstring extString = wtfStringToJstring(env, ext); jobject mimeType = env->CallStaticObjectMethod(mimeClass, mimeTypeFromExtension, extString); String result = android::jstringToWtfString(env, (jstring) mimeType); diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp index 4fac42d..45178bf 100644 --- a/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -352,8 +352,8 @@ static jobject createJavaMapFromHTTPHeaders(JNIEnv* env, const WebCore::HTTPHead for (WebCore::HTTPHeaderMap::const_iterator i = map.begin(); i != end; ++i) { if (i->first.length() == 0 || i->second.length() == 0) continue; - jstring key = WtfStringToJstring(env, i->first); - jstring val = WtfStringToJstring(env, i->second); + jstring key = wtfStringToJstring(env, i->first); + jstring val = wtfStringToJstring(env, i->second); if (key && val) { env->CallObjectMethod(hashMap, put, key, val); } @@ -374,7 +374,7 @@ static jobject createJavaMapFromHTTPHeaders(JNIEnv* env, const WebCore::HTTPHead class FileInfo { public: FileInfo(JNIEnv* env, const WTF::String& name) { - m_uri = WtfStringToJstring(env, name); + m_uri = wtfStringToJstring(env, name); checkException(env); m_size = 0; m_env = env; @@ -423,10 +423,10 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, } } LOGV("%s lower=%s", __FUNCTION__, urlStr.latin1().data()); - jstring jUrlStr = WtfStringToJstring(env, urlStr); + jstring jUrlStr = wtfStringToJstring(env, urlStr); jstring jMethodStr = NULL; if (!method.isEmpty()) - jMethodStr = WtfStringToJstring(env, method); + jMethodStr = wtfStringToJstring(env, method); WebCore::FormData* formdata = request.httpBody(); jbyteArray jPostDataStr = getPostData(request); jobject jHeaderMap = createJavaMapFromHTTPHeaders(env, headers); @@ -452,9 +452,9 @@ WebFrame::startLoadingResource(WebCore::ResourceHandle* loader, ResourceHandleInternal* loaderInternal = loader->getInternal(); jstring jUsernameString = loaderInternal->m_user.isEmpty() ? - NULL : WtfStringToJstring(env, loaderInternal->m_user); + NULL : wtfStringToJstring(env, loaderInternal->m_user); jstring jPasswordString = loaderInternal->m_pass.isEmpty() ? - NULL : WtfStringToJstring(env, loaderInternal->m_pass); + NULL : wtfStringToJstring(env, loaderInternal->m_pass); bool isUserGesture = UserGestureIndicator::processingUserGesture(); jobject jLoadListener = @@ -489,7 +489,7 @@ WebFrame::shouldInterceptRequest(const WTF::String& url) LOGV("::WebCore:: shouldInterceptRequest(%s)", url.latin1().data()); JNIEnv* env = getJNIEnv(); - jstring urlStr = WtfStringToJstring(env, url); + jstring urlStr = wtfStringToJstring(env, url); jobject response = env->CallObjectMethod(mJavaFrame->frame(env).get(), mJavaFrame->mShouldInterceptRequest, urlStr); env->DeleteLocalRef(urlStr); if (response == 0) @@ -507,8 +507,8 @@ WebFrame::reportError(int errorCode, const WTF::String& description, LOGV("::WebCore:: reportError(%d, %s)", errorCode, description.ascii().data()); JNIEnv* env = getJNIEnv(); - jstring descStr = WtfStringToJstring(env, description); - jstring failUrl = WtfStringToJstring(env, failingUrl); + jstring descStr = wtfStringToJstring(env, description); + jstring failUrl = wtfStringToJstring(env, failingUrl); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mReportError, errorCode, descStr, failUrl); env->DeleteLocalRef(descStr); @@ -551,7 +551,7 @@ WebFrame::loadStarted(WebCore::Frame* frame) favicon = webcoreImageToJavaBitmap(env, icon); LOGV("favicons", "Starting load with icon %p for %s", icon, url.string().utf8().data()); } - jstring urlStr = WtfStringToJstring(env, urlString); + jstring urlStr = wtfStringToJstring(env, urlString); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mLoadStarted, urlStr, favicon, (int)loadType, isMainFrame); @@ -607,7 +607,7 @@ WebFrame::didFinishLoad(WebCore::Frame* frame) bool isMainFrame = (!frame->tree() || !frame->tree()->parent()); WebCore::FrameLoadType loadType = loader->loadType(); const WTF::String& urlString = url.string(); - jstring urlStr = WtfStringToJstring(env, urlString); + jstring urlStr = wtfStringToJstring(env, urlString); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mLoadFinished, urlStr, (int)loadType, isMainFrame); checkException(env); @@ -657,7 +657,7 @@ WebFrame::setTitle(const WTF::String& title) LOGV("setTitle(%s)", title.ascii().data()); #endif JNIEnv* env = getJNIEnv(); - jstring jTitleStr = WtfStringToJstring(env, title); + jstring jTitleStr = wtfStringToJstring(env, title); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mSetTitle, jTitleStr); checkException(env); @@ -719,7 +719,7 @@ WebFrame::didReceiveTouchIconURL(const WTF::String& url, bool precomposed) TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter); #endif JNIEnv* env = getJNIEnv(); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jUrlStr = wtfStringToJstring(env, url); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mDidReceiveTouchIconUrl, jUrlStr, precomposed); @@ -735,7 +735,7 @@ WebFrame::updateVisitedHistory(const WebCore::KURL& url, bool reload) #endif const WTF::String& urlStr = url.string(); JNIEnv* env = getJNIEnv(); - jstring jUrlStr = WtfStringToJstring(env, urlStr); + jstring jUrlStr = wtfStringToJstring(env, urlStr); env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mUpdateVisitedHistory, jUrlStr, reload); env->DeleteLocalRef(jUrlStr); @@ -763,7 +763,7 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request) if (url.isEmpty()) return true; JNIEnv* env = getJNIEnv(); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jUrlStr = wtfStringToJstring(env, url); // check to see whether browser app wants to hijack url loading. // if browser app handles the url, we will return false to bail out WebCore loading @@ -918,8 +918,8 @@ void WebFrame::maybeSavePassword(WebCore::Frame* frame, const WebCore::ResourceR return; JNIEnv* env = getJNIEnv(); - jstring jUsername = WtfStringToJstring(env, username); - jstring jPassword = WtfStringToJstring(env, password); + jstring jUsername = wtfStringToJstring(env, username); + jstring jPassword = wtfStringToJstring(env, password); jbyteArray jPostData = getPostData(request); if (jPostData) { env->CallVoidMethod(mJavaFrame->frame(env).get(), @@ -1376,7 +1376,7 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole xmlFreeTextWriter(writer); if (result) - return WtfStringToJstring(env, filename); + return wtfStringToJstring(env, filename); return NULL; #endif @@ -1392,7 +1392,7 @@ static jstring ExternalRepresentation(JNIEnv *env, jobject obj) // Request external representation of the render tree WTF::String renderDump = WebCore::externalRepresentation(pFrame); - return WtfStringToJstring(env, renderDump); + return wtfStringToJstring(env, renderDump); } static StringBuilder FrameAsText(WebCore::Frame *pFrame, jboolean dumpChildFrames) { @@ -1426,7 +1426,7 @@ static jstring DocumentAsText(JNIEnv *env, jobject obj) LOG_ASSERT(pFrame, "android_webcore_nativeDocumentAsText must take a valid frame pointer!"); WTF::String renderDump = FrameAsText(pFrame, false /* dumpChildFrames */).toString(); - return WtfStringToJstring(env, renderDump); + return wtfStringToJstring(env, renderDump); } static jstring ChildFramesAsText(JNIEnv *env, jobject obj) @@ -1442,7 +1442,7 @@ static jstring ChildFramesAsText(JNIEnv *env, jobject obj) renderDumpBuilder.append(FrameAsText(pFrame->tree()->child(i), true /* dumpChildFrames */).toString()); } WTF::String renderDump = renderDumpBuilder.toString(); - return WtfStringToJstring(env, renderDump); + return wtfStringToJstring(env, renderDump); } static void Reload(JNIEnv *env, jobject obj, jboolean allowStale) @@ -1495,7 +1495,7 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj, ScriptState* scriptState = mainWorldScriptState(pFrame); if (!value.getString(scriptState, result)) return NULL; - return WtfStringToJstring(env, result); + return wtfStringToJstring(env, result); } // Wrap the JavaInstance used when binding custom javascript interfaces. Use a @@ -1768,8 +1768,8 @@ static jobjectArray GetUsernamePassword(JNIEnv *env, jobject obj) jclass stringClass = env->FindClass("java/lang/String"); strArray = env->NewObjectArray(2, stringClass, NULL); env->DeleteLocalRef(stringClass); - env->SetObjectArrayElement(strArray, 0, WtfStringToJstring(env, username)); - env->SetObjectArrayElement(strArray, 1, WtfStringToJstring(env, password)); + env->SetObjectArrayElement(strArray, 0, wtfStringToJstring(env, username)); + env->SetObjectArrayElement(strArray, 1, wtfStringToJstring(env, password)); } return strArray; } @@ -1855,8 +1855,8 @@ static jobject GetFormTextData(JNIEnv *env, jobject obj) int len = value.length(); if (len) { const WTF::AtomicString& name = input->name(); - jstring key = WtfStringToJstring(env, name); - jstring val = WtfStringToJstring(env, value); + jstring key = wtfStringToJstring(env, name); + jstring val = wtfStringToJstring(env, value); LOG_ASSERT(key && val, "name or value not set"); env->CallObjectMethod(hashMap, put, key, val); env->DeleteLocalRef(key); diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp index 179fb2b..0708644 100644 --- a/WebKit/android/jni/WebCoreJni.cpp +++ b/WebKit/android/jni/WebCoreJni.cpp @@ -71,7 +71,7 @@ WTF::String jstringToWtfString(JNIEnv* env, jstring str) return ret; } -jstring WtfStringToJstring(JNIEnv* env, const WTF::String& str, bool validOnZeroLength) +jstring wtfStringToJstring(JNIEnv* env, const WTF::String& str, bool validOnZeroLength) { int length = str.length(); return length || validOnZeroLength ? env->NewString(str.characters(), length) : 0; diff --git a/WebKit/android/jni/WebCoreJni.h b/WebKit/android/jni/WebCoreJni.h index b10769c..7e01912 100644 --- a/WebKit/android/jni/WebCoreJni.h +++ b/WebKit/android/jni/WebCoreJni.h @@ -75,7 +75,7 @@ WTF::String jstringToWtfString(JNIEnv*, jstring); // Returns a local reference to a new jstring. If validOnZeroLength is true then // passing in an empty WTF String will result in an empty jstring. Otherwise // an empty WTF String returns 0. -jstring WtfStringToJstring(JNIEnv*, const WTF::String&, bool validOnZeroLength = false); +jstring wtfStringToJstring(JNIEnv*, const WTF::String&, bool validOnZeroLength = false); #if USE(CHROME_NETWORK_STACK) string16 jstringToString16(JNIEnv*, jstring); diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp index d44df4c..f9acc97 100644 --- a/WebKit/android/jni/WebCoreResourceLoader.cpp +++ b/WebKit/android/jni/WebCoreResourceLoader.cpp @@ -120,7 +120,7 @@ bool WebCoreResourceLoader::willLoadFromCache(const WebCore::KURL& url, int64_t { JNIEnv* env = JSC::Bindings::getJNIEnv(); WTF::String urlStr = url.string(); - jstring jUrlStr = WtfStringToJstring(env, urlStr); + jstring jUrlStr = wtfStringToJstring(env, urlStr); jclass resourceLoader = env->FindClass("android/webkit/LoadListener"); bool val = env->CallStaticBooleanMethod(resourceLoader, gResourceLoader.mWillLoadFromCacheMethodID, jUrlStr, identifier); checkException(env); @@ -269,7 +269,7 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj, } handle->client()->willSendRequest(handle, r, *response); delete response; - return WtfStringToJstring(env, url.string()); + return wtfStringToJstring(env, url.string()); } void WebCoreResourceLoader::Error(JNIEnv* env, jobject obj, jint id, jstring description, diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp index 206c1e7..d3893ff 100644 --- a/WebKit/android/jni/WebHistory.cpp +++ b/WebKit/android/jni/WebHistory.cpp @@ -272,15 +272,15 @@ void WebHistoryItem::updateHistoryItem(WebCore::HistoryItem* item) { const WTF::String& urlString = item->urlString(); jstring urlStr = NULL; if (!urlString.isNull()) - urlStr = WtfStringToJstring(env, urlString); + urlStr = wtfStringToJstring(env, urlString); const WTF::String& originalUrlString = item->originalURLString(); jstring originalUrlStr = NULL; if (!originalUrlString.isNull()) - originalUrlStr = WtfStringToJstring(env, originalUrlString); + originalUrlStr = wtfStringToJstring(env, originalUrlString); const WTF::String& titleString = item->title(); jstring titleStr = NULL; if (!titleString.isNull()) - titleStr = WtfStringToJstring(env, titleString); + titleStr = wtfStringToJstring(env, titleString); // Try to get the favicon from the history item. For some pages like Grand // Prix, there are history items with anchors. If the icon fails for the diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp index b31b212..ebe840b 100644 --- a/WebKit/android/jni/WebStorage.cpp +++ b/WebKit/android/jni/WebStorage.cpp @@ -63,7 +63,7 @@ static jobject GetOrigins(JNIEnv* env, jobject obj) for (unsigned i = 0; i < coreOrigins.size(); ++i) { WebCore::SecurityOrigin* origin = coreOrigins[i].get(); WTF::String url = origin->toString(); - jstring jUrl = WtfStringToJstring(env, url); + jstring jUrl = wtfStringToJstring(env, url); env->CallBooleanMethod(set, mid, jUrl); env->DeleteLocalRef(jUrl); } diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index d5d2bb8..9c3f0a1 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -211,7 +211,7 @@ struct WebViewCoreStaticMethods { // Check whether a media mimeType is supported in Android media framework. bool WebViewCore::isSupportedMediaMimeType(const WTF::String& mimeType) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jMimeType = WtfStringToJstring(env, mimeType); + jstring jMimeType = wtfStringToJstring(env, mimeType); jclass webViewCore = env->FindClass("android/webkit/WebViewCore"); bool val = env->CallStaticBooleanMethod(webViewCore, gWebViewCoreStaticMethods.m_isSupportedMediaMimeType, jMimeType); @@ -2592,7 +2592,7 @@ void WebViewCore::openFileChooser(PassRefPtr<WebCore::FileChooser> chooser) { JNIEnv* env = JSC::Bindings::getJNIEnv(); WTF::String acceptType = chooser->acceptTypes(); - jstring jAcceptType = WtfStringToJstring(env, acceptType, true); + jstring jAcceptType = wtfStringToJstring(env, acceptType, true); jstring jName = (jstring) env->CallObjectMethod( m_javaGlue->object(env).get(), m_javaGlue->m_openFileChooser, jAcceptType); checkException(env); @@ -3019,8 +3019,8 @@ void WebViewCore::formDidBlur(const WebCore::Node* node) void WebViewCore::addMessageToConsole(const WTF::String& message, unsigned int lineNumber, const WTF::String& sourceID, int msgLevel) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jMessageStr = WtfStringToJstring(env, message); - jstring jSourceIDStr = WtfStringToJstring(env, sourceID); + jstring jMessageStr = wtfStringToJstring(env, message); + jstring jSourceIDStr = wtfStringToJstring(env, sourceID); env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_addMessageToConsole, jMessageStr, lineNumber, jSourceIDStr, msgLevel); @@ -3032,8 +3032,8 @@ void WebViewCore::addMessageToConsole(const WTF::String& message, unsigned int l void WebViewCore::jsAlert(const WTF::String& url, const WTF::String& text) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jInputStr = WtfStringToJstring(env, text); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jInputStr = wtfStringToJstring(env, text); + jstring jUrlStr = wtfStringToJstring(env, url); env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_jsAlert, jUrlStr, jInputStr); env->DeleteLocalRef(jInputStr); env->DeleteLocalRef(jUrlStr); @@ -3044,8 +3044,8 @@ void WebViewCore::exceededDatabaseQuota(const WTF::String& url, const WTF::Strin { #if ENABLE(DATABASE) JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jDatabaseIdentifierStr = WtfStringToJstring(env, databaseIdentifier); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jDatabaseIdentifierStr = wtfStringToJstring(env, databaseIdentifier); + jstring jUrlStr = wtfStringToJstring(env, url); env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_exceededDatabaseQuota, jUrlStr, jDatabaseIdentifierStr, currentQuota, estimatedSize); @@ -3076,7 +3076,7 @@ void WebViewCore::populateVisitedLinks(WebCore::PageGroup* group) void WebViewCore::geolocationPermissionsShowPrompt(const WTF::String& origin) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring originString = WtfStringToJstring(env, origin); + jstring originString = wtfStringToJstring(env, origin); env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_geolocationPermissionsShowPrompt, originString); @@ -3113,8 +3113,8 @@ jobject WebViewCore::getDeviceOrientationService() bool WebViewCore::jsConfirm(const WTF::String& url, const WTF::String& text) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jInputStr = WtfStringToJstring(env, text); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jInputStr = wtfStringToJstring(env, text); + jstring jUrlStr = wtfStringToJstring(env, url); jboolean result = env->CallBooleanMethod(m_javaGlue->object(env).get(), m_javaGlue->m_jsConfirm, jUrlStr, jInputStr); env->DeleteLocalRef(jInputStr); env->DeleteLocalRef(jUrlStr); @@ -3125,9 +3125,9 @@ bool WebViewCore::jsConfirm(const WTF::String& url, const WTF::String& text) bool WebViewCore::jsPrompt(const WTF::String& url, const WTF::String& text, const WTF::String& defaultValue, WTF::String& result) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jInputStr = WtfStringToJstring(env, text); - jstring jDefaultStr = WtfStringToJstring(env, defaultValue); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jInputStr = wtfStringToJstring(env, text); + jstring jDefaultStr = wtfStringToJstring(env, defaultValue); + jstring jUrlStr = wtfStringToJstring(env, url); jstring returnVal = static_cast<jstring>(env->CallObjectMethod(m_javaGlue->object(env).get(), m_javaGlue->m_jsPrompt, jUrlStr, jInputStr, jDefaultStr)); env->DeleteLocalRef(jInputStr); env->DeleteLocalRef(jDefaultStr); @@ -3145,8 +3145,8 @@ bool WebViewCore::jsPrompt(const WTF::String& url, const WTF::String& text, cons bool WebViewCore::jsUnload(const WTF::String& url, const WTF::String& message) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jInputStr = WtfStringToJstring(env, message); - jstring jUrlStr = WtfStringToJstring(env, url); + jstring jInputStr = wtfStringToJstring(env, message); + jstring jUrlStr = wtfStringToJstring(env, url); jboolean result = env->CallBooleanMethod(m_javaGlue->object(env).get(), m_javaGlue->m_jsUnload, jUrlStr, jInputStr); env->DeleteLocalRef(jInputStr); env->DeleteLocalRef(jUrlStr); @@ -3202,7 +3202,7 @@ void WebViewCore::updateTextfield(WebCore::Node* ptr, bool changeToPassword, checkException(env); return; } - jstring string = WtfStringToJstring(env, text); + jstring string = wtfStringToJstring(env, text); env->CallVoidMethod(m_javaGlue->object(env).get(), m_javaGlue->m_updateTextfield, (int) ptr, false, string, m_textGeneration); env->DeleteLocalRef(string); @@ -3236,7 +3236,7 @@ jclass WebViewCore::getPluginClass(const WTF::String& libName, const char* class { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring libString = WtfStringToJstring(env, libName); + jstring libString = wtfStringToJstring(env, libName); jstring classString = env->NewStringUTF(className); jobject pluginClass = env->CallObjectMethod(m_javaGlue->object(env).get(), m_javaGlue->m_getPluginClass, @@ -3411,7 +3411,7 @@ static void RevealSelection(JNIEnv *env, jobject obj) static jstring RequestLabel(JNIEnv *env, jobject obj, int framePointer, int nodePointer) { - return WtfStringToJstring(env, GET_NATIVE_VIEW(env, obj)->requestLabel( + return wtfStringToJstring(env, GET_NATIVE_VIEW(env, obj)->requestLabel( (WebCore::Frame*) framePointer, (WebCore::Node*) nodePointer)); } @@ -3520,7 +3520,7 @@ static jstring ModifySelection(JNIEnv *env, jobject obj, jint direction, jint gr #endif WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj); String selectionString = viewImpl->modifySelection(direction, granularity); - return WtfStringToJstring(env, selectionString); + return wtfStringToJstring(env, selectionString); } static void ReplaceTextfieldText(JNIEnv *env, jobject obj, @@ -3727,7 +3727,7 @@ static jstring RetrieveHref(JNIEnv *env, jobject obj, jint x, jint y) LOG_ASSERT(viewImpl, "viewImpl not set in %s", __FUNCTION__); WTF::String result = viewImpl->retrieveHref(x, y); if (!result.isEmpty()) - return WtfStringToJstring(env, result); + return wtfStringToJstring(env, result); return 0; } @@ -3740,14 +3740,14 @@ static jstring RetrieveAnchorText(JNIEnv *env, jobject obj, jint x, jint y) LOG_ASSERT(viewImpl, "viewImpl not set in %s", __FUNCTION__); WTF::String result = viewImpl->retrieveAnchorText(x, y); if (!result.isEmpty()) - return WtfStringToJstring(env, result); + return wtfStringToJstring(env, result); return 0; } static jstring RetrieveImageSource(JNIEnv *env, jobject obj, jint x, jint y) { WTF::String result = GET_NATIVE_VIEW(env, obj)->retrieveImageSource(x, y); - return !result.isEmpty() ? WtfStringToJstring(env, result) : 0; + return !result.isEmpty() ? wtfStringToJstring(env, result) : 0; } static void MoveFocus(JNIEnv *env, jobject obj, jint framePtr, jint nodePtr) diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index d9f831e..4b0f21d 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1033,7 +1033,7 @@ int getBlockLeftEdge(int x, int y, float scale) void overrideUrlLoading(const WTF::String& url) { JNIEnv* env = JSC::Bindings::getJNIEnv(); - jstring jName = WtfStringToJstring(env, url); + jstring jName = wtfStringToJstring(env, url); env->CallVoidMethod(m_javaGlue.object(env).get(), m_javaGlue.m_overrideLoading, jName); env->DeleteLocalRef(jName); @@ -1607,7 +1607,7 @@ static jobject nativeCursorText(JNIEnv *env, jobject obj) if (!node) return 0; WTF::String value = node->getExport(); - return WtfStringToJstring(env, value); + return wtfStringToJstring(env, value); } static void nativeDebugDump(JNIEnv *env, jobject obj) @@ -1671,7 +1671,7 @@ static jobject nativeImageURI(JNIEnv *env, jobject obj, jint x, jint y) WebView* view = GET_NATIVE_VIEW(env, obj); LOG_ASSERT(view, "view not set in %s", __FUNCTION__); WTF::String uri = view->imageURI(x, y); - return WtfStringToJstring(env, uri); + return wtfStringToJstring(env, uri); } static jint nativeFocusCandidateFramePointer(JNIEnv *env, jobject obj) @@ -1723,7 +1723,7 @@ static jobject nativeFocusCandidateName(JNIEnv *env, jobject obj) if (!input) return 0; const WTF::String& name = input->name(); - return WtfStringToJstring(env, name); + return wtfStringToJstring(env, name); } static jobject createJavaRect(JNIEnv* env, int x, int y, int right, int bottom) @@ -1767,7 +1767,7 @@ static jobject nativeFocusCandidateText(JNIEnv *env, jobject obj) if (!node) return 0; WTF::String value = node->getExport(); - return WtfStringToJstring(env, value); + return wtfStringToJstring(env, value); } static int nativeFocusCandidateLineHeight(JNIEnv *env, jobject obj) @@ -2167,7 +2167,7 @@ static jobject nativeGetSelection(JNIEnv *env, jobject obj) WebView* view = GET_NATIVE_VIEW(env, obj); LOG_ASSERT(view, "view not set in %s", __FUNCTION__); String selection = view->getSelection(); - return WtfStringToJstring(env, selection); + return wtfStringToJstring(env, selection); } static jboolean nativeHitSelection(JNIEnv *env, jobject obj, int x, int y) |