summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrace Kloba <>2009-04-08 19:31:40 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-08 19:31:40 -0700
commit7ed56f225e0ade046e1c2178977f72b2d896f196 (patch)
tree6384733823954f8314a7b7aa1089498b4f74d84b
parent1c8ef8b292e4eb8c03ce782b1ae6f6154d1d3db8 (diff)
downloadexternal_webkit-7ed56f225e0ade046e1c2178977f72b2d896f196.zip
external_webkit-7ed56f225e0ade046e1c2178977f72b2d896f196.tar.gz
external_webkit-7ed56f225e0ade046e1c2178977f72b2d896f196.tar.bz2
AI 145242: am: CL 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. Original author: klobag Automated import of CL 145242
-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);