From c398112a54344846e338f2722709d9c00af10263 Mon Sep 17 00:00:00 2001
From: Patrick Scott <>
Date: Wed, 8 Apr 2009 00:25:22 -0700
Subject: [PATCH] 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
---
 WebKit/android/jni/WebCoreFrameBridge.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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