Title: [166271] trunk/Source/WebKit2
- Revision
- 166271
- Author
- psola...@apple.com
- Date
- 2014-03-25 17:31:55 -0700 (Tue, 25 Mar 2014)
Log Message
Remove PLATFORM(IOS) from NetworkProcessMac.mm
https://bugs.webkit.org/show_bug.cgi?id=130751
Reviewed by Alexey Proskuryakov.
Code in NetworkProcessMac.mm is guarded by PLATFORM(MAC) and so is not compiled on iOS.
Having PLATFORM(IOS) code in this file is unnecessary and confusing.
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::initializeProcessName):
(WebKit::overrideSystemProxies):
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166270 => 166271)
--- trunk/Source/WebKit2/ChangeLog 2014-03-26 00:01:09 UTC (rev 166270)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-26 00:31:55 UTC (rev 166271)
@@ -1,3 +1,18 @@
+2014-03-25 Pratik Solanki <psola...@apple.com>
+
+ Remove PLATFORM(IOS) from NetworkProcessMac.mm
+ https://bugs.webkit.org/show_bug.cgi?id=130751
+
+ Reviewed by Alexey Proskuryakov.
+
+ Code in NetworkProcessMac.mm is guarded by PLATFORM(MAC) and so is not compiled on iOS.
+ Having PLATFORM(IOS) code in this file is unnecessary and confusing.
+
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::initializeProcessName):
+ (WebKit::overrideSystemProxies):
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+
2014-03-25 Anders Carlsson <ander...@apple.com>
Add a UI delegate callback for handling window.open
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (166270 => 166271)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-26 00:01:09 UTC (rev 166270)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2014-03-26 00:31:55 UTC (rev 166271)
@@ -51,7 +51,7 @@
extern "C" CFURLCacheRef CFURLCacheCopySharedURLCache();
extern "C" void _CFURLCachePurgeMemoryCache(CFURLCacheRef);
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
extern "C" void _CFURLCacheSetMinSizeForVMCachedResource(CFURLCacheRef, CFIndex);
#endif
@@ -71,15 +71,10 @@
void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)
{
-#if PLATFORM(IOS)
- UNUSED_PARAM(parameters);
-#else
NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Networking", "visible name of the network process. The argument is the application name."), (NSString *)parameters.uiProcessName];
WKSetVisibleApplicationName((CFStringRef)applicationName);
-#endif
}
-#if !PLATFORM(IOS)
static void overrideSystemProxies(const String& httpProxy, const String& httpsProxy)
{
NSMutableDictionary *proxySettings = [NSMutableDictionary dictionary];
@@ -112,7 +107,6 @@
if ([proxySettings count] > 0)
WKCFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings);
}
-#endif
void NetworkProcess::platformLowMemoryHandler(bool)
{
@@ -135,12 +129,10 @@
SecItemShim::shared().initialize(this);
#endif
-#if !PLATFORM(IOS)
if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy);
-#endif
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
if (!cache)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
