From: Grace Kloba <>
Date: Thu, 9 Apr 2009 01:57:56 +0000 (-0700)
Subject: AI 145241: Automated g4 rollback of changelist 144888.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a9d72860e452dff0455370a7feaa6e0cb4a7d085;p=android-x86%2Fexternal-webkit.git

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
---

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 3eeeb7f9a..91103fb44 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);