Use Connection::sendWithReply for the SecItem shim messages
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Aug 2016 19:54:12 +0000 (19:54 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 31 Aug 2016 19:54:12 +0000 (19:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=161419

Reviewed by Tim Horton.

* DerivedSources.make:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::initializeConnection):
* NetworkProcess/mac/NetworkProcessMac.mm:
(WebKit::NetworkProcess::platformInitializeNetworkProcess):
* Shared/mac/SecItemShim.cpp:
(WebKit::workQueue):
(WebKit::sendSecItemRequest):
(WebKit::webSecItemCopyMatching):
(WebKit::webSecItemAdd):
(WebKit::webSecItemUpdate):
(WebKit::webSecItemDelete):
(WebKit::initializeSecItemShim):
(WebKit::responseMap): Deleted.
(WebKit::SecItemShim::singleton): Deleted.
(WebKit::SecItemShim::SecItemShim): Deleted.
(WebKit::generateSecItemRequestID): Deleted.
(WebKit::SecItemShim::secItemResponse): Deleted.
(WebKit::SecItemShim::initialize): Deleted.
(WebKit::SecItemShim::initializeConnection): Deleted.
* Shared/mac/SecItemShim.h:
* Shared/mac/SecItemShim.messages.in: Removed.
* UIProcess/mac/SecItemShimProxy.cpp:
(WebKit::SecItemShimProxy::didReceiveMessage):
(WebKit::SecItemShimProxy::secItemRequest):
* UIProcess/mac/SecItemShimProxy.h:
* UIProcess/mac/SecItemShimProxy.messages.in:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeConnection):
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeProcess):

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

14 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make
Source/WebKit2/NetworkProcess/NetworkProcess.cpp
Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm
Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
Source/WebKit2/Shared/mac/SecItemShim.cpp
Source/WebKit2/Shared/mac/SecItemShim.h
Source/WebKit2/Shared/mac/SecItemShim.messages.in [deleted file]
Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp
Source/WebKit2/UIProcess/mac/SecItemShimProxy.h
Source/WebKit2/UIProcess/mac/SecItemShimProxy.messages.in
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

index f0c5792..7b1c2b4 100644 (file)
@@ -1,3 +1,43 @@
+2016-08-30  Anders Carlsson  <andersca@apple.com>
+
+        Use Connection::sendWithReply for the SecItem shim messages
+        https://bugs.webkit.org/show_bug.cgi?id=161419
+
+        Reviewed by Tim Horton.
+
+        * DerivedSources.make:
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::initializeConnection):
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+        * Shared/mac/SecItemShim.cpp:
+        (WebKit::workQueue):
+        (WebKit::sendSecItemRequest):
+        (WebKit::webSecItemCopyMatching):
+        (WebKit::webSecItemAdd):
+        (WebKit::webSecItemUpdate):
+        (WebKit::webSecItemDelete):
+        (WebKit::initializeSecItemShim):
+        (WebKit::responseMap): Deleted.
+        (WebKit::SecItemShim::singleton): Deleted.
+        (WebKit::SecItemShim::SecItemShim): Deleted.
+        (WebKit::generateSecItemRequestID): Deleted.
+        (WebKit::SecItemShim::secItemResponse): Deleted.
+        (WebKit::SecItemShim::initialize): Deleted.
+        (WebKit::SecItemShim::initializeConnection): Deleted.
+        * Shared/mac/SecItemShim.h:
+        * Shared/mac/SecItemShim.messages.in: Removed.
+        * UIProcess/mac/SecItemShimProxy.cpp:
+        (WebKit::SecItemShimProxy::didReceiveMessage):
+        (WebKit::SecItemShimProxy::secItemRequest):
+        * UIProcess/mac/SecItemShimProxy.h:
+        * UIProcess/mac/SecItemShimProxy.messages.in:
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeConnection):
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeProcess):
+
 2016-08-31  Andreas Kling  <akling@apple.com>
 
         DOM event handling should pass Event around by reference.
index 220b8a8..f967a1f 100644 (file)
@@ -110,7 +110,6 @@ MESSAGE_RECEIVERS = \
     RemoteLayerTreeDrawingAreaProxy \
     RemoteObjectRegistry \
     RemoteScrollingCoordinator \
