From 083281a74dcbae18120ca706e89a48c416b9f10c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Mon, 23 May 2011 15:14:04 +0100 Subject: Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE Passing the extra string argument, blacklist, to the proxy in chromium. Need CL in frameworks/base: https://android-git.corp.google.com/g/#change,111109 And external/chromium: https://android-git.corp.google.com/g/#change,111107 Change-Id: I09e70c7f201dbee2823d9cbbd394b2bab9a76f06 --- WebKit/android/jni/JavaBridge.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'WebKit/android/jni/JavaBridge.cpp') diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index d27dbc7..2b44d69 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -109,7 +109,7 @@ public: static void AddPackageNames(JNIEnv* env, jobject obj, jobject packageNames); static void AddPackageName(JNIEnv* env, jobject obj, jstring packageName); static void RemovePackageName(JNIEnv* env, jobject obj, jstring packageName); - static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy); + static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList); private: @@ -455,12 +455,13 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName packageNotifier().removePackageName(jstringToWtfString(env, packageName)); } -void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy) +void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList) { #if USE(CHROME_NETWORK_STACK) std::string proxy = jstringToStdString(env, newProxy); - WebCache::get(false)->proxy()->UpdateProxySettings(proxy); - WebCache::get(true)->proxy()->UpdateProxySettings(proxy); + std::string exList = jstringToStdString(env, newExList); + WebCache::get(false)->proxy()->UpdateProxySettings(proxy, exList); + WebCache::get(true)->proxy()->UpdateProxySettings(proxy, exList); #endif } @@ -494,7 +495,7 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = { (void*) JavaBridge::AddPackageName }, { "removePackageName", "(Ljava/lang/String;)V", (void*) JavaBridge::RemovePackageName }, - { "updateProxy", "(Ljava/lang/String;)V", + { "nativeUpdateProxy", "(Ljava/lang/String;Ljava/lang/String;)V", (void*) JavaBridge::UpdateProxy } }; -- cgit v1.1