Add WebKitSystemInterface needed for overriding system proxies on Mac
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Jan 2013 05:21:19 +0000 (05:21 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Jan 2013 05:21:19 +0000 (05:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=106410

Patch by Kiran Muppala <cmuppala@apple.com> on 2013-01-08
Reviewed by Stephanie Lewis.

This patch is in anticipation of the fix for https://bugs.webkit.org/show_bug.cgi?id=104197,
Add user defaults to override system proxy settings for NetworkProcess on Mac, which
is awaiting the approval of a WebKit2 committer.  Commiting the WKSI portion separately,
so that the internal repository commit for generating the WKSI libraries does not have to
be rolled back every time the rest of the patch changes.

Add WKCFNetworkSetOverrideSystemProxySettings(), needed by NetworkProcess to set
custom proxies during initialization.

* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceMountainLion.a:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitLibraries/ChangeLog
WebKitLibraries/WebKitSystemInterface.h
WebKitLibraries/libWebKitSystemInterfaceLion.a
WebKitLibraries/libWebKitSystemInterfaceMountainLion.a

index fcda3ec..d4c4131 100644 (file)
@@ -1,3 +1,23 @@
+2013-01-08  Kiran Muppala  <cmuppala@apple.com>
+
+        Add WebKitSystemInterface needed for overriding system proxies on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=106410
+
+        Reviewed by Stephanie Lewis.
+
+        This patch is in anticipation of the fix for https://bugs.webkit.org/show_bug.cgi?id=104197,
+        Add user defaults to override system proxy settings for NetworkProcess on Mac, which
+        is awaiting the approval of a WebKit2 committer.  Commiting the WKSI portion separately,
+        so that the internal repository commit for generating the WKSI libraries does not have to
+        be rolled back every time the rest of the patch changes.
+
+        Add WKCFNetworkSetOverrideSystemProxySettings(), needed by NetworkProcess to set
+        custom proxies during initialization.
+
+        * WebKitSystemInterface.h:
+        * libWebKitSystemInterfaceLion.a:
+        * libWebKitSystemInterfaceMountainLion.a:
+
 2013-01-04  Adam Klein  <adamk@chromium.org>
 
         Remove ENABLE_MUTATION_OBSERVERS #define
index 96c5384..cdcd5fb 100644 (file)
@@ -541,6 +541,8 @@ id WKNSProcessInfoProcessAssertionWithTypes(WKProcessAssertionTypes);
 bool WKIsJavaPlugInActive(void);
 void WKActivateJavaPlugIn(void);
 
+void WKCFNetworkSetOverrideSystemProxySettings(CFDictionaryRef);
+
 #ifdef __cplusplus
 }
 #endif
index 12d7048..3fcd8a3 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceLion.a and b/WebKitLibraries/libWebKitSystemInterfaceLion.a differ
index 0e8dfeb..108d1dc 100644 (file)
Binary files a/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a and b/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a differ