-    SecItemShim \
     SecItemShimProxy \
     SmartMagnificationController \
     StorageAreaMap \
index 1846da5..bca3f47 100644 (file)
@@ -245,10 +245,6 @@ void NetworkProcess::initializeConnection(IPC::Connection* connection)
 {
     ChildProcess::initializeConnection(connection);
 
-#if ENABLE(SEC_ITEM_SHIM)
-    SecItemShim::singleton().initializeConnection(connection);
-#endif
-
     NetworkProcessSupplementMap::const_iterator it = m_supplements.begin();
     NetworkProcessSupplementMap::const_iterator end = m_supplements.end();
     for (; it != end; ++it)
index b5b702f..cedbd7e 100644 (file)
@@ -86,7 +86,7 @@ void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
 void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
 {
 #if ENABLE(SEC_ITEM_SHIM)
-    SecItemShim::singleton().initialize(this);
+    initializeSecItemShim(*this);
 #endif
     platformInitializeNetworkProcessCocoa(parameters);
 }
index 27cef56..35e2b07 100644 (file)
@@ -100,7 +100,7 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
     platformInitializeNetworkProcessCocoa(parameters);
 
 #if ENABLE(SEC_ITEM_SHIM)
-    SecItemShim::singleton().initialize(this);
+    initializeSecItemShim(*this);
 #endif
 
     if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull())
index 1ec08fe..43700d1 100644 (file)
@@ -33,7 +33,6 @@
 #include "SecItemRequestData.h"
 #include "SecItemResponseData.h"
 #include "SecItemShimLibrary.h"
-#include "SecItemShimMessages.h"
 #include "SecItemShimProxyMessages.h"
 #include <Security/Security.h>
 #include <atomic>
@@ -58,54 +57,41 @@ extern "C" void _CFURLConnectionSetFrameworkStubs(const struct _CFNFrameworksStu
 
 namespace WebKit {
 
-static BlockingResponseMap<SecItemResponseData>& responseMap()
+static ChildProcess* sharedProcess;
+
+static WorkQueue& workQueue()
 {
-    static std::once_flag onceFlag;
-    static LazyNeverDestroyed<BlockingResponseMap<SecItemResponseData>> responseMap;
+    static WorkQueue* workQueue;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        workQueue = &WorkQueue::create("com.apple.WebKit.SecItemShim").leakRef();
 
-    std::call_once(onceFlag, [] {
-        responseMap.construct();
     });
 
-    return responseMap;
+    return *workQueue;
 }
 
-static ChildProcess* sharedProcess;
-
-SecItemShim& SecItemShim::singleton()
+static Optional<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
 {
-    static SecItemShim* shim;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        shim = adoptRef(new SecItemShim).leakRef();
-    });
+    Optional<SecItemResponseData> response;
 
-    return *shim;
-}
+    auto semaphore = adoptOSObject(dispatch_semaphore_create(0));
 
-SecItemShim::SecItemShim()
-    : m_queue(WorkQueue::create("com.apple.WebKit.SecItemShim"))
-{
-}
+    sharedProcess->parentProcessConnection()->sendWithReply(Messages::SecItemShimProxy::SecItemRequest(SecItemRequestData(requestType, query, attributesToMatch)), 0, workQueue(), [&response, &semaphore](auto reply) {
+        if (reply)
+            response = WTFMove(std::get<0>(*reply));
 
-static uint64_t generateSecItemRequestID()
-{
-    static std::atomic<int64_t> uniqueSecItemRequestID;
-    return ++uniqueSecItemRequestID;
-}
+        dispatch_semaphore_signal(semaphore.get());
+    });
 
