summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/android/jni')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp39
1 files changed, 18 insertions, 21 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index e0f32f1..42843e0 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -340,8 +340,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 = env->NewString((unsigned short *)i->first.characters(), i->first.length());
- jstring val = env->NewString((unsigned short *)i->second.characters(), i->second.length());
+ jstring key = env->NewString(i->first.characters(), i->first.length());
+ jstring val = env->NewString(i->second.characters(), i->second.length());
if (key && val) {
env->CallObjectMethod(hashMap, put, key, val);
}
@@ -549,8 +549,8 @@ WebFrame::reportError(int errorCode, const WTF::String& description,
LOGV("::WebCore:: reportError(%d, %s)", errorCode, description.ascii().data());
JNIEnv* env = getJNIEnv();
- jstring descStr = env->NewString((unsigned short*)description.characters(), description.length());
- jstring failUrl = env->NewString((unsigned short*)failingUrl.characters(), failingUrl.length());
+ jstring descStr = env->NewString(description.characters(), description.length());
+ jstring failUrl = env->NewString(failingUrl.characters(), failingUrl.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mReportError,
errorCode, descStr, failUrl);
env->DeleteLocalRef(descStr);
@@ -593,7 +593,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 = env->NewString((unsigned short*)urlString.characters(), urlString.length());
+ jstring urlStr = env->NewString(urlString.characters(), urlString.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mLoadStarted, urlStr, favicon,
(int)loadType, isMainFrame);
@@ -649,7 +649,7 @@ WebFrame::didFinishLoad(WebCore::Frame* frame)
bool isMainFrame = (!frame->tree() || !frame->tree()->parent());
WebCore::FrameLoadType loadType = loader->loadType();
WTF::String urlString(url.string());
- jstring urlStr = env->NewString((unsigned short*)urlString.characters(), urlString.length());
+ jstring urlStr = env->NewString(urlString.characters(), urlString.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mLoadFinished, urlStr,
(int)loadType, isMainFrame);
checkException(env);
@@ -706,7 +706,7 @@ WebFrame::setTitle(const WTF::String& title)
LOGV("setTitle(%s)", title.ascii().data());
#endif
JNIEnv* env = getJNIEnv();
- jstring jTitleStr = env->NewString((unsigned short *)title.characters(), title.length());
+ jstring jTitleStr = env->NewString(title.characters(), title.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mSetTitle,
jTitleStr);
@@ -769,8 +769,7 @@ WebFrame::didReceiveTouchIconURL(const WTF::String& url, bool precomposed)
TimeCounterAuto counter(TimeCounter::JavaCallbackTimeCounter);
#endif
JNIEnv* env = getJNIEnv();
- jstring jUrlStr = env->NewString((unsigned short*)url.characters(),
- url.length());
+ jstring jUrlStr = env->NewString(url.characters(), url.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(),
mJavaFrame->mDidReceiveTouchIconUrl, jUrlStr, precomposed);
@@ -786,7 +785,7 @@ WebFrame::updateVisitedHistory(const WebCore::KURL& url, bool reload)
#endif
WTF::String urlStr(url.string());
JNIEnv* env = getJNIEnv();
- jstring jUrlStr = env->NewString((unsigned short*)urlStr.characters(), urlStr.length());
+ jstring jUrlStr = env->NewString(urlStr.characters(), urlStr.length());
env->CallVoidMethod(mJavaFrame->frame(env).get(), mJavaFrame->mUpdateVisitedHistory, jUrlStr, reload);
env->DeleteLocalRef(jUrlStr);
@@ -814,7 +813,7 @@ WebFrame::canHandleRequest(const WebCore::ResourceRequest& request)
if (url.isEmpty())
return true;
JNIEnv* env = getJNIEnv();
- jstring jUrlStr = env->NewString((unsigned short *)url.characters(), url.length());
+ jstring jUrlStr = env->NewString(url.characters(), url.length());
// 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
@@ -1281,7 +1280,7 @@ static jstring SaveWebArchive(JNIEnv *env, jobject obj, jstring basename, jboole
xmlFreeTextWriter(writer);
if (result) {
- return env->NewStringUTF(filename.utf8().data());
+ return env->NewString(filename.characters(), filename.length());
}
return NULL;
@@ -1338,7 +1337,7 @@ static jstring DocumentAsText(JNIEnv *env, jobject obj)
unsigned len = renderDump.length();
if (!len)
return NULL;
- return env->NewString((unsigned short*)renderDump.characters(), len);
+ return env->NewString(renderDump.characters(), len);
}
static jstring ChildFramesAsText(JNIEnv *env, jobject obj)
@@ -1357,7 +1356,7 @@ static jstring ChildFramesAsText(JNIEnv *env, jobject obj)
unsigned len = renderDump.length();
if (!len)
return NULL;
- return env->NewString((unsigned short*)renderDump.characters(), len);
+ return env->NewString(renderDump.characters(), len);
}
static void Reload(JNIEnv *env, jobject obj, jboolean allowStale)
@@ -1413,7 +1412,7 @@ static jobject StringByEvaluatingJavaScriptFromString(JNIEnv *env, jobject obj,
unsigned len = result.length();
if (len == 0)
return NULL;
- return env->NewString((unsigned short*)result.characters(), len);
+ return env->NewString(result.characters(), len);
}
// Wrap the JavaInstance used when binding custom javascript interfaces. Use a
@@ -1709,10 +1708,8 @@ static jobjectArray GetUsernamePassword(JNIEnv *env, jobject obj)
if (found) {
jclass stringClass = env->FindClass("java/lang/String");
strArray = env->NewObjectArray(2, stringClass, NULL);
- env->SetObjectArrayElement(strArray, 0, env->NewString((unsigned short *)
- username.characters(), username.length()));
- env->SetObjectArrayElement(strArray, 1, env->NewString((unsigned short *)
- password.characters(), password.length()));
+ env->SetObjectArrayElement(strArray, 0, env->NewString(username.characters(), username.length()));
+ env->SetObjectArrayElement(strArray, 1, env->NewString(password.characters(), password.length()));
}
return strArray;
}
@@ -1798,8 +1795,8 @@ static jobject GetFormTextData(JNIEnv *env, jobject obj)
int len = value.length();
if (len) {
const WTF::AtomicString& name = input->name();
- jstring key = env->NewString((jchar *)name.characters(), name.length());
- jstring val = env->NewString((jchar *)value.characters(), len);
+ jstring key = env->NewString(name.characters(), name.length());
+ jstring val = env->NewString(value.characters(), len);
LOG_ASSERT(key && val, "name or value not set");
env->CallObjectMethod(hashMap, put, key, val);
env->DeleteLocalRef(key);
generated by cgit v1.1 at 2025-12-01 04:28:33 +0000