summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <>2009-04-14 05:46:04 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-14 05:46:04 -0700
commita7689db32699f7f7559e7b81ece25f813c7c87ff (patch)
tree3c023823b483a64cc414ca54ac8d33ecb66365b3
parenta9d72860e452dff0455370a7feaa6e0cb4a7d085 (diff)
downloadexternal_webkit-a7689db32699f7f7559e7b81ece25f813c7c87ff.zip
external_webkit-a7689db32699f7f7559e7b81ece25f813c7c87ff.tar.gz
external_webkit-a7689db32699f7f7559e7b81ece25f813c7c87ff.tar.bz2
AI 146109: Use KURL(baseUrl, rel) with a blank baseUrl to properly encode the data:
url. BUG=1698745 Automated import of CL 146109
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 91103fb..e90d1a9 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -790,8 +790,9 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url)
LOG_ASSERT(pFrame, "nativeLoadUrl must take a valid frame pointer!");
WebCore::String webcoreUrl = to_string(env, url);
- WebCore::ResourceRequest request(webcoreUrl);
- LOGV("LoadUrl %s", webcoreUrl.latin1().data());
+ WebCore::KURL kurl(WebCore::KURL(), webcoreUrl);
+ WebCore::ResourceRequest request(kurl);
+ LOGV("LoadUrl %s", kurl.string().latin1().data());
pFrame->loader()->load(request, false);
}