-static std::unique_ptr<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
-{
-    uint64_t requestID = generateSecItemRequestID();
-    if (!sharedProcess->parentProcessConnection()->send(Messages::SecItemShimProxy::SecItemRequest(requestID, SecItemRequestData(requestType, query, attributesToMatch)), 0))
-        return nullptr;
+    dispatch_semaphore_wait(semaphore.get(), DISPATCH_TIME_FOREVER);
 
-    return responseMap().waitForResponse(requestID);
+    return response;
 }
 
 static OSStatus webSecItemCopyMatching(CFDictionaryRef query, CFTypeRef* result)
 {
-    std::unique_ptr<SecItemResponseData> response = sendSecItemRequest(SecItemRequestData::CopyMatching, query);
+    auto response = sendSecItemRequest(SecItemRequestData::CopyMatching, query);
     if (!response)
         return errSecInteractionNotAllowed;
 
@@ -115,7 +101,7 @@ static OSStatus webSecItemCopyMatching(CFDictionaryRef query, CFTypeRef* result)
 
 static OSStatus webSecItemAdd(CFDictionaryRef query, CFTypeRef* result)
 {
-    std::unique_ptr<SecItemResponseData> response = sendSecItemRequest(SecItemRequestData::Add, query);
+    auto response = sendSecItemRequest(SecItemRequestData::Add, query);
     if (!response)
         return errSecInteractionNotAllowed;
 
@@ -126,7 +112,7 @@ static OSStatus webSecItemAdd(CFDictionaryRef query, CFTypeRef* result)
 
 static OSStatus webSecItemUpdate(CFDictionaryRef query, CFDictionaryRef attributesToUpdate)
 {
-    std::unique_ptr<SecItemResponseData> response = sendSecItemRequest(SecItemRequestData::Update, query, attributesToUpdate);
+    auto response = sendSecItemRequest(SecItemRequestData::Update, query, attributesToUpdate);
     if (!response)
         return errSecInteractionNotAllowed;
     
@@ -135,21 +121,16 @@ static OSStatus webSecItemUpdate(CFDictionaryRef query, CFDictionaryRef attribut
 
 static OSStatus webSecItemDelete(CFDictionaryRef query)
 {
-    std::unique_ptr<SecItemResponseData> response = sendSecItemRequest(SecItemRequestData::Delete, query);
+    auto response = sendSecItemRequest(SecItemRequestData::Delete, query);
     if (!response)
         return errSecInteractionNotAllowed;
     
     return response->resultCode();
 }
 
-void SecItemShim::secItemResponse(uint64_t requestID, const SecItemResponseData& response)
+void initializeSecItemShim(ChildProcess& process)
 {
-    responseMap().didReceiveResponse(requestID, std::make_unique<SecItemResponseData>(response));
-}
-
-void SecItemShim::initialize(ChildProcess* process)
-{
-    sharedProcess = process;
+    sharedProcess = &process;
 
 #if PLATFORM(IOS)
     struct _CFNFrameworksStubs stubs = {
@@ -176,11 +157,6 @@ void SecItemShim::initialize(ChildProcess* process)
 #endif
 }
 
-void SecItemShim::initializeConnection(IPC::Connection* connection)
-{
-    connection->addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), &m_queue.get(), this);
-}
-
 } // namespace WebKit
 
 #endif // ENABLE(SEC_ITEM_SHIM)
index 3f064a2..4251ee5 100644 (file)
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SecItemShim_h
-#define SecItemShim_h
-
 #if ENABLE(SEC_ITEM_SHIM)
 
-#include "Connection.h"
-
 namespace WebKit {
 
 class ChildProcess;
-class SecItemResponseData;
-
-class SecItemShim : public IPC::Connection::WorkQueueMessageReceiver {
-WTF_MAKE_NONCOPYABLE(SecItemShim);
-public:
-    static SecItemShim& singleton();
-
-    void initialize(ChildProcess*);
-    void initializeConnection(IPC::Connection*);
 
-private:
-    SecItemShim();
-
-    // IPC::Connection::WorkQueueMessageReceiver.
-    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
-
-    void secItemResponse(uint64_t requestID, const SecItemResponseData&);
-
-    Ref<WorkQueue> m_queue;
-};
+void initializeSecItemShim(ChildProcess&);
 
 } // namespace WebKit
 
 #endif // ENABLE(SEC_ITEM_SHIM)
-
-#endif // SecItemShim_h
diff --git a/Source/WebKit2/Shared/mac/SecItemShim.messages.in b/Source/WebKit2/Shared/mac/SecItemShim.messages.in
deleted file mode 100644 (file)
index 7d2995d..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-messages -> SecItemShim {
-
-#if ENABLE(SEC_ITEM_SHIM)
-    SecItemResponse(uint64_t requestID, WebKit::SecItemResponseData response)
-#endif
-
-}
index 0a2c239..3d3672c 100644 (file)
@@ -30,7 +30,6 @@
 
 #include "SecItemRequestData.h"
 #include "SecItemResponseData.h"
-#include "SecItemShimMessages.h"
 #include "SecItemShimProxyMessages.h"
 #include <Security/SecBase.h>
 #include <Security/SecItem.h>
@@ -57,10 +56,12 @@ void SecItemShimProxy::initializeConnection(IPC::Connection& connection)
     connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), &m_queue.get(), this);
 }
 
