Changeset 142690 in webkit
- Timestamp:
- Feb 12, 2013 4:58:00 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 11 added
- 4 edited
- 16 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r142688 r142690 1 2013-02-12 Sam Weinig <sam@webkit.org> 2 3 Add skeleton of the OfflineStorageProcess 4 https://bugs.webkit.org/show_bug.cgi?id=109615 5 6 Reviewed by Anders Carlsson. 7 8 This adds the skeleton of a new process to contain Database and Local Storage 9 backends in (hence, offline storage). We're adding a new process, rather than 10 using the Network or UIProcesses, to allow us to tightly sandbox these activities 11 away from networking and full filesystem access. 12 13 * Configurations/OfflineStorageProcess.xcconfig: Added. 14 * Configurations/OfflineStorageService.Development.xcconfig: Added. 15 * Configurations/OfflineStorageService.xcconfig: Added. 16 * DerivedSources.make: 17 * OfflineStorageProcess: Added. 18 * OfflineStorageProcess/EntryPoint: Added. 19 * OfflineStorageProcess/EntryPoint/mac: Added. 20 * OfflineStorageProcess/EntryPoint/mac/LegacyProcess: Added. 21 * OfflineStorageProcess/EntryPoint/mac/LegacyProcess/Info.plist: Added. 22 * OfflineStorageProcess/EntryPoint/mac/LegacyProcess/OfflineStorageProcessMain.mm: Added. 23 * OfflineStorageProcess/EntryPoint/mac/LegacyProcess/OfflineStorageProcessMainBootstrapper.cpp: Added. 24 * OfflineStorageProcess/EntryPoint/mac/XPCService: Added. 25 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService: Added. 26 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development: Added. 27 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist: Added. 28 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/OfflineStorageServiceMain.Development.mm: Added. 29 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist: Added. 30 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/OfflineStorageServiceMain.mm: Added. 31 * OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageServiceEntryPoint.mm: Added. 32 * OfflineStorageProcess/OfflineStorageProcess.cpp: Added. 33 * OfflineStorageProcess/OfflineStorageProcess.h: Added. 34 * OfflineStorageProcess/OfflineStorageProcess.messages.in: Added. 35 * OfflineStorageProcess/mac: Added. 36 * OfflineStorageProcess/mac/OfflineStorageProcessMac.mm: Added. 37 (WebKit::OfflineStorageProcess::initializeProcessName): 38 (WebKit::OfflineStorageProcess::initializeSandbox): 39 * OfflineStorageProcess/mac/com.apple.WebKit.OfflineStorage.sb: Added. 40 * Shared/OfflineStorage: Added. 41 * Shared/OfflineStorage/OfflineStorageProcessCreationParameters.cpp: Added. 42 * Shared/OfflineStorage/OfflineStorageProcessCreationParameters.h: Added. 43 44 * Scripts/webkit2/messages.py: 45 (struct_or_class): 46 Added OfflineStorageProcessCreationParameters. 47 48 * WebKit2.xcodeproj/project.pbxproj: 49 1 50 2013-02-12 Jinwoo Song <jinwoo7.song@samsung.com> 2 51 -
trunk/Source/WebKit2/Configurations/OfflineStorageProcess.xcconfig
r142576 r142690 1 // Copyright (C) 201 2Apple Inc. All rights reserved.1 // Copyright (C) 2013 Apple Inc. All rights reserved. 2 2 // 3 3 // Redistribution and use in source and binary forms, with or without … … 25 25 26 26 GCC_ENABLE_OBJC_GC = NO; 27 PRODUCT_NAME = NetworkProcess;28 INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;27 PRODUCT_NAME = OfflineStorageProcess; 28 INFOPLIST_FILE = OfflineStorageProcess/EntryPoint/mac/LegacyProcess/Info.plist; 29 29 INSTALL_PATH = $(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework; 30 30 -
trunk/Source/WebKit2/Configurations/OfflineStorageService.Development.xcconfig
r142576 r142690 24 24 #include "BaseXPCService.xcconfig" 25 25 26 PRODUCT_NAME = com.apple.WebKit. Networking.Development;27 INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info.plist;26 PRODUCT_NAME = com.apple.WebKit.OfflineStorage.Development; 27 INFOPLIST_FILE = OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist; -
trunk/Source/WebKit2/Configurations/OfflineStorageService.xcconfig
r142576 r142690 1 // Copyright (C) 201 2, 2013 Apple Inc. All rights reserved.1 // Copyright (C) 2013 Apple Inc. All rights reserved. 2 2 // 3 3 // Redistribution and use in source and binary forms, with or without … … 24 24 #include "BaseXPCService.xcconfig" 25 25 26 PRODUCT_NAME = com.apple.WebKit. Networking;27 INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist;26 PRODUCT_NAME = com.apple.WebKit.OfflineStorage; 27 INFOPLIST_FILE = OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist; -
trunk/Source/WebKit2/DerivedSources.make
r142518 r142690 33 33 $(WebKit2)/Shared/Network/CustomProtocols \ 34 34 $(WebKit2)/SharedWorkerProcess \ 35 $(WebKit2)/OfflineStorageProcess \ 35 36 $(WebKit2)/WebProcess/ApplicationCache \ 36 37 $(WebKit2)/WebProcess/Cookies \ … … 70 71 NetworkProcessProxy \ 71 72 NPObjectMessageReceiver \ 73 OfflineStorageProcess \ 72 74 PluginControllerProxy \ 73 75 PluginProcess \ -
trunk/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/LegacyProcess/OfflineStorageProcessMain.mm
r142576 r142690 1 1 /* 2 * Copyright (C) 201 2Apple Inc. All rights reserved.2 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #import "config.h" 27 27 28 #if ENABLE(NETWORK_PROCESS)29 30 28 #import "ChildProcessMain.h" 31 #import " NetworkProcess.h"29 #import "OfflineStorageProcess.h" 32 30 #import "WKBase.h" 33 31 34 32 using namespace WebKit; 35 33 36 extern "C" WK_EXPORT int NetworkProcessMain(int argc, char** argv);34 extern "C" WK_EXPORT int OfflineStorageProcessMain(int argc, char** argv); 37 35 38 int NetworkProcessMain(int argc, char** argv)36 int OfflineStorageProcessMain(int argc, char** argv) 39 37 { 40 return ChildProcessMain< NetworkProcess, ChildProcessMainDelegate>(argc, argv);38 return ChildProcessMain<OfflineStorageProcess, ChildProcessMainDelegate>(argc, argv); 41 39 } 42 43 #endif // ENABLE(NETWORK_PROCESS) -
trunk/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/LegacyProcess/OfflineStorageProcessMainBootstrapper.cpp
r142576 r142690 28 28 int main(int argc, char** argv) 29 29 { 30 WebKitMainFunction mainFunction = getBootstrapMainFunction(argc, argv, " NetworkProcessMain");30 WebKitMainFunction mainFunction = getBootstrapMainFunction(argc, argv, "OfflineStorageProcessMain"); 31 31 return mainFunction(argc, argv); 32 32 } -
trunk/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist
r142576 r142690 10 10 <string>${EXECUTABLE_NAME}</string> 11 11 <key>CFBundleIdentifier</key> 12 <string>com.apple.WebKit. Networking.Development</string>12 <string>com.apple.WebKit.OfflineStorage.Development</string> 13 13 <key>CFBundleInfoDictionaryVersion</key> 14 14 <string>6.0</string> … … 25 25 <key>LSFileQuarantineEnabled</key> 26 26 <true/> 27 <key>NSPrincipalClass</key>28 <string>NSApplication</string>29 27 <key>WebKitEntryPoint</key> 30 <string> NetworkServiceInitializer</string>28 <string>OfflineStorageServiceInitializer</string> 31 29 <key>LSUIElement</key> 32 30 <true/> -
trunk/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist
r142576 r142690 10 10 <string>${EXECUTABLE_NAME}</string> 11 11 <key>CFBundleIdentifier</key> 12 <string>com.apple.WebKit. Networking</string>12 <string>com.apple.WebKit.OfflineStorage</string> 13 13 <key>CFBundleInfoDictionaryVersion</key> 14 14 <string>6.0</string> … … 25 25 <key>LSFileQuarantineEnabled</key> 26 26 <true/> 27 <key>NSPrincipalClass</key>28 <string>NSApplication</string>29 27 <key>WebKitEntryPoint</key> 30 <string> NetworkServiceInitializer</string>28 <string>OfflineStorageServiceInitializer</string> 31 29 <key>LSUIElement</key> 32 30 <true/> … … 39 37 <key>_MultipleInstances</key> 40 38 <true/> 41 <key>EnvironmentVariables</key>42 <dict>43 <key>DYLD_INSERT_LIBRARIES</key>44 <string>$(WEBKIT2_FRAMEWORKS_DIR)/WebKit2.framework/WebProcess.app/Contents/MacOS/SecItemShim.dylib</string>45 </dict>46 39 </dict> 47 40 </dict> -
trunk/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageServiceEntryPoint.mm
r142576 r142690 28 28 #if HAVE(XPC) 29 29 30 #import "EnvironmentUtilities.h" 31 #import "NetworkProcess.h" 30 #import "OfflineStorageProcess.h" 32 31 #import "WKBase.h" 33 32 #import "XPCServiceEntryPoint.h" … … 35 34 using namespace WebKit; 36 35 37 extern "C" WK_EXPORT void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage);36 extern "C" WK_EXPORT void OfflineStorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage); 38 37 39 void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage)38 void OfflineStorageServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage) 40 39 { 41 // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by 42 // the this process don't try to insert the shim and crash. 43 EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib"); 44 45 XPCServiceInitializer<NetworkProcess, XPCServiceInitializerDelegate>(connection, initializerMessage); 40 XPCServiceInitializer<OfflineStorageProcess, XPCServiceInitializerDelegate>(connection, initializerMessage); 46 41 } 47 42 -
trunk/Source/WebKit2/OfflineStorageProcess/OfflineStorageProcess.cpp
r142576 r142690 1 1 /* 2 * Copyright (C) 201 2Apple Inc. All rights reserved.2 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #include "config.h" 27 #include " NetworkProcess.h"27 #include "OfflineStorageProcess.h" 28 28 29 #if ENABLE(NETWORK_PROCESS) 30 31 #include "ArgumentCoders.h" 32 #include "Attachment.h" 33 #include "AuthenticationManager.h" 34 #include "CustomProtocolManager.h" 35 #include "Logging.h" 36 #include "NetworkConnectionToWebProcess.h" 37 #include "NetworkProcessCreationParameters.h" 38 #include "NetworkProcessProxyMessages.h" 39 #include "RemoteNetworkingContext.h" 40 #include "WebCookieManager.h" 41 #include <WebCore/InitializeLogging.h> 42 #include <WebCore/ResourceRequest.h> 29 #include "OfflineStorageProcessCreationParameters.h" 43 30 #include <WebCore/RunLoop.h> 44 #include <wtf/text/CString.h>45 46 #if USE(SECURITY_FRAMEWORK)47 #include "SecItemShim.h"48 #endif49 31 50 32 using namespace WebCore; … … 52 34 namespace WebKit { 53 35 54 NetworkProcess& NetworkProcess::shared()36 OfflineStorageProcess& OfflineStorageProcess::shared() 55 37 { 56 DEFINE_STATIC_LOCAL( NetworkProcess, networkProcess, ());57 return networkProcess;38 DEFINE_STATIC_LOCAL(OfflineStorageProcess, offlineStorageProcess, ()); 39 return offlineStorageProcess; 58 40 } 59 41 60 NetworkProcess::NetworkProcess() 61 : m_hasSetCacheModel(false) 62 , m_cacheModel(CacheModelDocumentViewer) 63 { 64 addSupplement<AuthenticationManager>(); 65 addSupplement<WebCookieManager>(); 66 addSupplement<CustomProtocolManager>(); 67 } 68 69 NetworkProcess::~NetworkProcess() 42 OfflineStorageProcess::OfflineStorageProcess() 70 43 { 71 44 } 72 45 73 AuthenticationManager& NetworkProcess::authenticationManager()46 OfflineStorageProcess::~OfflineStorageProcess() 74 47 { 75 return *supplement<AuthenticationManager>();76 48 } 77 49 78 DownloadManager& NetworkProcess::downloadManager()50 bool OfflineStorageProcess::shouldTerminate() 79 51 { 80 DEFINE_STATIC_LOCAL(DownloadManager, downloadManager, (this)); 81 return downloadManager; 82 } 83 84 void NetworkProcess::removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess* connection) 85 { 86 size_t vectorIndex = m_webProcessConnections.find(connection); 87 ASSERT(vectorIndex != notFound); 88 89 m_webProcessConnections.remove(vectorIndex); 90 } 91 92 bool NetworkProcess::shouldTerminate() 93 { 94 // Network process keeps session cookies and credentials, so it should never terminate (as long as UI process connection is alive). 52 // FIXME: Implement. 95 53 return false; 96 54 } 97 55 98 void NetworkProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder)56 void OfflineStorageProcess::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder) 99 57 { 100 58 if (messageReceiverMap().dispatchMessage(connection, decoder)) 101 59 return; 102 60 103 didReceive NetworkProcessMessage(connection, decoder);61 didReceiveOfflineStorageProcessMessage(connection, decoder); 104 62 } 105 63 106 void NetworkProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder)64 void OfflineStorageProcess::didReceiveSyncMessage(CoreIPC::Connection* connection, CoreIPC::MessageDecoder& decoder, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder) 107 65 { 108 66 messageReceiverMap().dispatchSyncMessage(connection, decoder, replyEncoder); 109 67 } 110 68 111 void NetworkProcess::didClose(CoreIPC::Connection*)69 void OfflineStorageProcess::didClose(CoreIPC::Connection*) 112 70 { 113 71 // The UIProcess just crashed. … … 115 73 } 116 74 117 void NetworkProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference)75 void OfflineStorageProcess::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference, CoreIPC::StringReference) 118 76 { 119 77 RunLoop::current()->stop(); 120 78 } 121 79 122 void NetworkProcess::didCreateDownload()80 void OfflineStorageProcess::initializeOfflineStorageProcess(const OfflineStorageProcessCreationParameters&) 123 81 { 124 disableTermination();125 }126 127 void NetworkProcess::didDestroyDownload()128 {129 enableTermination();130 }131 132 CoreIPC::Connection* NetworkProcess::downloadProxyConnection()133 {134 return parentProcessConnection();135 }136 137 AuthenticationManager& NetworkProcess::downloadsAuthenticationManager()138 {139 return authenticationManager();140 }141 142 void NetworkProcess::initializeNetworkProcess(const NetworkProcessCreationParameters& parameters)143 {144 platformInitializeNetworkProcess(parameters);145 146 setCacheModel(static_cast<uint32_t>(parameters.cacheModel));147 148 #if PLATFORM(MAC) || USE(CFNETWORK)149 RemoteNetworkingContext::setPrivateBrowsingStorageSessionIdentifierBase(parameters.uiProcessBundleIdentifier);150 #endif151 152 if (parameters.privateBrowsingEnabled)153 RemoteNetworkingContext::ensurePrivateBrowsingSession();154 155 NetworkProcessSupplementMap::const_iterator it = m_supplements.begin();156 NetworkProcessSupplementMap::const_iterator end = m_supplements.end();157 for (; it != end; ++it)158 it->value->initialize(parameters);159 }160 161 void NetworkProcess::initializeConnection(CoreIPC::Connection* connection)162 {163 ChildProcess::initializeConnection(connection);164 165 #if USE(SECURITY_FRAMEWORK)166 connection->addQueueClient(&SecItemShim::shared());167 #endif168 }169 170 void NetworkProcess::createNetworkConnectionToWebProcess()171 {172 #if PLATFORM(MAC)173 // Create the listening port.174 mach_port_t listeningPort;175 mach_port_allocate(mach_task_self(), MACH_PORT_RIGHT_RECEIVE, &listeningPort);176 177 // Create a listening connection.178 RefPtr<NetworkConnectionToWebProcess> connection = NetworkConnectionToWebProcess::create(CoreIPC::Connection::Identifier(listeningPort));179 m_webProcessConnections.append(connection.release());180 181 CoreIPC::Attachment clientPort(listeningPort, MACH_MSG_TYPE_MAKE_SEND);182 parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCreateNetworkConnectionToWebProcess(clientPort), 0);183 #else184 notImplemented();185 #endif186 }187 188 void NetworkProcess::ensurePrivateBrowsingSession()189 {190 RemoteNetworkingContext::ensurePrivateBrowsingSession();191 }192 193 void NetworkProcess::destroyPrivateBrowsingSession()194 {195 RemoteNetworkingContext::destroyPrivateBrowsingSession();196 }197 198 void NetworkProcess::downloadRequest(uint64_t downloadID, const ResourceRequest& request)199 {200 downloadManager().startDownload(downloadID, request);201 }202 203 void NetworkProcess::cancelDownload(uint64_t downloadID)204 {205 downloadManager().cancelDownload(downloadID);206 }207 208 void NetworkProcess::setCacheModel(uint32_t cm)209 {210 CacheModel cacheModel = static_cast<CacheModel>(cm);211 212 if (!m_hasSetCacheModel || cacheModel != m_cacheModel) {213 m_hasSetCacheModel = true;214 m_cacheModel = cacheModel;215 platformSetCacheModel(cacheModel);216 }217 82 } 218 83 219 84 #if !PLATFORM(MAC) 220 void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters&)85 void OfflineStorageProcess::initializeProcessName(const ChildProcessInitializationParameters&) 221 86 { 222 87 } 223 88 224 void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&)89 void OfflineStorageProcess::initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) 225 90 { 226 91 } … … 228 93 229 94 } // namespace WebKit 230 231 #endif // ENABLE(NETWORK_PROCESS) -
trunk/Source/WebKit2/OfflineStorageProcess/OfflineStorageProcess.h
r142576 r142690 1 1 /* 2 * Copyright (C) 201 2, 2013 Apple Inc. All rights reserved.2 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #ifndef NetworkProcess_h27 #define NetworkProcess_h26 #ifndef OfflineStorageProcess_h 27 #define OfflineStorageProcess_h 28 28 29 #if ENABLE(NETWORK_PROCESS)30 31 #include "CacheModel.h"32 29 #include "ChildProcess.h" 33 #include "DownloadManager.h"34 #include "MessageReceiverMap.h"35 #include "NetworkResourceLoadScheduler.h"36 #include <wtf/Forward.h>37 38 namespace WebCore {39 class RunLoop;40 }41 30 42 31 namespace WebKit { 43 32 44 class AuthenticationManager; 45 class NetworkConnectionToWebProcess; 46 class NetworkProcessSupplement; 47 class PlatformCertificateInfo; 48 struct NetworkProcessCreationParameters; 33 struct OfflineStorageProcessCreationParameters; 49 34 50 class NetworkProcess : public ChildProcess, private DownloadManager::Client{51 WTF_MAKE_NONCOPYABLE( NetworkProcess);35 class OfflineStorageProcess : public ChildProcess { 36 WTF_MAKE_NONCOPYABLE(OfflineStorageProcess); 52 37 public: 53 static NetworkProcess& shared(); 54 55 template <typename T> 56 T* supplement() 57 { 58 return static_cast<T*>(m_supplements.get(T::supplementName())); 59 } 60 61 template <typename T> 62 void addSupplement() 63 { 64 m_supplements.add(T::supplementName(), adoptPtr<NetworkProcessSupplement>(new T(this))); 65 } 66 67 void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess*); 68 69 NetworkResourceLoadScheduler& networkResourceLoadScheduler() { return m_networkResourceLoadScheduler; } 70 71 AuthenticationManager& authenticationManager(); 72 DownloadManager& downloadManager(); 38 static OfflineStorageProcess& shared(); 73 39 74 40 private: 75 NetworkProcess(); 76 ~NetworkProcess(); 77 78 void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&); 41 OfflineStorageProcess(); 42 ~OfflineStorageProcess(); 79 43 80 44 // ChildProcess 81 45 virtual void initializeProcessName(const ChildProcessInitializationParameters&) OVERRIDE; 82 46 virtual void initializeSandbox(const ChildProcessInitializationParameters&, SandboxInitializationParameters&) OVERRIDE; 83 virtual void initializeConnection(CoreIPC::Connection*) OVERRIDE;84 47 virtual bool shouldTerminate() OVERRIDE; 85 48 … … 90 53 virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE; 91 54 92 // DownloadManager::Client93 virtual void didCreateDownload() OVERRIDE;94 virtual void didDestroyDownload() OVERRIDE;95 virtual CoreIPC::Connection* downloadProxyConnection() OVERRIDE;96 virtual AuthenticationManager& downloadsAuthenticationManager() OVERRIDE;97 98 55 // Message Handlers 99 void didReceiveNetworkProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&); 100 void initializeNetworkProcess(const NetworkProcessCreationParameters&); 101 void createNetworkConnectionToWebProcess(); 102 void ensurePrivateBrowsingSession(); 103 void destroyPrivateBrowsingSession(); 104 void downloadRequest(uint64_t downloadID, const WebCore::ResourceRequest&); 105 void cancelDownload(uint64_t downloadID); 106 void setCacheModel(uint32_t); 107 108 void allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo&, const String& host); 109 110 // Platform Helpers 111 void platformSetCacheModel(CacheModel); 112 113 // Connections to WebProcesses. 114 Vector<RefPtr<NetworkConnectionToWebProcess> > m_webProcessConnections; 115 116 NetworkResourceLoadScheduler m_networkResourceLoadScheduler; 117 118 String m_diskCacheDirectory; 119 bool m_hasSetCacheModel; 120 CacheModel m_cacheModel; 121 122 typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*> > NetworkProcessSupplementMap; 123 NetworkProcessSupplementMap m_supplements; 56 void didReceiveOfflineStorageProcessMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&); 57 void initializeOfflineStorageProcess(const OfflineStorageProcessCreationParameters&); 124 58 }; 125 59 126 60 } // namespace WebKit 127 61 128 #endif // ENABLE(NETWORK_PROCESS) 129 130 #endif // NetworkProcess_h 62 #endif // OfflineStorageProcess_h -
trunk/Source/WebKit2/OfflineStorageProcess/OfflineStorageProcess.messages.in
r142576 r142690 1 # Copyright (C) 201 2Apple Inc. All rights reserved.1 # Copyright (C) 2013 Apple Inc. All rights reserved. 2 2 # 3 3 # Redistribution and use in source and binary forms, with or without … … 21 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 22 23 #if ENABLE(NETWORK_PROCESS) 24 25 messages -> NetworkProcess LegacyReceiver { 26 # Initializes the network process. 27 InitializeNetworkProcess(WebKit::NetworkProcessCreationParameters processCreationParameters) 28 29 # Creates a connection for communication with a WebProcess 30 CreateNetworkConnectionToWebProcess() 31 32 EnsurePrivateBrowsingSession() 33 DestroyPrivateBrowsingSession() 34 35 DownloadRequest(uint64_t downloadID, WebCore::ResourceRequest request) 36 CancelDownload(uint64_t downloadID) 37 38 #if PLATFORM(MAC) 39 SetProcessSuppressionEnabled(bool flag) 40 #endif 41 42 AllowSpecificHTTPSCertificateForHost(WebKit::PlatformCertificateInfo certificate, WTF::String host) 23 messages -> OfflineStorageProcess LegacyReceiver { 24 # Initializes the offline storage process. 25 InitializeOfflineStorageProcess(WebKit::OfflineStorageProcessCreationParameters processCreationParameters) 43 26 } 44 45 #endif // ENABLE(NETWORK_PROCESS) -
trunk/Source/WebKit2/OfflineStorageProcess/mac/OfflineStorageProcessMac.mm
r142576 r142690 1 1 /* 2 * Copyright (C) 201 2Apple Inc. All rights reserved.2 * Copyright (C) 2013 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 25 25 26 26 #import "config.h" 27 #import " NetworkProcess.h"27 #import "OfflineStorageProcess.h" 28 28 29 #if ENABLE(NETWORK_PROCESS)30 31 #import "NetworkProcessCreationParameters.h"32 #import "PlatformCertificateInfo.h"33 #import "SandboxExtension.h"34 29 #import "SandboxInitializationParameters.h" 35 #import "StringUtilities.h"36 #import <WebCore/FileSystem.h>37 30 #import <WebCore/LocalizedStrings.h> 38 31 #import <WebKitSystemInterface.h> 39 #import <mach/host_info.h>40 #import <mach/mach.h>41 #import <mach/mach_error.h>42 #import <sysexits.h>43 #import <wtf/text/WTFString.h>44 45 #if USE(SECURITY_FRAMEWORK)46 #import "SecItemShim.h"47 #endif48 49 using namespace WebCore;50 51 @interface NSURLRequest (Details)52 + (void)setAllowsSpecificHTTPSCertificate:(NSArray *)allow forHost:(NSString *)host;53 @end54 32 55 33 namespace WebKit { 56 34 57 void NetworkProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters)35 void OfflineStorageProcess::initializeProcessName(const ChildProcessInitializationParameters& parameters) 58 36 { 59 if (!parameters.uiProcessName.isNull()) { 60 NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Networking", "visible name of the network process. The argument is the application name."), (NSString *)parameters.uiProcessName]; 61 WKSetVisibleApplicationName((CFStringRef)applicationName); 62 } 37 NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Offline Storage", "visible name of the offline storage process. The argument is the application name."), (NSString *)parameters.uiProcessName]; 38 WKSetVisibleApplicationName((CFStringRef)applicationName); 63 39 } 64 40 65 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 66 static void overrideSystemProxies(const String& httpProxy, const String& httpsProxy) 67 { 68 NSMutableDictionary *proxySettings = [NSMutableDictionary dictionary]; 69 70 if (!httpProxy.isNull()) { 71 KURL httpProxyURL(KURL(), httpProxy); 72 if (httpProxyURL.isValid()) { 73 [proxySettings setObject:nsStringFromWebCoreString(httpProxyURL.host()) forKey:(NSString *)kCFNetworkProxiesHTTPProxy]; 74 if (httpProxyURL.hasPort()) { 75 NSNumber *port = [NSNumber numberWithInt:httpProxyURL.port()]; 76 [proxySettings setObject:port forKey:(NSString *)kCFNetworkProxiesHTTPPort]; 77 } 78 } 79 else 80 NSLog(@"Malformed HTTP Proxy URL '%s'. Expected 'http://<hostname>[:<port>]'\n", httpProxy.utf8().data()); 81 } 82 83 if (!httpsProxy.isNull()) { 84 KURL httpsProxyURL(KURL(), httpsProxy); 85 if (httpsProxyURL.isValid()) { 86 [proxySettings setObject:nsStringFromWebCoreString(httpsProxyURL.host()) forKey:(NSString *)kCFNetworkProxiesHTTPSProxy]; 87 if (httpsProxyURL.hasPort()) { 88 NSNumber *port = [NSNumber numberWithInt:httpsProxyURL.port()]; 89 [proxySettings setObject:port forKey:(NSString *)kCFNetworkProxiesHTTPSPort]; 90 } 91 } else 92 NSLog(@"Malformed HTTPS Proxy URL '%s'. Expected 'https://<hostname>[:<port>]'\n", httpsProxy.utf8().data()); 93 } 94 95 if ([proxySettings count] > 0) 96 WKCFNetworkSetOverrideSystemProxySettings((CFDictionaryRef)proxySettings); 97 } 98 #endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 99 100 void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters) 101 { 102 m_diskCacheDirectory = parameters.diskCacheDirectory; 103 104 if (!m_diskCacheDirectory.isNull()) { 105 SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle); 106 NSUInteger cacheMemoryCapacity = parameters.nsURLCacheMemoryCapacity; 107 NSUInteger cacheDiskCapacity = parameters.nsURLCacheDiskCapacity; 108 109 RetainPtr<NSURLCache> parentProcessURLCache(AdoptNS, [[NSURLCache alloc] initWithMemoryCapacity:cacheMemoryCapacity diskCapacity:cacheDiskCapacity diskPath:parameters.diskCacheDirectory]); 110 [NSURLCache setSharedURLCache:parentProcessURLCache.get()]; 111 } 112 113 #if USE(SECURITY_FRAMEWORK) 114 SecItemShim::shared().initialize(this); 115 #endif 116 117 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 118 if (!parameters.httpProxy.isNull() || !parameters.httpsProxy.isNull()) 119 overrideSystemProxies(parameters.httpProxy, parameters.httpsProxy); 120 #endif 121 } 122 123 static uint64_t memorySize() 124 { 125 static host_basic_info_data_t hostInfo; 126 127 static dispatch_once_t once; 128 dispatch_once(&once, ^() { 129 mach_port_t host = mach_host_self(); 130 mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT; 131 kern_return_t r = host_info(host, HOST_BASIC_INFO, (host_info_t)&hostInfo, &count); 132 mach_port_deallocate(mach_task_self(), host); 133 134 if (r != KERN_SUCCESS) 135 LOG_ERROR("%s : host_info(%d) : %s.\n", __FUNCTION__, r, mach_error_string(r)); 136 }); 137 138 return hostInfo.max_mem; 139 } 140 141 static uint64_t volumeFreeSize(const String& path) 142 { 143 NSDictionary *fileSystemAttributesDictionary = [[NSFileManager defaultManager] attributesOfFileSystemForPath:(NSString *)path error:NULL]; 144 return [[fileSystemAttributesDictionary objectForKey:NSFileSystemFreeSize] unsignedLongLongValue]; 145 } 146 147 void NetworkProcess::platformSetCacheModel(CacheModel cacheModel) 148 { 149 150 // As a fudge factor, use 1000 instead of 1024, in case the reported byte 151 // count doesn't align exactly to a megabyte boundary. 152 uint64_t memSize = memorySize() / 1024 / 1000; 153 uint64_t diskFreeSize = volumeFreeSize(m_diskCacheDirectory) / 1024 / 1000; 154 155 unsigned cacheTotalCapacity = 0; 156 unsigned cacheMinDeadCapacity = 0; 157 unsigned cacheMaxDeadCapacity = 0; 158 double deadDecodedDataDeletionInterval = 0; 159 unsigned pageCacheCapacity = 0; 160 unsigned long urlCacheMemoryCapacity = 0; 161 unsigned long urlCacheDiskCapacity = 0; 162 163 calculateCacheSizes(cacheModel, memSize, diskFreeSize, 164 cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval, 165 pageCacheCapacity, urlCacheMemoryCapacity, urlCacheDiskCapacity); 166 167 168 NSURLCache *nsurlCache = [NSURLCache sharedURLCache]; 169 [nsurlCache setMemoryCapacity:urlCacheMemoryCapacity]; 170 [nsurlCache setDiskCapacity:std::max<unsigned long>(urlCacheDiskCapacity, [nsurlCache diskCapacity])]; // Don't shrink a big disk cache, since that would cause churn. 171 } 172 173 void NetworkProcess::allowSpecificHTTPSCertificateForHost(const PlatformCertificateInfo& certificateInfo, const String& host) 174 { 175 [NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:(NSString *)host]; 176 } 177 178 void NetworkProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters) 41 void OfflineStorageProcess::initializeSandbox(const ChildProcessInitializationParameters& parameters, SandboxInitializationParameters& sandboxParameters) 179 42 { 180 43 // Need to overide the default, because service has a different bundle ID. 181 44 NSBundle *webkit2Bundle = [NSBundle bundleForClass:NSClassFromString(@"WKView")]; 182 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit. NetworkProcess" ofType:@"sb"]);45 sandboxParameters.setOverrideSandboxProfilePath([webkit2Bundle pathForResource:@"com.apple.WebKit.OfflineStorage" ofType:@"sb"]); 183 46 184 47 ChildProcess::initializeSandbox(parameters, sandboxParameters); … … 186 49 187 50 } // namespace WebKit 188 189 #endif // ENABLE(NETWORK_PROCESS) -
trunk/Source/WebKit2/Scripts/webkit2/messages.py
r141820 r142690 189 189 'WebKit::EditorState', 190 190 'WebKit::NetworkProcessCreationParameters', 191 'WebKit::OfflineStorageProcessCreationParameters', 191 192 'WebKit::PlatformPopupMenuData', 192 193 'WebKit::PluginCreationParameters', -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r142651 r142690 21 21 E13A8A4D16287A5B00392929 /* PBXTargetDependency */, 22 22 510CC8481613C85300D03ED3 /* PBXTargetDependency */, 23 BCAF35EC16CA261500D4E9FC /* PBXTargetDependency */, 23 24 BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */, 24 25 BCAE9DFD160C0AB000A33217 /* PBXTargetDependency */, … … 27 28 BC82844616B4FF6600A278FE /* PBXTargetDependency */, 28 29 BC82844816B4FF6F00A278FE /* PBXTargetDependency */, 30 BCAF361816CA27BD00D4E9FC /* PBXTargetDependency */, 31 BCAF361A16CA27C000D4E9FC /* PBXTargetDependency */, 29 32 ); 30 33 name = All; … … 813 816 BC82839916B48DC000A278FE /* WebContentServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839816B48DC000A278FE /* WebContentServiceEntryPoint.mm */; }; 814 817 BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A816B4BD9100A278FE /* NetworkServiceEntryPoint.mm */; }; 815 BC8283B316B4BF7700A278FE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8283B216B4BF7700A278FE /* Foundation.framework */; };816 BC8283C616B4BFA800A278FE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8283B216B4BF7700A278FE /* Foundation.framework */; };817 818 BC8283D816B4DB2A00A278FE /* NetworkServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A416B4BD9100A278FE /* NetworkServiceMain.mm */; }; 818 819 BC8283D916B4DB2E00A278FE /* NetworkServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283A716B4BD9100A278FE /* NetworkServiceMain.Development.mm */; }; 819 820 BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; }; 820 BC8283FA16B4FDDE00A278FE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8283B216B4BF7700A278FE /* Foundation.framework */; };821 BC82842016B4FDF600A278FE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8283B216B4BF7700A278FE /* Foundation.framework */; };822 BC82843316B4FE1400A278FE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC8283B216B4BF7700A278FE /* Foundation.framework */; };823 821 BC82844916B5004200A278FE /* PluginService.32.Main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283E516B4F8E200A278FE /* PluginService.32.Main.mm */; }; 824 822 BC82844B16B5004D00A278FE /* PluginService.64.Main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8283EB16B4F8E200A278FE /* PluginService.64.Main.mm */; }; … … 886 884 BCAE9E08160C1C0700A33217 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; }; 887 885 BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 886 BCAF35BC16CA1E2400D4E9FC /* OfflineStorageProcessMainBootstrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35B916CA1E2400D4E9FC /* OfflineStorageProcessMainBootstrapper.cpp */; }; 887 BCAF35D516CA212400D4E9FC /* OfflineStorageProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35D116CA212400D4E9FC /* OfflineStorageProcessMac.mm */; }; 888 BCAF35D716CA212400D4E9FC /* OfflineStorageProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35D216CA212400D4E9FC /* OfflineStorageProcess.cpp */; }; 889 BCAF35D916CA212400D4E9FC /* OfflineStorageProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAF35D316CA212400D4E9FC /* OfflineStorageProcess.h */; }; 890 BCAF35DD16CA214A00D4E9FC /* OfflineStorageProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35B816CA1E2400D4E9FC /* OfflineStorageProcessMain.mm */; }; 891 BCAF35DE16CA217700D4E9FC /* OfflineStorageServiceEntryPoint.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35C416CA1F9D00D4E9FC /* OfflineStorageServiceEntryPoint.mm */; }; 892 BCAF35E416CA24DA00D4E9FC /* OfflineStorageProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAF35DF16CA249300D4E9FC /* OfflineStorageProcessMessages.h */; }; 893 BCAF35E816CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35E616CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp */; }; 894 BCAF35E916CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35E616CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp */; }; 895 BCAF35EA16CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAF35E716CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h */; }; 896 BCAF361316CA26B800D4E9FC /* OfflineStorageServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35C016CA1F9D00D4E9FC /* OfflineStorageServiceMain.mm */; }; 897 BCAF361416CA26BB00D4E9FC /* OfflineStorageServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35C316CA1F9D00D4E9FC /* OfflineStorageServiceMain.Development.mm */; }; 898 BCAF361B16CA285400D4E9FC /* OfflineStorageProcess.app in CopyFiles */ = {isa = PBXBuildFile; fileRef = BCAF359A16CA1D5700D4E9FC /* OfflineStorageProcess.app */; }; 899 BCAF361C16CA286700D4E9FC /* com.apple.WebKit.OfflineStorage.sb in Resources */ = {isa = PBXBuildFile; fileRef = BCAF361516CA274000D4E9FC /* com.apple.WebKit.OfflineStorage.sb */; }; 900 BCAF361D16CA28C100D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 901 BCAF361E16CA28C500D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 902 BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 903 BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 904 BCAF362116CA28F300D4E9FC /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit2.framework */; }; 905 BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; }; 906 BCAF362516CA29A200D4E9FC /* OfflineStorageProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCAF35E016CA249300D4E9FC /* OfflineStorageProcessMessageReceiver.cpp */; }; 907 BCAF362616CA2A4E00D4E9FC /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; }; 908 BCAF362716CA2A5300D4E9FC /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; }; 888 909 BCB0AD33122F285800B1341E /* MutableArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC8049D122F0D6B00103529 /* MutableArray.cpp */; }; 889 910 BCB0AD34122F285800B1341E /* MutableArray.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC8049E122F0D6B00103529 /* MutableArray.h */; }; … … 1060 1081 E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */ = {isa = PBXBuildFile; fileRef = E134F01512EA5D11004EC58D /* WKPrintingView.h */; }; 1061 1082 E134F01A12EA5D99004EC58D /* WKPrintingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = E134F01912EA5D99004EC58D /* WKPrintingView.mm */; }; 1062 E13A8A30162879AC00392929 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E13A8A2F162879AC00392929 /* Cocoa.framework */; };1063 1083 E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1513C64166EABB200149FCB /* ChildProcessProxy.cpp */; }; 1064 1084 E1513C67166EABB200149FCB /* ChildProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = E1513C65166EABB200149FCB /* ChildProcessProxy.h */; }; … … 1216 1236 remoteInfo = WebProcessServiceForWebKitDevelopment; 1217 1237 }; 1238 BCAF35EB16CA261500D4E9FC /* PBXContainerItemProxy */ = { 1239 isa = PBXContainerItemProxy; 1240 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1241 proxyType = 1; 1242 remoteGlobalIDString = BCAF359916CA1D5700D4E9FC; 1243 remoteInfo = OfflineStorageProcess; 1244 }; 1245 BCAF361716CA27BD00D4E9FC /* PBXContainerItemProxy */ = { 1246 isa = PBXContainerItemProxy; 1247 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1248 proxyType = 1; 1249 remoteGlobalIDString = BCAF35F016CA263800D4E9FC; 1250 remoteInfo = OfflineStorage; 1251 }; 1252 BCAF361916CA27C000D4E9FC /* PBXContainerItemProxy */ = { 1253 isa = PBXContainerItemProxy; 1254 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1255 proxyType = 1; 1256 remoteGlobalIDString = BCAF360316CA266900D4E9FC; 1257 remoteInfo = OfflineStorage.Development; 1258 }; 1259 BCAF362316CA295F00D4E9FC /* PBXContainerItemProxy */ = { 1260 isa = PBXContainerItemProxy; 1261 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1262 proxyType = 1; 1263 remoteGlobalIDString = 8DC2EF4F0486A6940098B216; 1264 remoteInfo = WebKit2; 1265 }; 1266 BCCDE2D516C88DAA00D90310 /* PBXContainerItemProxy */ = { 1267 isa = PBXContainerItemProxy; 1268 containerPortal = 0867D690FE84028FC02AAC07 /* Project object */; 1269 proxyType = 1; 1270 remoteGlobalIDString = BC8283F816B4FDDE00A278FE; 1271 remoteInfo = Plugin.32; 1272 }; 1218 1273 BCDE093513272496001259FB /* PBXContainerItemProxy */ = { 1219 1274 isa = PBXContainerItemProxy; … … 1263 1318 BCDE0ABF13272708001259FB /* PluginProcess.app in CopyFiles */, 1264 1319 1A50DB66110A3D57000D3FE5 /* WebProcess.app in CopyFiles */, 1320 BCAF361B16CA285400D4E9FC /* OfflineStorageProcess.app in CopyFiles */, 1265 1321 ); 1266 1322 runOnlyForDeploymentPostprocessing = 0; … … 1530 1586 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageManagerMessageReceiver.cpp; sourceTree = "<group>"; }; 1531 1587 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageManagerMessages.h; sourceTree = "<group>"; }; 1588 1AB779C916C99E6400E2CE41 /* PluginProcessConnectionManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = PluginProcessConnectionManager.messages.in; sourceTree = "<group>"; }; 1589 1AB779CA16C9A12600E2CE41 /* PluginProcessConnectionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessConnectionManagerMessageReceiver.cpp; sourceTree = "<group>"; }; 1590 1AB779CB16C9A12600E2CE41 /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; }; 1532 1591 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; }; 1533 1592 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; }; … … 2185 2244 BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = NetworkService.xcconfig; sourceTree = "<group>"; }; 2186 2245 BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Networking.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 2187 BC8283B216B4BF7700A278FE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };2188 2246 BC8283C516B4BFA800A278FE /* com.apple.WebKit.Networking.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Networking.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 2189 2247 BC8283E416B4F8E200A278FE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; … … 2259 2317 BCACC44416B24CAA00B6E092 /* WebContentServiceMain.Development.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebContentServiceMain.Development.mm; sourceTree = "<group>"; }; 2260 2318 BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.WebContent.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 2319 BCAF359A16CA1D5700D4E9FC /* OfflineStorageProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OfflineStorageProcess.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2320 BCAF35B716CA1E2400D4E9FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2321 BCAF35B816CA1E2400D4E9FC /* OfflineStorageProcessMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OfflineStorageProcessMain.mm; sourceTree = "<group>"; }; 2322 BCAF35B916CA1E2400D4E9FC /* OfflineStorageProcessMainBootstrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineStorageProcessMainBootstrapper.cpp; sourceTree = "<group>"; }; 2323 BCAF35BF16CA1F9D00D4E9FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2324 BCAF35C016CA1F9D00D4E9FC /* OfflineStorageServiceMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OfflineStorageServiceMain.mm; sourceTree = "<group>"; }; 2325 BCAF35C216CA1F9D00D4E9FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2326 BCAF35C316CA1F9D00D4E9FC /* OfflineStorageServiceMain.Development.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OfflineStorageServiceMain.Development.mm; sourceTree = "<group>"; }; 2327 BCAF35C416CA1F9D00D4E9FC /* OfflineStorageServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OfflineStorageServiceEntryPoint.mm; sourceTree = "<group>"; }; 2328 BCAF35CA16CA204300D4E9FC /* OfflineStorageProcess.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = OfflineStorageProcess.xcconfig; sourceTree = "<group>"; }; 2329 BCAF35CB16CA204300D4E9FC /* OfflineStorageService.Development.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = OfflineStorageService.Development.xcconfig; sourceTree = "<group>"; }; 2330 BCAF35CC16CA204300D4E9FC /* OfflineStorageService.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = OfflineStorageService.xcconfig; sourceTree = "<group>"; }; 2331 BCAF35D116CA212400D4E9FC /* OfflineStorageProcessMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OfflineStorageProcessMac.mm; sourceTree = "<group>"; }; 2332 BCAF35D216CA212400D4E9FC /* OfflineStorageProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineStorageProcess.cpp; sourceTree = "<group>"; }; 2333 BCAF35D316CA212400D4E9FC /* OfflineStorageProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineStorageProcess.h; sourceTree = "<group>"; }; 2334 BCAF35D416CA212400D4E9FC /* OfflineStorageProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OfflineStorageProcess.messages.in; sourceTree = "<group>"; }; 2335 BCAF35DF16CA249300D4E9FC /* OfflineStorageProcessMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineStorageProcessMessages.h; sourceTree = "<group>"; }; 2336 BCAF35E016CA249300D4E9FC /* OfflineStorageProcessMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineStorageProcessMessageReceiver.cpp; sourceTree = "<group>"; }; 2337 BCAF35E616CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfflineStorageProcessCreationParameters.cpp; sourceTree = "<group>"; }; 2338 BCAF35E716CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflineStorageProcessCreationParameters.h; sourceTree = "<group>"; }; 2339 BCAF35F116CA263800D4E9FC /* com.apple.WebKit.OfflineStorage.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.OfflineStorage.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 2340 BCAF360416CA266900D4E9FC /* com.apple.WebKit.OfflineStorage.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.OfflineStorage.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; }; 2341 BCAF361516CA274000D4E9FC /* com.apple.WebKit.OfflineStorage.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.apple.WebKit.OfflineStorage.sb; sourceTree = "<group>"; }; 2261 2342 BCB0AEE7122F53E300B1341E /* MutableDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MutableDictionary.h; sourceTree = "<group>"; }; 2262 2343 BCB0AEE8122F53E300B1341E /* MutableDictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MutableDictionary.cpp; sourceTree = "<group>"; }; … … 2449 2530 E134F01912EA5D99004EC58D /* WKPrintingView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPrintingView.mm; sourceTree = "<group>"; }; 2450 2531 E13A8A2C162879AC00392929 /* SharedWorkerProcess.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SharedWorkerProcess.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2451 E13A8A2F162879AC00392929 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };2452 E13A8A32162879AC00392929 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };2453 E13A8A33162879AC00392929 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };2454 E13A8A34162879AC00392929 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };2455 2532 E13A8A4B16287A1B00392929 /* SharedWorkerProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SharedWorkerProcess.xcconfig; sourceTree = "<group>"; }; 2456 2533 E14E99F814D879B4001D221F /* PluginProcess.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PluginProcess.entitlements; sourceTree = "<group>"; }; … … 2566 2643 buildActionMask = 2147483647; 2567 2644 files = ( 2568 BC 8283B316B4BF7700A278FE/* Foundation.framework in Frameworks */,2645 BCAF362016CA28D600D4E9FC /* Foundation.framework in Frameworks */, 2569 2646 BC8283DA16B4DB9300A278FE /* WebKit2.framework in Frameworks */, 2570 2647 ); … … 2575 2652 buildActionMask = 2147483647; 2576 2653 files = ( 2577 BC 8283C616B4BFA800A278FE/* Foundation.framework in Frameworks */,2654 BCAF361F16CA28CD00D4E9FC /* Foundation.framework in Frameworks */, 2578 2655 ); 2579 2656 runOnlyForDeploymentPostprocessing = 0; … … 2601 2678 buildActionMask = 2147483647; 2602 2679 files = ( 2603 BC 82843316B4FE1400A278FE/* Foundation.framework in Frameworks */,2680 BCAF362216CA292B00D4E9FC /* Foundation.framework in Frameworks */, 2604 2681 ); 2605 2682 runOnlyForDeploymentPostprocessing = 0; … … 2610 2687 files = ( 2611 2688 BCAE9E09160C233B00A33217 /* Foundation.framework in Frameworks */, 2689 ); 2690 runOnlyForDeploymentPostprocessing = 0; 2691 }; 2692 BCAF359716CA1D5700D4E9FC /* Frameworks */ = { 2693 isa = PBXFrameworksBuildPhase; 2694 buildActionMask = 2147483647; 2695 files = ( 2696 ); 2697 runOnlyForDeploymentPostprocessing = 0; 2698 }; 2699 BCAF35EE16CA263800D4E9FC /* Frameworks */ = { 2700 isa = PBXFrameworksBuildPhase; 2701 buildActionMask = 2147483647; 2702 files = ( 2703 BCAF361D16CA28C100D4E9FC /* Foundation.framework in Frameworks */, 2704 BCAF362116CA28F300D4E9FC /* WebKit2.framework in Frameworks */, 2705 ); 2706 runOnlyForDeploymentPostprocessing = 0; 2707 }; 2708 BCAF360116CA266900D4E9FC /* Frameworks */ = { 2709 isa = PBXFrameworksBuildPhase; 2710 buildActionMask = 2147483647; 2711 files = ( 2712 BCAF361E16CA28C500D4E9FC /* Foundation.framework in Frameworks */, 2612 2713 ); 2613 2714 runOnlyForDeploymentPostprocessing = 0; … … 2626 2727 buildActionMask = 2147483647; 2627 2728 files = ( 2628 E13A8A30162879AC00392929 /* Cocoa.framework in Frameworks */,2629 2729 ); 2630 2730 runOnlyForDeploymentPostprocessing = 0; … … 2650 2750 8DC2EF5B0486A6940098B216 /* WebKit2.framework */, 2651 2751 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */, 2752 BCAF359A16CA1D5700D4E9FC /* OfflineStorageProcess.app */, 2753 BCAF35F116CA263800D4E9FC /* com.apple.WebKit.OfflineStorage.xpc */, 2754 BCAF360416CA266900D4E9FC /* com.apple.WebKit.OfflineStorage.Development.xpc */, 2652 2755 ); 2653 2756 name = Products; … … 2669 2772 1A0EC6B0124BBD36007EF4A5 /* PluginProcess */, 2670 2773 E13A8A35162879AC00392929 /* SharedWorkerProcess */, 2774 BCAF359D16CA1D5700D4E9FC /* OfflineStorageProcess */, 2671 2775 C0CE729D1247E71D00BC0EC4 /* Derived Sources */, 2672 2776 089C1665FE841158C02AAC07 /* Resources */, … … 2674 2778 1A4F9769100E7B6600637A18 /* Configurations */, 2675 2779 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */, 2676 E13A8A2E162879AC00392929 /* Frameworks */,2677 2780 034768DFFF38A50411DB9C8B /* Products */, 2678 2781 ); … … 2805 2908 BC8283AA16B4BEAD00A278FE /* NetworkService.Development.xcconfig */, 2806 2909 BC8283AB16B4BEAD00A278FE /* NetworkService.xcconfig */, 2910 BCAF35CA16CA204300D4E9FC /* OfflineStorageProcess.xcconfig */, 2911 BCAF35CB16CA204300D4E9FC /* OfflineStorageService.Development.xcconfig */, 2912 BCAF35CC16CA204300D4E9FC /* OfflineStorageService.xcconfig */, 2807 2913 BC122FA3132707F300F7EAC1 /* PluginProcess.xcconfig */, 2808 2914 BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */, … … 2946 3052 BC111B5A112F628200337BAB /* mac */, 2947 3053 51A8A60D1627F2AC000D90E9 /* Network */, 3054 BCAF35E516CA253B00D4E9FC /* OfflineStorage */, 2948 3055 1AAE058C1279DCD400852418 /* Plugins */, 2949 3056 1A3DD205125E5A2F004515E6 /* APIClient.h */, … … 4446 4553 sourceTree = "<group>"; 4447 4554 }; 4555 BCAF359D16CA1D5700D4E9FC /* OfflineStorageProcess */ = { 4556 isa = PBXGroup; 4557 children = ( 4558 BCAF35B416CA1E2400D4E9FC /* EntryPoint */, 4559 BCAF35D016CA212400D4E9FC /* mac */, 4560 BCAF35D216CA212400D4E9FC /* OfflineStorageProcess.cpp */, 4561 BCAF35D316CA212400D4E9FC /* OfflineStorageProcess.h */, 4562 BCAF35D416CA212400D4E9FC /* OfflineStorageProcess.messages.in */, 4563 ); 4564 path = OfflineStorageProcess; 4565 sourceTree = "<group>"; 4566 }; 4567 BCAF35B416CA1E2400D4E9FC /* EntryPoint */ = { 4568 isa = PBXGroup; 4569 children = ( 4570 BCAF35B616CA1E2400D4E9FC /* LegacyProcess */, 4571 BCAF35BD16CA1F9D00D4E9FC /* XPCService */, 4572 ); 4573 path = EntryPoint; 4574 sourceTree = "<group>"; 4575 }; 4576 BCAF35B616CA1E2400D4E9FC /* LegacyProcess */ = { 4577 isa = PBXGroup; 4578 children = ( 4579 BCAF35B716CA1E2400D4E9FC /* Info.plist */, 4580 BCAF35B816CA1E2400D4E9FC /* OfflineStorageProcessMain.mm */, 4581 BCAF35B916CA1E2400D4E9FC /* OfflineStorageProcessMainBootstrapper.cpp */, 4582 ); 4583 name = LegacyProcess; 4584 path = mac/LegacyProcess; 4585 sourceTree = "<group>"; 4586 }; 4587 BCAF35BD16CA1F9D00D4E9FC /* XPCService */ = { 4588 isa = PBXGroup; 4589 children = ( 4590 BCAF35BE16CA1F9D00D4E9FC /* OfflineStorageService */, 4591 BCAF35C116CA1F9D00D4E9FC /* OfflineStorageService.Development */, 4592 BCAF35C416CA1F9D00D4E9FC /* OfflineStorageServiceEntryPoint.mm */, 4593 ); 4594 name = XPCService; 4595 path = mac/XPCService; 4596 sourceTree = "<group>"; 4597 }; 4598 BCAF35BE16CA1F9D00D4E9FC /* OfflineStorageService */ = { 4599 isa = PBXGroup; 4600 children = ( 4601 BCAF35BF16CA1F9D00D4E9FC /* Info.plist */, 4602 BCAF35C016CA1F9D00D4E9FC /* OfflineStorageServiceMain.mm */, 4603 ); 4604 path = OfflineStorageService; 4605 sourceTree = "<group>"; 4606 }; 4607 BCAF35C116CA1F9D00D4E9FC /* OfflineStorageService.Development */ = { 4608 isa = PBXGroup; 4609 children = ( 4610 BCAF35C216CA1F9D00D4E9FC /* Info.plist */, 4611 BCAF35C316CA1F9D00D4E9FC /* OfflineStorageServiceMain.Development.mm */, 4612 ); 4613 path = OfflineStorageService.Development; 4614 sourceTree = "<group>"; 4615 }; 4616 BCAF35D016CA212400D4E9FC /* mac */ = { 4617 isa = PBXGroup; 4618 children = ( 4619 BCAF361516CA274000D4E9FC /* com.apple.WebKit.OfflineStorage.sb */, 4620 BCAF35D116CA212400D4E9FC /* OfflineStorageProcessMac.mm */, 4621 ); 4622 path = mac; 4623 sourceTree = "<group>"; 4624 }; 4625 BCAF35E516CA253B00D4E9FC /* OfflineStorage */ = { 4626 isa = PBXGroup; 4627 children = ( 4628 BCAF35E616CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp */, 4629 BCAF35E716CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h */, 4630 ); 4631 path = OfflineStorage; 4632 sourceTree = "<group>"; 4633 }; 4448 4634 BCBAAC58144E38B90053F82F /* WKView Details */ = { 4449 4635 isa = PBXGroup; … … 4639 4825 1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */, 4640 4826 1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */, 4827 BCAF35E016CA249300D4E9FC /* OfflineStorageProcessMessageReceiver.cpp */, 4828 BCAF35DF16CA249300D4E9FC /* OfflineStorageProcessMessages.h */, 4641 4829 1A8EF96C1252AF6B00F7067F /* PluginControllerProxyMessageReceiver.cpp */, 4642 4830 1A8EF96D1252AF6B00F7067F /* PluginControllerProxyMessages.h */, … … 4761 4949 name = mac; 4762 4950 path = FullScreen/mac; 4763 sourceTree = "<group>";4764 };4765 E13A8A2E162879AC00392929 /* Frameworks */ = {4766 isa = PBXGroup;4767 children = (4768 E13A8A31162879AC00392929 /* Other Frameworks */,4769 E13A8A2F162879AC00392929 /* Cocoa.framework */,4770 BC8283B216B4BF7700A278FE /* Foundation.framework */,4771 );4772 name = Frameworks;4773 sourceTree = "<group>";4774 };4775 E13A8A31162879AC00392929 /* Other Frameworks */ = {4776 isa = PBXGroup;4777 children = (4778 E13A8A32162879AC00392929 /* AppKit.framework */,4779 E13A8A33162879AC00392929 /* CoreData.framework */,4780 E13A8A34162879AC00392929 /* Foundation.framework */,4781 );4782 name = "Other Frameworks";4783 4951 sourceTree = "<group>"; 4784 4952 }; … … 5382 5550 BC2E6E8E1141971500A63B1E /* WorkQueue.h in Headers */, 5383 5551 BCBECDE816B6416800047A1A /* XPCServiceEntryPoint.h in Headers */, 5552 BCAF35D916CA212400D4E9FC /* OfflineStorageProcess.h in Headers */, 5553 BCAF35E416CA24DA00D4E9FC /* OfflineStorageProcessMessages.h in Headers */, 5554 BCAF35EA16CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h in Headers */, 5384 5555 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */, 5385 5556 ); … … 5604 5775 productName = WebProcessServiceForWebKitDevelopment; 5605 5776 productReference = BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */; 5777 productType = "com.apple.product-type.bundle"; 5778 }; 5779 BCAF359916CA1D5700D4E9FC /* OfflineStorageProcess */ = { 5780 isa = PBXNativeTarget; 5781 buildConfigurationList = BCAF35B216CA1D5700D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorageProcess" */; 5782 buildPhases = ( 5783 BCAF359616CA1D5700D4E9FC /* Sources */, 5784 BCAF359716CA1D5700D4E9FC /* Frameworks */, 5785 BCAF359816CA1D5700D4E9FC /* Resources */, 5786 ); 5787 buildRules = ( 5788 ); 5789 dependencies = ( 5790 BCAF362416CA295F00D4E9FC /* PBXTargetDependency */, 5791 ); 5792 name = OfflineStorageProcess; 5793 productName = OfflineStorageProcess; 5794 productReference = BCAF359A16CA1D5700D4E9FC /* OfflineStorageProcess.app */; 5795 productType = "com.apple.product-type.application"; 5796 }; 5797 BCAF35F016CA263800D4E9FC /* OfflineStorage */ = { 5798 isa = PBXNativeTarget; 5799 buildConfigurationList = BCAF35FC16CA263800D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorage" */; 5800 buildPhases = ( 5801 BCAF35ED16CA263800D4E9FC /* Sources */, 5802 BCAF35EE16CA263800D4E9FC /* Frameworks */, 5803 BCAF35EF16CA263800D4E9FC /* Resources */, 5804 ); 5805 buildRules = ( 5806 ); 5807 dependencies = ( 5808 ); 5809 name = OfflineStorage; 5810 productName = OfflineStorage; 5811 productReference = BCAF35F116CA263800D4E9FC /* com.apple.WebKit.OfflineStorage.xpc */; 5812 productType = "com.apple.product-type.bundle"; 5813 }; 5814 BCAF360316CA266900D4E9FC /* OfflineStorage.Development */ = { 5815 isa = PBXNativeTarget; 5816 buildConfigurationList = BCAF360F16CA266900D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorage.Development" */; 5817 buildPhases = ( 5818 BCAF360016CA266900D4E9FC /* Sources */, 5819 BCAF360116CA266900D4E9FC /* Frameworks */, 5820 BCAF360216CA266900D4E9FC /* Resources */, 5821 ); 5822 buildRules = ( 5823 ); 5824 dependencies = ( 5825 ); 5826 name = OfflineStorage.Development; 5827 productName = OfflineStorage.Development; 5828 productReference = BCAF360416CA266900D4E9FC /* com.apple.WebKit.OfflineStorage.Development.xpc */; 5606 5829 productType = "com.apple.product-type.bundle"; 5607 5830 }; … … 5674 5897 510CC80D1613C79900D03ED3 /* NetworkProcess */, 5675 5898 E13A8A2B162879AC00392929 /* SharedWorkerProcess */, 5899 BCAF359916CA1D5700D4E9FC /* OfflineStorageProcess */, 5676 5900 C0CE72851247E66800BC0EC4 /* Derived Sources */, 5677 5901 1AC25FAF12A48EA700BD2671 /* PluginProcessShim */, … … 5681 5905 BC8283B016B4BF7700A278FE /* Networking */, 5682 5906 BC8283C416B4BFA800A278FE /* Networking.Development */, 5907 BCAF35F016CA263800D4E9FC /* OfflineStorage */, 5908 BCAF360316CA266900D4E9FC /* OfflineStorage.Development */, 5683 5909 BC8283F816B4FDDE00A278FE /* Plugin.32 */, 5684 5910 BC82841E16B4FDF600A278FE /* Plugin.64 */, … … 5712 5938 E11D35AD16B63D14006D23D7 /* com.apple.WebKit.SharedWorkerProcess.sb in Resources */, 5713 5939 E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */, 5940 BCAF361C16CA286700D4E9FC /* com.apple.WebKit.OfflineStorage.sb in Resources */, 5714 5941 1CBC945E16515ED200D68AAE /* Dock.pdf in Resources */, 5715 5942 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, … … 5766 5993 runOnlyForDeploymentPostprocessing = 0; 5767 5994 }; 5995 BCAF359816CA1D5700D4E9FC /* Resources */ = { 5996 isa = PBXResourcesBuildPhase; 5997 buildActionMask = 2147483647; 5998 files = ( 5999 BCAF362716CA2A5300D4E9FC /* WebKit.icns in Resources */, 6000 ); 6001 runOnlyForDeploymentPostprocessing = 0; 6002 }; 6003 BCAF35EF16CA263800D4E9FC /* Resources */ = { 6004 isa = PBXResourcesBuildPhase; 6005 buildActionMask = 2147483647; 6006 files = ( 6007 ); 6008 runOnlyForDeploymentPostprocessing = 0; 6009 }; 6010 BCAF360216CA266900D4E9FC /* Resources */ = { 6011 isa = PBXResourcesBuildPhase; 6012 buildActionMask = 2147483647; 6013 files = ( 6014 ); 6015 runOnlyForDeploymentPostprocessing = 0; 6016 }; 5768 6017 BCDE093813272496001259FB /* Resources */ = { 5769 6018 isa = PBXResourcesBuildPhase; … … 5777 6026 buildActionMask = 2147483647; 5778 6027 files = ( 6028 BCAF362616CA2A4E00D4E9FC /* WebKit.icns in Resources */, 5779 6029 ); 5780 6030 runOnlyForDeploymentPostprocessing = 0; … … 5900 6150 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc", 5901 6151 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.Development.xpc", 6152 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.OfflineStorage.xpc", 6153 "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.OfflineStorage.Development.xpc", 5902 6154 ); 5903 6155 name = "Copy XPC services for engineering builds"; … … 5910 6162 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.Plugin.64.xpc", 5911 6163 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.Plugin.Development.xpc", 6164 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.OfflineStorage.xpc", 6165 "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices/com.apple.WebKit.OfflineStorage.Development.xpc", 5912 6166 ); 5913 6167 runOnlyForDeploymentPostprocessing = 0; 5914 6168 shellPath = /bin/sh; 5915 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\n ";6169 shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nXPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit2.framework/Versions/A/XPCServices\"\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.OfflineStorage.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.OfflineStorage.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.OfflineStorage.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.OfflineStorage.Development.xpc\"\n"; 5916 6170 }; 5917 6171 C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = { … … 6506 6760 BC0092F8115837A300E0AE2A /* WorkQueueMac.cpp in Sources */, 6507 6761 BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */, 6762 BCAF35D516CA212400D4E9FC /* OfflineStorageProcessMac.mm in Sources */, 6763 BCAF35D716CA212400D4E9FC /* OfflineStorageProcess.cpp in Sources */, 6764 BCAF35DD16CA214A00D4E9FC /* OfflineStorageProcessMain.mm in Sources */, 6765 BCAF35DE16CA217700D4E9FC /* OfflineStorageServiceEntryPoint.mm in Sources */, 6766 BCAF35E816CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp in Sources */, 6767 BCAF362516CA29A200D4E9FC /* OfflineStorageProcessMessageReceiver.cpp in Sources */, 6508 6768 51A4D5A916CAC4FF000E615E /* StatisticsRequest.cpp in Sources */, 6509 6769 ); … … 6563 6823 files = ( 6564 6824 BCACC44A16B24D3600B6E092 /* WebContentServiceMain.Development.mm in Sources */, 6825 ); 6826 runOnlyForDeploymentPostprocessing = 0; 6827 }; 6828 BCAF359616CA1D5700D4E9FC /* Sources */ = { 6829 isa = PBXSourcesBuildPhase; 6830 buildActionMask = 2147483647; 6831 files = ( 6832 BCAF35BC16CA1E2400D4E9FC /* OfflineStorageProcessMainBootstrapper.cpp in Sources */, 6833 BCAF35E916CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.cpp in Sources */, 6834 ); 6835 runOnlyForDeploymentPostprocessing = 0; 6836 }; 6837 BCAF35ED16CA263800D4E9FC /* Sources */ = { 6838 isa = PBXSourcesBuildPhase; 6839 buildActionMask = 2147483647; 6840 files = ( 6841 BCAF361316CA26B800D4E9FC /* OfflineStorageServiceMain.mm in Sources */, 6842 ); 6843 runOnlyForDeploymentPostprocessing = 0; 6844 }; 6845 BCAF360016CA266900D4E9FC /* Sources */ = { 6846 isa = PBXSourcesBuildPhase; 6847 buildActionMask = 2147483647; 6848 files = ( 6849 BCAF361416CA26BB00D4E9FC /* OfflineStorageServiceMain.Development.mm in Sources */, 6565 6850 ); 6566 6851 runOnlyForDeploymentPostprocessing = 0; … … 6644 6929 target = BCAE9DE8160C097400A33217 /* WebContent.Development */; 6645 6930 targetProxy = BCAE9DFC160C0AB000A33217 /* PBXContainerItemProxy */; 6931 }; 6932 BCAF35EC16CA261500D4E9FC /* PBXTargetDependency */ = { 6933 isa = PBXTargetDependency; 6934 target = BCAF359916CA1D5700D4E9FC /* OfflineStorageProcess */; 6935 targetProxy = BCAF35EB16CA261500D4E9FC /* PBXContainerItemProxy */; 6936 }; 6937 BCAF361816CA27BD00D4E9FC /* PBXTargetDependency */ = { 6938 isa = PBXTargetDependency; 6939 target = BCAF35F016CA263800D4E9FC /* OfflineStorage */; 6940 targetProxy = BCAF361716CA27BD00D4E9FC /* PBXContainerItemProxy */; 6941 }; 6942 BCAF361A16CA27C000D4E9FC /* PBXTargetDependency */ = { 6943 isa = PBXTargetDependency; 6944 target = BCAF360316CA266900D4E9FC /* OfflineStorage.Development */; 6945 targetProxy = BCAF361916CA27C000D4E9FC /* PBXContainerItemProxy */; 6946 }; 6947 BCAF362416CA295F00D4E9FC /* PBXTargetDependency */ = { 6948 isa = PBXTargetDependency; 6949 target = 8DC2EF4F0486A6940098B216 /* WebKit2 */; 6950 targetProxy = BCAF362316CA295F00D4E9FC /* PBXContainerItemProxy */; 6951 }; 6952 BCCDE2D616C88DAA00D90310 /* PBXTargetDependency */ = { 6953 isa = PBXTargetDependency; 6954 target = BC8283F816B4FDDE00A278FE /* Plugin.32 */; 6955 targetProxy = BCCDE2D516C88DAA00D90310 /* PBXContainerItemProxy */; 6646 6956 }; 6647 6957 BCDE093413272496001259FB /* PBXTargetDependency */ = { … … 7012 7322 name = Production; 7013 7323 }; 7324 BCAF35AF16CA1D5700D4E9FC /* Debug */ = { 7325 isa = XCBuildConfiguration; 7326 baseConfigurationReference = BCAF35CA16CA204300D4E9FC /* OfflineStorageProcess.xcconfig */; 7327 buildSettings = { 7328 }; 7329 name = Debug; 7330 }; 7331 BCAF35B016CA1D5700D4E9FC /* Release */ = { 7332 isa = XCBuildConfiguration; 7333 baseConfigurationReference = BCAF35CA16CA204300D4E9FC /* OfflineStorageProcess.xcconfig */; 7334 buildSettings = { 7335 }; 7336 name = Release; 7337 }; 7338 BCAF35B116CA1D5700D4E9FC /* Production */ = { 7339 isa = XCBuildConfiguration; 7340 baseConfigurationReference = BCAF35CA16CA204300D4E9FC /* OfflineStorageProcess.xcconfig */; 7341 buildSettings = { 7342 }; 7343 name = Production; 7344 }; 7345 BCAF35FD16CA263800D4E9FC /* Debug */ = { 7346 isa = XCBuildConfiguration; 7347 baseConfigurationReference = BCAF35CC16CA204300D4E9FC /* OfflineStorageService.xcconfig */; 7348 buildSettings = { 7349 }; 7350 name = Debug; 7351 }; 7352 BCAF35FE16CA263800D4E9FC /* Release */ = { 7353 isa = XCBuildConfiguration; 7354 baseConfigurationReference = BCAF35CC16CA204300D4E9FC /* OfflineStorageService.xcconfig */; 7355 buildSettings = { 7356 }; 7357 name = Release; 7358 }; 7359 BCAF35FF16CA263800D4E9FC /* Production */ = { 7360 isa = XCBuildConfiguration; 7361 baseConfigurationReference = BCAF35CC16CA204300D4E9FC /* OfflineStorageService.xcconfig */; 7362 buildSettings = { 7363 }; 7364 name = Production; 7365 }; 7366 BCAF361016CA266900D4E9FC /* Debug */ = { 7367 isa = XCBuildConfiguration; 7368 baseConfigurationReference = BCAF35CB16CA204300D4E9FC /* OfflineStorageService.Development.xcconfig */; 7369 buildSettings = { 7370 }; 7371 name = Debug; 7372 }; 7373 BCAF361116CA266900D4E9FC /* Release */ = { 7374 isa = XCBuildConfiguration; 7375 baseConfigurationReference = BCAF35CB16CA204300D4E9FC /* OfflineStorageService.Development.xcconfig */; 7376 buildSettings = { 7377 }; 7378 name = Release; 7379 }; 7380 BCAF361216CA266900D4E9FC /* Production */ = { 7381 isa = XCBuildConfiguration; 7382 baseConfigurationReference = BCAF35CB16CA204300D4E9FC /* OfflineStorageService.Development.xcconfig */; 7383 buildSettings = { 7384 }; 7385 name = Production; 7386 }; 7014 7387 BCDE093F13272496001259FB /* Debug */ = { 7015 7388 isa = XCBuildConfiguration; … … 7226 7599 defaultConfigurationName = Production; 7227 7600 }; 7601 BCAF35B216CA1D5700D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorageProcess" */ = { 7602 isa = XCConfigurationList; 7603 buildConfigurations = ( 7604 BCAF35AF16CA1D5700D4E9FC /* Debug */, 7605 BCAF35B016CA1D5700D4E9FC /* Release */, 7606 BCAF35B116CA1D5700D4E9FC /* Production */, 7607 ); 7608 defaultConfigurationIsVisible = 0; 7609 }; 7610 BCAF35FC16CA263800D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorage" */ = { 7611 isa = XCConfigurationList; 7612 buildConfigurations = ( 7613 BCAF35FD16CA263800D4E9FC /* Debug */, 7614 BCAF35FE16CA263800D4E9FC /* Release */, 7615 BCAF35FF16CA263800D4E9FC /* Production */, 7616 ); 7617 defaultConfigurationIsVisible = 0; 7618 }; 7619 BCAF360F16CA266900D4E9FC /* Build configuration list for PBXNativeTarget "OfflineStorage.Development" */ = { 7620 isa = XCConfigurationList; 7621 buildConfigurations = ( 7622 BCAF361016CA266900D4E9FC /* Debug */, 7623 BCAF361116CA266900D4E9FC /* Release */, 7624 BCAF361216CA266900D4E9FC /* Production */, 7625 ); 7626 defaultConfigurationIsVisible = 0; 7627 }; 7228 7628 BCDE093E13272496001259FB /* Build configuration list for PBXNativeTarget "PluginProcess" */ = { 7229 7629 isa = XCConfigurationList;
Note: See TracChangeset
for help on using the changeset viewer.