summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-24 11:25:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-24 11:25:09 -0700
commit891974e8053115e15fdcf669bd052cbaaf372003 (patch)
tree153dd84c859f68386fc5a1c8c375ebd94cc129e1
parent2f7dd35491b3ac2609b72503a0522f5128849156 (diff)
parent19d88459b21f666ef99b72db249b9f3329c28c5e (diff)
downloadexternal_webkit-891974e8053115e15fdcf669bd052cbaaf372003.zip
external_webkit-891974e8053115e15fdcf669bd052cbaaf372003.tar.gz
external_webkit-891974e8053115e15fdcf669bd052cbaaf372003.tar.bz2
am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '19d88459b21f666ef99b72db249b9f3329c28c5e': Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
-rw-r--r--WebKit/android/jni/JavaBridge.cpp11
1 files changed, 6 insertions, 5 deletions
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 }
};