-void SecItemShimProxy::secItemRequest(IPC::Connection& connection, uint64_t requestID, const SecItemRequestData& request)
+void SecItemShimProxy::didReceiveMessage(IPC::Connection&, IPC::Decoder&)
 {
-    SecItemResponseData response;
+}
 
+void SecItemShimProxy::secItemRequest(const SecItemRequestData& request, SecItemResponseData& response)
+{
     switch (request.type()) {
     case SecItemRequestData::Invalid:
         LOG_ERROR("SecItemShimProxy::secItemRequest received an invalid data request. Please file a bug if you know how you caused this.");
@@ -93,8 +94,6 @@ void SecItemShimProxy::secItemRequest(IPC::Connection& connection, uint64_t requ
         break;
     }
     }
-
-    connection.send(Messages::SecItemShim::SecItemResponse(requestID, response), 0);
 }
 
 } // namespace WebKit
index 321ec10..edfa777 100644 (file)
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SecItemShimProxy_h
-#define SecItemShimProxy_h
+#pragma once
 
 #if ENABLE(SEC_ITEM_SHIM)
 
@@ -33,6 +32,7 @@
 namespace WebKit {
 
 class SecItemRequestData;
+class SecItemResponseData;
 
 class SecItemShimProxy : public IPC::Connection::WorkQueueMessageReceiver {
 WTF_MAKE_NONCOPYABLE(SecItemShimProxy);
@@ -46,8 +46,9 @@ private:
 
     // IPC::Connection::WorkQueueMessageReceiver
     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
+    void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) override;
 
-    void secItemRequest(IPC::Connection&, uint64_t requestID, const SecItemRequestData&);
+    void secItemRequest(const SecItemRequestData&, SecItemResponseData&);
 
     Ref<WorkQueue> m_queue;
 };
@@ -55,5 +56,3 @@ private:
 } // namespace WebKit
 
 #endif // ENABLE(SEC_ITEM_SHIM)
-
-#endif // SecItemShimProxy_h
index f5987fa..af9d94b 100644 (file)
@@ -23,7 +23,7 @@
 messages -> SecItemShimProxy {
 
 #if ENABLE(SEC_ITEM_SHIM)
-    SecItemRequest(uint64_t requestID, WebKit::SecItemRequestData request) WantsConnection
+    SecItemRequest(WebKit::SecItemRequestData request) -> (WebKit::SecItemResponseData response)
 #endif
 
 }
index d43c7ef..c4e9877 100644 (file)
                E170876C16D6CA6900F99226 /* BlobRegistryProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E170876A16D6CA6900F99226 /* BlobRegistryProxy.h */; };
                E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6947169B77C8009B6670 /* SecItemShim.cpp */; };
                E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6948169B77C8009B6670 /* SecItemShim.h */; };
