From 55214ba76aaceabcf9c6cc77aa8a2496b1e3dad5 Mon Sep 17 00:00:00 2001 From: "jiewen_tan@apple.com" Date: Wed, 30 May 2018 19:23:57 +0000 Subject: [PATCH] Unreviewed, a quick build fix for r232276. Enabled SecItemShim again as it turns out to be useful for CFNetwork APIs that query Keychains underneath us. * NetworkProcess/ios/NetworkProcessIOS.mm: (WebKit::NetworkProcess::platformInitializeNetworkProcess): * NetworkProcess/mac/NetworkProcessMac.mm: (WebKit::NetworkProcess::platformInitializeNetworkProcess): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232303 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/ChangeLog | 12 ++++++++++++ Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm | 3 ++- Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 5abe2d2..c748e88 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,15 @@ +2018-05-30 Jiewen Tan + + Unreviewed, a quick build fix for r232276. + + Enabled SecItemShim again as it turns out to be useful for CFNetwork APIs that + query Keychains underneath us. + + * NetworkProcess/ios/NetworkProcessIOS.mm: + (WebKit::NetworkProcess::platformInitializeNetworkProcess): + * NetworkProcess/mac/NetworkProcessMac.mm: + (WebKit::NetworkProcess::platformInitializeNetworkProcess): + 2018-05-30 Jer Noble Auto-pip should use main content heuristic. diff --git a/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm b/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm index 2243721..70f7ca5 100644 --- a/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm +++ b/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm @@ -84,7 +84,8 @@ void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear) void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters) { -#if ENABLE(SEC_ITEM_SHIM) && !HAVE(SEC_KEY_PROXY) +#if ENABLE(SEC_ITEM_SHIM) + // SecItemShim is needed for CFNetwork APIs that query Keychains beneath us. initializeSecItemShim(*this); #endif platformInitializeNetworkProcessCocoa(parameters); diff --git a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm index 8e83346..5fd40da 100644 --- a/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm +++ b/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm @@ -104,7 +104,8 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati { platformInitializeNetworkProcessCocoa(parameters); -#if ENABLE(SEC_ITEM_SHIM) && !HAVE(SEC_KEY_PROXY) +#if ENABLE(SEC_ITEM_SHIM) + // SecItemShim is needed for CFNetwork APIs that query Keychains beneath us. initializeSecItemShim(*this); #endif -- 1.8.3.1