summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorPatrick Scott <>2009-04-08 00:25:22 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-08 00:25:22 -0700
commitc398112a54344846e338f2722709d9c00af10263 (patch)
treea65cd4d1440ba8211d7b4ff3a2b3ac67ed1c517f /WebKit
parent044fab1023729eead4d6c521cb5023b19ce1c123 (diff)
downloadexternal_webkit-c398112a54344846e338f2722709d9c00af10263.zip
external_webkit-c398112a54344846e338f2722709d9c00af10263.tar.gz
external_webkit-c398112a54344846e338f2722709d9c00af10263.tar.bz2
AI 144889: am: CL 144888 Given a url from java, percent encode the url to maintain any encoding.
This fixes the loadData call when the data has non-ascii values. Original author: phanna Automated import of CL 144889
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 91103fb..3eeeb7f 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -789,7 +789,8 @@ static void LoadUrl(JNIEnv *env, jobject obj, jstring url)
WebCore::Frame* pFrame = GET_NATIVE_FRAME(env, obj);
LOG_ASSERT(pFrame, "nativeLoadUrl must take a valid frame pointer!");
- WebCore::String webcoreUrl = to_string(env, url);
+ WebCore::String webcoreUrl =
+ WebCore::encodeWithURLEscapeSequences(to_string(env, url));
WebCore::ResourceRequest request(webcoreUrl);
LOGV("LoadUrl %s", webcoreUrl.latin1().data());
pFrame->loader()->load(request, false);