-               E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */; };
-               E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = E18E6912169B667B009B6670 /* SecItemShimMessages.h */; };
                E1798C7916E6818800240139 /* NetworkBlobRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1798C7716E6818800240139 /* NetworkBlobRegistry.cpp */; };
                E1798C7A16E6818800240139 /* NetworkBlobRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1798C7816E6818800240139 /* NetworkBlobRegistry.h */; };
                E179FD9C134D38060015B883 /* ArgumentCodersMac.h in Headers */ = {isa = PBXBuildFile; fileRef = E179FD9B134D38060015B883 /* ArgumentCodersMac.h */; };
                E18E6909169B563F009B6670 /* SecItemShimProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecItemShimProxy.cpp; sourceTree = "<group>"; };
                E18E690A169B563F009B6670 /* SecItemShimProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemShimProxy.h; sourceTree = "<group>"; };
                E18E690D169B57DF009B6670 /* SecItemShimProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SecItemShimProxy.messages.in; sourceTree = "<group>"; };
-               E18E690F169B5928009B6670 /* SecItemShim.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SecItemShim.messages.in; sourceTree = "<group>"; };
-               E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecItemShimMessageReceiver.cpp; sourceTree = "<group>"; };
-               E18E6912169B667B009B6670 /* SecItemShimMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemShimMessages.h; sourceTree = "<group>"; };
                E18E6913169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecItemShimProxyMessageReceiver.cpp; sourceTree = "<group>"; };
                E18E6914169B667B009B6670 /* SecItemShimProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecItemShimProxyMessages.h; sourceTree = "<group>"; };
                E18E6947169B77C8009B6670 /* SecItemShim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SecItemShim.cpp; sourceTree = "<group>"; };
                                51D130521382EAC000351EDD /* SecItemResponseData.h */,
                                E18E6947169B77C8009B6670 /* SecItemShim.cpp */,
                                E18E6948169B77C8009B6670 /* SecItemShim.h */,
-                               E18E690F169B5928009B6670 /* SecItemShim.messages.in */,
                                511F8A77138B460900A95F44 /* SecItemShimLibrary.h */,
                                511F8A78138B460900A95F44 /* SecItemShimLibrary.mm */,
                                1AA9BAE0184FFAC7003B6BC6 /* WeakObjCPtr.h */,
                                1AC1338418590C4600F3EC05 /* RemoteObjectRegistryMessages.h */,
                                0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */,
                                0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */,
-                               E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */,
-                               E18E6912169B667B009B6670 /* SecItemShimMessages.h */,
                                E18E6913169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp */,
                                E18E6914169B667B009B6670 /* SecItemShimProxyMessages.h */,
                                2DE6943B18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp */,
                                51D130561382EAC000351EDD /* SecItemResponseData.h in Headers */,
                                E179088F169BAA6A006904C7 /* SecItemShim.h in Headers */,
                                511F8A7B138B460900A95F44 /* SecItemShimLibrary.h in Headers */,
-                               E1790891169BAA82006904C7 /* SecItemShimMessages.h in Headers */,
                                E18E690C169B563F009B6670 /* SecItemShimProxy.h in Headers */,
                                E18E6918169B667B009B6670 /* SecItemShimProxyMessages.h in Headers */,
                                514D9F5719119D35000063A7 /* ServicesController.h in Headers */,
                                51D130531382EAC000351EDD /* SecItemRequestData.cpp in Sources */,
                                51D130551382EAC000351EDD /* SecItemResponseData.cpp in Sources */,
                                E179088D169BAA62006904C7 /* SecItemShim.cpp in Sources */,
-                               E1790890169BAA7F006904C7 /* SecItemShimMessageReceiver.cpp in Sources */,
                                E18E690B169B563F009B6670 /* SecItemShimProxy.cpp in Sources */,
                                E18E6917169B667B009B6670 /* SecItemShimProxyMessageReceiver.cpp in Sources */,
                                514D9F5819119D35000063A7 /* ServicesController.mm in Sources */,
index 62cc47b..0d16e76 100644 (file)
@@ -246,10 +246,6 @@ void WebProcess::initializeConnection(IPC::Connection* connection)
     m_pluginProcessConnectionManager->initializeConnection(connection);
 #endif
 
-#if ENABLE(SEC_ITEM_SHIM)
-    SecItemShim::singleton().initializeConnection(connection);
-#endif
-
     for (auto& supplement : m_supplements.values())
         supplement->initializeConnection(connection);
 
index 4d71566..e05d99b 100644 (file)
@@ -249,7 +249,7 @@ void WebProcess::platformInitializeProcess(const ChildProcessInitializationParam
 #endif
 
 #if ENABLE(SEC_ITEM_SHIM)
-    SecItemShim::singleton().initialize(this);
+    initializeSecItemShim(*this);
 #endif
 }