summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrace Kloba <>2009-04-08 18:57:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-08 18:57:56 -0700
commita9d72860e452dff0455370a7feaa6e0cb4a7d085 (patch)
tree6aa4f25ed5813e51a62921765cbee72e657f9240
parent57351744ba8365dc22805b3a514e8bbbf6d8c0b3 (diff)
downloadexternal_webkit-a9d72860e452dff0455370a7feaa6e0cb4a7d085.zip
external_webkit-a9d72860e452dff0455370a7feaa6e0cb4a7d085.tar.gz
external_webkit-a9d72860e452dff0455370a7feaa6e0cb4a7d085.tar.bz2
AI 145241: Automated g4 rollback of changelist 144888.
*** Reason for rollback *** Browser home page won't load. *** Original change description *** 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. Automated import of CL 145241
-rw-r--r--WebKit/android/jni/WebCoreFrameBridge.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 3eeeb7f..91103fb 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -789,8 +789,7 @@ 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 =
- WebCore::encodeWithURLEscapeSequences(to_string(env, url));
+ WebCore::String webcoreUrl = to_string(env, url);
WebCore::ResourceRequest request(webcoreUrl);
LOGV("LoadUrl %s", webcoreUrl.latin1().data());
pFrame->loader()->load(request, false);