Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (212654 => 212655)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-02-20 18:16:46 UTC (rev 212655)
@@ -420,8 +420,6 @@
UIProcess/Launcher/ProcessLauncher.cpp
- UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.cpp
-
UIProcess/Network/NetworkProcessProxy.cpp
UIProcess/Notifications/NotificationPermissionRequest.cpp
Modified: trunk/Source/WebKit2/ChangeLog (212654 => 212655)
--- trunk/Source/WebKit2/ChangeLog 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-20 18:16:46 UTC (rev 212655)
@@ -1,3 +1,16 @@
+2017-02-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r212632.
+
+ This change appears to have caused API test failures.
+
+ Reverted changeset:
+
+ "Reduce platform ifdefs in WebKit2 custom protocols
+ implementation"
+ https://bugs.webkit.org/show_bug.cgi?id=165028
+ http://trac.webkit.org/changeset/212632
+
2017-02-20 Youenn Fablet <you...@apple.com>
[WebRTC] Fix some memory leaks in libwebrtc binding code
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (212654 => 212655)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2017-02-20 18:16:46 UTC (rev 212655)
@@ -294,6 +294,8 @@
UIProcess/linux/MemoryPressureMonitor.cpp
+ UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
+
UIProcess/Plugins/gtk/PluginInfoCache.cpp
UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
Modified: trunk/Source/WebKit2/PlatformMac.cmake (212654 => 212655)
--- trunk/Source/WebKit2/PlatformMac.cmake 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2017-02-20 18:16:46 UTC (rev 212655)
@@ -259,6 +259,8 @@
UIProcess/Launcher/mac/ProcessLauncherMac.mm
+ UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm
+
UIProcess/Network/mac/NetworkProcessProxyMac.mm
UIProcess/Plugins/mac/PluginInfoStoreMac.mm
Modified: trunk/Source/WebKit2/UIProcess/API/APICustomProtocolManagerClient.h (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/API/APICustomProtocolManagerClient.h 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/API/APICustomProtocolManagerClient.h 2017-02-20 18:16:46 UTC (rev 212655)
@@ -41,7 +41,7 @@
public:
virtual ~CustomProtocolManagerClient() { }
- virtual void startLoading(WebKit::CustomProtocolManagerProxy&, uint64_t /* customProtocolID */, const WebCore::ResourceRequest&) { }
+ virtual bool startLoading(WebKit::CustomProtocolManagerProxy&, uint64_t /* customProtocolID */, const WebCore::ResourceRequest&) { return false; }
virtual void stopLoading(WebKit::CustomProtocolManagerProxy&, uint64_t /* customProtocolID */) { }
virtual void invalidate(WebKit::CustomProtocolManagerProxy&) { }
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCustomProtocolManagerClient.cpp (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCustomProtocolManagerClient.cpp 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCustomProtocolManagerClient.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -36,9 +36,10 @@
}
private:
- void startLoading(CustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& request) override
+ bool startLoading(CustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& request) override
{
webkitWebContextStartLoadingCustomProtocol(m_webContext, customProtocolID, request, manager);
+ return true;
}
void stopLoading(CustomProtocolManagerProxy&, uint64_t customProtocolID) override
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -193,7 +193,7 @@
// First chunk read. In case of empty reply an empty API::Data is sent to the networking process.
ResourceResponse response(URL(URL(), String::fromUTF8(priv->uri)), String::fromUTF8(priv->mimeType.data()),
priv->streamLength, emptyString());
- priv->manager->didReceiveResponse(priv->requestID, response, 0);
+ priv->manager->didReceiveResponse(priv->requestID, response);
priv->manager->didLoadData(priv->requestID, webData);
} else if (bytesRead || (!bytesRead && !priv->streamLength)) {
// Subsequent chunk read. We only send an empty API::Data to the networking process when stream length is unknown.
Deleted: trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.h (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.h 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.h 2017-02-20 18:16:46 UTC (rev 212655)
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2017 Igalia S.L.
- *
- * 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.
- */
-
-#pragma once
-
-#import "APICustomProtocolManagerClient.h"
-#import <wtf/HashMap.h>
-#import <wtf/RetainPtr.h>
-
-OBJC_CLASS WKCustomProtocolLoader;
-
-namespace WebCore {
-class ResourceRequest;
-}
-
-namespace WebKit {
-
-class CustomProtocolManagerProxy;
-
-class CustomProtocolManagerClient final : public API::CustomProtocolManagerClient {
-private:
- void startLoading(CustomProtocolManagerProxy&, uint64_t /*customProtocolID*/, const WebCore::ResourceRequest&) final;
- void stopLoading(CustomProtocolManagerProxy&, uint64_t /*customProtocolID*/) final;
- void invalidate(CustomProtocolManagerProxy&) final;
-
- HashMap<uint64_t, RetainPtr<WKCustomProtocolLoader>> m_loaderMap;
-};
-
-} // namespace WebKit
-
Deleted: trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.mm (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.mm 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.mm 2017-02-20 18:16:46 UTC (rev 212655)
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2012-2017 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.
- */
-
-#import "config.h"
-#import "CustomProtocolManagerClient.h"
-
-#import "CustomProtocolManagerProxy.h"
-#import "DataReference.h"
-#import <WebCore/ResourceError.h>
-#import <WebCore/ResourceRequest.h>
-#import <WebCore/ResourceResponse.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-@interface WKCustomProtocolLoader : NSObject <NSURLConnectionDelegate> {
-@private
- CustomProtocolManagerProxy* _customProtocolManagerProxy;
- uint64_t _customProtocolID;
- NSURLCacheStoragePolicy _storagePolicy;
- NSURLConnection *_urlConnection;
-}
-- (id)initWithCustomProtocolManagerProxy:(CustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request;
-- (void)customProtocolManagerProxyDestroyed;
-@end
-
-@implementation WKCustomProtocolLoader
-
-- (id)initWithCustomProtocolManagerProxy:(CustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request
-{
- self = [super init];
- if (!self)
- return nil;
-
- ASSERT(customProtocolManagerProxy);
- ASSERT(request);
- _customProtocolManagerProxy = customProtocolManagerProxy;
- _customProtocolID = customProtocolID;
- _storagePolicy = NSURLCacheStorageNotAllowed;
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- _urlConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
- [_urlConnection scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
- [_urlConnection start];
-#pragma clang diagnostic pop
-
- return self;
-}
-
-- (void)dealloc
-{
- [_urlConnection cancel];
- [_urlConnection release];
- [super dealloc];
-}
-
-- (void)customProtocolManagerProxyDestroyed
-{
- ASSERT(_customProtocolManagerProxy);
- _customProtocolManagerProxy = nullptr;
- [_urlConnection cancel];
-}
-
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
-{
- ResourceError coreError(error);
- _customProtocolManagerProxy->didFailWithError(_customProtocolID, coreError);
- _customProtocolManagerProxy->stopLoading(_customProtocolID);
-}
-
-- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
-{
- ASSERT(_storagePolicy == NSURLCacheStorageNotAllowed);
- _storagePolicy = [cachedResponse storagePolicy];
- return cachedResponse;
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
-{
- ResourceResponse coreResponse(response);
- _customProtocolManagerProxy->didReceiveResponse(_customProtocolID, coreResponse, _storagePolicy);
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
-{
- IPC::DataReference coreData(static_cast<const uint8_t*>([data bytes]), [data length]);
- _customProtocolManagerProxy->didLoadData(_customProtocolID, coreData);
-}
-
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
-{
- if (redirectResponse) {
- _customProtocolManagerProxy->wasRedirectedToRequest(_customProtocolID, request, redirectResponse);
- return nil;
- }
- return request;
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection
-{
- _customProtocolManagerProxy->didFinishLoading(_customProtocolID);
- _customProtocolManagerProxy->stopLoading(_customProtocolID);
-}
-
-@end
-
-namespace WebKit {
-
-void CustomProtocolManagerClient::startLoading(CustomProtocolManagerProxy& manager, uint64_t customProtocolID, const ResourceRequest& coreRequest)
-{
- NSURLRequest *request = coreRequest.nsURLRequest(DoNotUpdateHTTPBody);
- if (!request)
- return;
-
- WKCustomProtocolLoader *loader = [[WKCustomProtocolLoader alloc] initWithCustomProtocolManagerProxy:&manager customProtocolID:customProtocolID request:request];
- ASSERT(loader);
- ASSERT(!m_loaderMap.contains(customProtocolID));
- m_loaderMap.add(customProtocolID, loader);
- [loader release];
-}
-
-void CustomProtocolManagerClient::stopLoading(CustomProtocolManagerProxy&, uint64_t customProtocolID)
-{
- m_loaderMap.remove(customProtocolID);
-}
-
-void CustomProtocolManagerClient::invalidate(CustomProtocolManagerProxy&)
-{
- for (auto& loader : m_loaderMap)
- [loader.value customProtocolManagerProxyDestroyed];
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-02-20 18:16:46 UTC (rev 212655)
@@ -26,7 +26,6 @@
#import "config.h"
#import "WebProcessPool.h"
-#import "CustomProtocolManagerClient.h"
#import "NetworkProcessCreationParameters.h"
#import "NetworkProcessMessages.h"
#import "NetworkProcessProxy.h"
@@ -127,8 +126,6 @@
else if (!m_pluginProcessManagerProcessSuppressionDisabledToken)
m_pluginProcessManagerProcessSuppressionDisabledToken = PluginProcessManager::singleton().processSuppressionDisabledToken();
#endif
-
- setCustomProtocolManagerClient(std::make_unique<CustomProtocolManagerClient>());
}
NSMutableDictionary *WebProcessPool::ensureBundleParameters()
@@ -268,6 +265,9 @@
parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+ for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
+ parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
+
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
parameters.httpProxy = [defaults stringForKey:WebKit2HTTPProxyDefaultsKey];
Deleted: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.cpp (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.cpp 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- * Copyright (C) 2013 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "CustomProtocolManagerProxy.h"
-
-#include "APICustomProtocolManagerClient.h"
-#include "ChildProcessProxy.h"
-#include "CustomProtocolManagerMessages.h"
-#include "CustomProtocolManagerProxyMessages.h"
-#include "WebProcessPool.h"
-#include <WebCore/ResourceRequest.h>
-
-namespace WebKit {
-
-CustomProtocolManagerProxy::CustomProtocolManagerProxy(ChildProcessProxy* childProcessProxy, WebProcessPool& processPool)
- : m_childProcessProxy(childProcessProxy)
- , m_processPool(processPool)
-{
- ASSERT(m_childProcessProxy);
- m_childProcessProxy->addMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName(), *this);
-}
-
-CustomProtocolManagerProxy::~CustomProtocolManagerProxy()
-{
- m_childProcessProxy->removeMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName());
-}
-
-void CustomProtocolManagerProxy::startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest& request)
-{
- m_processPool.customProtocolManagerClient().startLoading(*this, customProtocolID, request);
-}
-
-void CustomProtocolManagerProxy::stopLoading(uint64_t customProtocolID)
-{
- m_processPool.customProtocolManagerClient().stopLoading(*this, customProtocolID);
-}
-
-void CustomProtocolManagerProxy::processDidClose()
-{
- m_processPool.customProtocolManagerClient().invalidate(*this);
-}
-
-void CustomProtocolManagerProxy::wasRedirectedToRequest(uint64_t customProtocolID, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& redirectResponse)
-{
- m_childProcessProxy->send(Messages::CustomProtocolManager::WasRedirectedToRequest(customProtocolID, request, redirectResponse), 0);
-}
-
-void CustomProtocolManagerProxy::didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse& response, uint32_t cacheStoragePolicy)
-{
- m_childProcessProxy->send(Messages::CustomProtocolManager::DidReceiveResponse(customProtocolID, response, cacheStoragePolicy), 0);
-}
-
-void CustomProtocolManagerProxy::didLoadData(uint64_t customProtocolID, const IPC::DataReference& data)
-{
- m_childProcessProxy->send(Messages::CustomProtocolManager::DidLoadData(customProtocolID, data), 0);
-}
-
-void CustomProtocolManagerProxy::didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError& error)
-{
- m_childProcessProxy->send(Messages::CustomProtocolManager::DidFailWithError(customProtocolID, error), 0);
-}
-
-void CustomProtocolManagerProxy::didFinishLoading(uint64_t customProtocolID)
-{
- m_childProcessProxy->send(Messages::CustomProtocolManager::DidFinishLoading(customProtocolID), 0);
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2017-02-20 18:16:46 UTC (rev 212655)
@@ -59,11 +59,12 @@
void processDidClose();
- void wasRedirectedToRequest(uint64_t customProtocolID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
- void didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse&, uint32_t cacheStoragePolicy);
+#if USE(SOUP)
+ void didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse&);
void didLoadData(uint64_t customProtocolID, const IPC::DataReference&);
void didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError&);
void didFinishLoading(uint64_t customProtocolID);
+#endif
private:
// IPC::MessageReceiver
Copied: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm (from rev 212654, trunk/Source/WebKit2/UIProcess/Cocoa/CustomProtocolManagerClient.mm) (0 => 212655)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2017-02-20 18:16:46 UTC (rev 212655)
@@ -0,0 +1,177 @@
+/*
+ * Copyright (C) 2012-2017 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.
+ */
+
+#import "config.h"
+#import "CustomProtocolManagerProxy.h"
+
+#import "ChildProcessProxy.h"
+#import "Connection.h"
+#import "CustomProtocolManagerMessages.h"
+#import "CustomProtocolManagerProxyMessages.h"
+#import "DataReference.h"
+#import "WebCoreArgumentCoders.h"
+#import <WebCore/ResourceError.h>
+#import <WebCore/ResourceRequest.h>
+#import <WebCore/ResourceResponse.h>
+
+using namespace IPC;
+using namespace WebCore;
+using namespace WebKit;
+
+@interface WKCustomProtocolLoader : NSObject <NSURLConnectionDelegate> {
+@private
+ CustomProtocolManagerProxy* _customProtocolManagerProxy;
+ uint64_t _customProtocolID;
+ RefPtr<Connection> _connection;
+ NSURLCacheStoragePolicy _storagePolicy;
+ NSURLConnection *_urlConnection;
+}
+- (id)initWithCustomProtocolManagerProxy:(CustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request connection:(Connection *)connection;
+- (void)customProtocolManagerProxyDestroyed;
+@end
+
+@implementation WKCustomProtocolLoader
+
+- (id)initWithCustomProtocolManagerProxy:(CustomProtocolManagerProxy*)customProtocolManagerProxy customProtocolID:(uint64_t)customProtocolID request:(NSURLRequest *)request connection:(Connection *)connection
+{
+ self = [super init];
+ if (!self)
+ return nil;
+
+ ASSERT(customProtocolManagerProxy);
+ ASSERT(request);
+ ASSERT(connection);
+ _customProtocolManagerProxy = customProtocolManagerProxy;
+ _customProtocolID = customProtocolID;
+ _connection = connection;
+ _storagePolicy = NSURLCacheStorageNotAllowed;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ _urlConnection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO];
+ [_urlConnection scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+ [_urlConnection start];
+#pragma clang diagnostic pop
+
+ return self;
+}
+
+- (void)dealloc
+{
+ _connection = nullptr;
+ [_urlConnection cancel];
+ [_urlConnection release];
+ [super dealloc];
+}
+
+- (void)customProtocolManagerProxyDestroyed
+{
+ ASSERT(_customProtocolManagerProxy);
+ _customProtocolManagerProxy = nullptr;
+ [_urlConnection cancel];
+}
+
+- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error
+{
+ ResourceError coreError(error);
+ _connection->send(Messages::CustomProtocolManager::DidFailWithError(_customProtocolID, coreError), 0);
+ _customProtocolManagerProxy->stopLoading(_customProtocolID);
+}
+
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+ ASSERT(_storagePolicy == NSURLCacheStorageNotAllowed);
+ _storagePolicy = [cachedResponse storagePolicy];
+ return cachedResponse;
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response
+{
+ ResourceResponse coreResponse(response);
+ _connection->send(Messages::CustomProtocolManager::DidReceiveResponse(_customProtocolID, coreResponse, _storagePolicy), 0);
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+ IPC::DataReference coreData(static_cast<const uint8_t*>([data bytes]), [data length]);
+ _connection->send(Messages::CustomProtocolManager::DidLoadData(_customProtocolID, coreData), 0);
+}
+
+- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
+{
+ if (redirectResponse) {
+ _connection->send(Messages::CustomProtocolManager::WasRedirectedToRequest(_customProtocolID, request, redirectResponse), 0);
+ return nil;
+ }
+ return request;
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection
+{
+ _connection->send(Messages::CustomProtocolManager::DidFinishLoading(_customProtocolID), 0);
+ _customProtocolManagerProxy->stopLoading(_customProtocolID);
+}
+
+@end
+
+namespace WebKit {
+
+CustomProtocolManagerProxy::CustomProtocolManagerProxy(ChildProcessProxy* childProcessProxy, WebProcessPool& processPool)
+ : m_childProcessProxy(childProcessProxy)
+ , m_processPool(processPool)
+{
+ ASSERT(m_childProcessProxy);
+ m_childProcessProxy->addMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName(), *this);
+}
+
+CustomProtocolManagerProxy::~CustomProtocolManagerProxy()
+{
+ for (auto& loader : m_loaderMap)
+ [loader.value customProtocolManagerProxyDestroyed];
+ m_childProcessProxy->removeMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName());
+}
+
+void CustomProtocolManagerProxy::startLoading(uint64_t customProtocolID, const ResourceRequest& coreRequest)
+{
+ NSURLRequest *request = coreRequest.nsURLRequest(DoNotUpdateHTTPBody);
+ if (!request)
+ return;
+
+ WKCustomProtocolLoader *loader = [[WKCustomProtocolLoader alloc] initWithCustomProtocolManagerProxy:this customProtocolID:customProtocolID request:request connection:m_childProcessProxy->connection()];
+ ASSERT(loader);
+ ASSERT(!m_loaderMap.contains(customProtocolID));
+ m_loaderMap.add(customProtocolID, loader);
+ [loader release];
+}
+
+void CustomProtocolManagerProxy::stopLoading(uint64_t customProtocolID)
+{
+ m_loaderMap.remove(customProtocolID);
+}
+
+void CustomProtocolManagerProxy::processDidClose()
+{
+}
+
+} // namespace WebKit
Copied: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (from rev 212654, trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.cpp) (0 => 212655)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include "CustomProtocolManagerProxy.h"
+
+#include "APICustomProtocolManagerClient.h"
+#include "ChildProcessProxy.h"
+#include "CustomProtocolManagerMessages.h"
+#include "CustomProtocolManagerProxyMessages.h"
+#include "WebProcessPool.h"
+#include <WebCore/ResourceRequest.h>
+
+#if PLATFORM(GTK)
+#include <WebCore/ErrorsGtk.h>
+#endif
+
+namespace WebKit {
+
+CustomProtocolManagerProxy::CustomProtocolManagerProxy(ChildProcessProxy* childProcessProxy, WebProcessPool& processPool)
+ : m_childProcessProxy(childProcessProxy)
+ , m_processPool(processPool)
+{
+ ASSERT(m_childProcessProxy);
+ m_childProcessProxy->addMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName(), *this);
+}
+
+CustomProtocolManagerProxy::~CustomProtocolManagerProxy()
+{
+ m_childProcessProxy->removeMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName());
+}
+
+void CustomProtocolManagerProxy::processDidClose()
+{
+ m_processPool.customProtocolManagerClient().invalidate(*this);
+}
+
+void CustomProtocolManagerProxy::startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest& request)
+{
+ if (!m_processPool.customProtocolManagerClient().startLoading(*this, customProtocolID, request))
+ didFailWithError(customProtocolID, WebCore::cannotShowURLError(request));
+}
+
+void CustomProtocolManagerProxy::stopLoading(uint64_t customProtocolID)
+{
+ m_processPool.customProtocolManagerClient().stopLoading(*this, customProtocolID);
+}
+
+void CustomProtocolManagerProxy::didReceiveResponse(uint64_t customProtocolID, const WebCore::ResourceResponse& response)
+{
+ m_childProcessProxy->send(Messages::CustomProtocolManager::DidReceiveResponse(customProtocolID, response, 0), 0);
+}
+
+void CustomProtocolManagerProxy::didLoadData(uint64_t customProtocolID, const IPC::DataReference& data)
+{
+ m_childProcessProxy->send(Messages::CustomProtocolManager::DidLoadData(customProtocolID, data), 0);
+}
+
+void CustomProtocolManagerProxy::didFailWithError(uint64_t customProtocolID, const WebCore::ResourceError& error)
+{
+ m_childProcessProxy->send(Messages::CustomProtocolManager::DidFailWithError(customProtocolID, error), 0);
+}
+
+void CustomProtocolManagerProxy::didFinishLoading(uint64_t customProtocolID)
+{
+ m_childProcessProxy->send(Messages::CustomProtocolManager::DidFinishLoading(customProtocolID), 0);
+}
+
+} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -149,12 +149,6 @@
return configuration;
}
-static HashSet<String, ASCIICaseInsensitiveHash>& globalURLSchemesWithCustomProtocolHandlers()
-{
- static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> set;
- return set;
-}
-
WebProcessPool::WebProcessPool(API::ProcessPoolConfiguration& configuration)
: m_configuration(configuration.copy())
, m_haveInitialEmptyProcess(false)
@@ -163,7 +157,9 @@
, m_automationClient(std::make_unique<API::AutomationClient>())
, m_downloadClient(std::make_unique<API::DownloadClient>())
, m_historyClient(std::make_unique<API::LegacyContextHistoryClient>())
+#if USE(SOUP)
, m_customProtocolManagerClient(std::make_unique<API::CustomProtocolManagerClient>())
+#endif
, m_visitedLinkStore(VisitedLinkStore::create())
, m_visitedLinksPopulated(false)
, m_plugInAutoStartProvider(this)
@@ -304,14 +300,6 @@
m_automationClient = WTFMove(automationClient);
}
-void WebProcessPool::setCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&& customProtocolManagerClient)
-{
- if (!customProtocolManagerClient)
- m_customProtocolManagerClient = std::make_unique<API::CustomProtocolManagerClient>();
- else
- m_customProtocolManagerClient = WTFMove(customProtocolManagerClient);
-}
-
void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
{
// Guard against API misuse.
@@ -365,12 +353,6 @@
parameters.diskCacheSizeOverride = m_configuration->diskCacheSizeOverride();
parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
- for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
- parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-
- for (auto& scheme : m_urlSchemesRegisteredForCustomProtocols)
- parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-
parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
if (!parameters.diskCacheDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(parameters.diskCacheDirectory, parameters.diskCacheDirectoryExtensionHandle);
@@ -977,6 +959,12 @@
sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCORSEnabled(urlScheme));
}
+HashSet<String, ASCIICaseInsensitiveHash>& WebProcessPool::globalURLSchemesWithCustomProtocolHandlers()
+{
+ static NeverDestroyed<HashSet<String, ASCIICaseInsensitiveHash>> set;
+ return set;
+}
+
void WebProcessPool::registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String& urlScheme)
{
if (!urlScheme)
@@ -1369,14 +1357,17 @@
void WebProcessPool::registerSchemeForCustomProtocol(const String& scheme)
{
- if (!globalURLSchemesWithCustomProtocolHandlers().contains(scheme))
- m_urlSchemesRegisteredForCustomProtocols.add(scheme);
+#if USE(SOUP)
+ m_urlSchemesRegisteredForCustomProtocols.add(scheme);
+#endif
sendToNetworkingProcess(Messages::CustomProtocolManager::RegisterScheme(scheme));
}
void WebProcessPool::unregisterSchemeForCustomProtocol(const String& scheme)
{
+#if USE(SOUP)
m_urlSchemesRegisteredForCustomProtocols.remove(scheme);
+#endif
sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
}
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-02-20 18:16:46 UTC (rev 212655)
@@ -142,7 +142,9 @@
void setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient>);
void setDownloadClient(std::unique_ptr<API::DownloadClient>);
void setAutomationClient(std::unique_ptr<API::AutomationClient>);
+#if USE(SOUP)
void setCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&&);
+#endif
void setMaximumNumberOfProcesses(unsigned); // Can only be called when there are no processes running.
unsigned maximumNumberOfProcesses() const { return !m_configuration->maximumProcessCount() ? UINT_MAX : m_configuration->maximumProcessCount(); }
@@ -233,7 +235,9 @@
API::LegacyContextHistoryClient& historyClient() { return *m_historyClient; }
WebContextClient& client() { return m_client; }
+#if USE(SOUP)
API::CustomProtocolManagerClient& customProtocolManagerClient() const { return *m_customProtocolManagerClient; }
+#endif
WebIconDatabase* iconDatabase() const { return m_iconDatabase.get(); }
@@ -332,6 +336,7 @@
void registerSchemeForCustomProtocol(const String&);
void unregisterSchemeForCustomProtocol(const String&);
+ static HashSet<String, ASCIICaseInsensitiveHash>& globalURLSchemesWithCustomProtocolHandlers();
static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
@@ -469,7 +474,9 @@
std::unique_ptr<API::AutomationClient> m_automationClient;
std::unique_ptr<API::DownloadClient> m_downloadClient;
std::unique_ptr<API::LegacyContextHistoryClient> m_historyClient;
+#if USE(SOUP)
std::unique_ptr<API::CustomProtocolManagerClient> m_customProtocolManagerClient;
+#endif
RefPtr<WebAutomationSession> m_automationSession;
@@ -515,7 +522,6 @@
HTTPCookieAcceptPolicy m_initialHTTPCookieAcceptPolicy { HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain };
WebCore::SoupNetworkProxySettings m_networkProxySettings;
#endif
- HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;
#if PLATFORM(MAC)
RetainPtr<NSObject> m_enhancedAccessibilityObserver;
@@ -548,6 +554,7 @@
#if USE(SOUP)
bool m_ignoreTLSErrors { true };
+ HashSet<String, ASCIICaseInsensitiveHash> m_urlSchemesRegisteredForCustomProtocols;
#endif
bool m_memoryCacheDisabled;
Modified: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (212654 => 212655)
--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2017-02-20 18:16:46 UTC (rev 212655)
@@ -42,6 +42,8 @@
parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
parameters.ignoreTLSErrors = m_ignoreTLSErrors;
parameters.languages = WebCore::userPreferredLanguages();
+ for (const auto& scheme : m_urlSchemesRegisteredForCustomProtocols)
+ parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
parameters.shouldEnableNetworkCacheEfficacyLogging = false;
parameters.proxySettings = m_networkProxySettings;
}
@@ -53,6 +55,14 @@
networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
}
+void WebProcessPool::setCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&& customProtocolManagerClient)
+{
+ if (!customProtocolManagerClient)
+ m_customProtocolManagerClient = std::make_unique<API::CustomProtocolManagerClient>();
+ else
+ m_customProtocolManagerClient = WTFMove(customProtocolManagerClient);
+}
+
void WebProcessPool::setNetworkProxySettings(const WebCore::SoupNetworkProxySettings& settings)
{
m_networkProxySettings = settings;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (212654 => 212655)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-20 18:14:58 UTC (rev 212654)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-20 18:16:46 UTC (rev 212655)
@@ -600,6 +600,7 @@
2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */; };
2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */; };
29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */; };
+ 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */; };
29CD55AA128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h */; };
29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm */; };
2D1087601D2C573E00B85F82 /* LoadParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D10875E1D2C573E00B85F82 /* LoadParameters.cpp */; };
@@ -1165,10 +1166,6 @@
7A791EFA1C7CFCF100C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A791EF91C7CFB3700C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp */; };
7A791EFB1C7CFD0100C4C52B /* WebResourceLoadStatisticsStoreMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A791EF81C7CFB1000C4C52B /* WebResourceLoadStatisticsStoreMessages.h */; };
7A791EFC1C7D08C500C4C52B /* WebResourceLoadStatisticsStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */; };
- 7A821F4A1E2F65E900604577 /* CustomProtocolManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F491E2F65DD00604577 /* CustomProtocolManagerProxy.cpp */; };
- 7A821F4C1E2F673900604577 /* CustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4B1E2F664800604577 /* CustomProtocolManagerClient.h */; };
- 7A821F4E1E2F67A800604577 /* CustomProtocolManagerClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7A821F4D1E2F679E00604577 /* CustomProtocolManagerClient.mm */; };
- 7A821F501E2F7A7500604577 /* APICustomProtocolManagerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */; };
7C065F2B1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C065F291C8CD95F00C2D950 /* WebUserContentControllerDataTypes.cpp */; };
7C065F2C1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C065F2A1C8CD95F00C2D950 /* WebUserContentControllerDataTypes.h */; };
7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C135AA6173B0BCA00586AE2 /* WKPluginInformation.cpp */; };
@@ -2736,6 +2733,7 @@
2984F586164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CustomProtocolManagerMessageReceiver.cpp; sourceTree = "<group>"; };
2984F587164BA095004BC0C6 /* CustomProtocolManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerMessages.h; sourceTree = "<group>"; };
29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomProtocolManagerProxy.h; path = CustomProtocols/CustomProtocolManagerProxy.h; sourceTree = "<group>"; };
+ 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CustomProtocolManagerProxyMac.mm; path = CustomProtocols/mac/CustomProtocolManagerProxyMac.mm; sourceTree = "<group>"; };
29AD3097164B4E210072DEA9 /* CustomProtocolManagerProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CustomProtocolManagerProxy.messages.in; path = CustomProtocols/CustomProtocolManagerProxy.messages.in; sourceTree = "<group>"; };
29CD55A8128E294F00133C85 /* WKAccessibilityWebPageObjectBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKAccessibilityWebPageObjectBase.h; sourceTree = "<group>"; };
29CD55A9128E294F00133C85 /* WKAccessibilityWebPageObjectBase.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKAccessibilityWebPageObjectBase.mm; sourceTree = "<group>"; };
@@ -3359,10 +3357,6 @@
7A5E39491D5BD8A700B4B7CE /* com.macromedia.Flash Player ESR.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player ESR.plugin.sb"; sourceTree = "<group>"; };
7A791EF81C7CFB1000C4C52B /* WebResourceLoadStatisticsStoreMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsStoreMessages.h; sourceTree = "<group>"; };
7A791EF91C7CFB3700C4C52B /* WebResourceLoadStatisticsStoreMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadStatisticsStoreMessageReceiver.cpp; sourceTree = "<group>"; };
- 7A821F491E2F65DD00604577 /* CustomProtocolManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomProtocolManagerProxy.cpp; path = CustomProtocols/CustomProtocolManagerProxy.cpp; sourceTree = "<group>"; };
- 7A821F4B1E2F664800604577 /* CustomProtocolManagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomProtocolManagerClient.h; sourceTree = "<group>"; };
- 7A821F4D1E2F679E00604577 /* CustomProtocolManagerClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomProtocolManagerClient.mm; sourceTree = "<group>"; };
- 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICustomProtocolManagerClient.h; sourceTree = "<group>"; };
7A9CD8C01C77984900D9F6C7 /* WebResourceLoadStatisticsStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadStatisticsStore.cpp; sourceTree = "<group>"; };
7A9CD8C11C77984900D9F6C7 /* WebResourceLoadStatisticsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadStatisticsStore.h; sourceTree = "<group>"; };
7A9CD8C21C779AD600D9F6C7 /* WebResourceLoadStatisticsStore.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebResourceLoadStatisticsStore.messages.in; sourceTree = "<group>"; };
@@ -4996,8 +4990,6 @@
99C81D561C20DFBE005C4C82 /* AutomationClient.mm */,
990D28B71C6539A000986977 /* AutomationSessionClient.h */,
990D28B81C6539A000986977 /* AutomationSessionClient.mm */,
- 7A821F4B1E2F664800604577 /* CustomProtocolManagerClient.h */,
- 7A821F4D1E2F679E00604577 /* CustomProtocolManagerClient.mm */,
83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */,
83891B6B1A68C30B0030F386 /* DiagnosticLoggingClient.mm */,
A1DF631118E0B7C8003A3E2A /* DownloadClient.h */,
@@ -5158,7 +5150,6 @@
children = (
29AD3094164B4C830072DEA9 /* mac */,
29AD3092164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h */,
- 7A821F491E2F65DD00604577 /* CustomProtocolManagerProxy.cpp */,
29AD3097164B4E210072DEA9 /* CustomProtocolManagerProxy.messages.in */,
);
name = CustomProtocols;
@@ -5167,6 +5158,7 @@
29AD3094164B4C830072DEA9 /* mac */ = {
isa = PBXGroup;
children = (
+ 29AD3095164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm */,
);
name = mac;
sourceTree = "<group>";
@@ -6588,7 +6580,6 @@
99C81D5B1C20E817005C4C82 /* APIAutomationClient.h */,
990D28B31C6526D400986977 /* APIAutomationSessionClient.h */,
076E884D1A13CADF005E90FC /* APIContextMenuClient.h */,
- 7A821F4F1E2F7A5C00604577 /* APICustomProtocolManagerClient.h */,
83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */,
1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
317FE7C11C487A6600A0CA89 /* APIExperimentalFeature.cpp */,
@@ -7877,7 +7868,6 @@
7CA3793E1AC378B30079DC37 /* _WKUserContentExtensionStorePrivate.h in Headers */,
7C89D2BA1A6B0F2C003A5FDE /* _WKUserContentFilter.h in Headers */,
7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */,
- 7A821F501E2F7A7500604577 /* APICustomProtocolManagerClient.h in Headers */,
7C882DF71C7E9965006BF731 /* _WKUserContentWorld.h in Headers */,
7C882DF91C7E996F006BF731 /* _WKUserContentWorldInternal.h in Headers */,
7CB365AA1D31DB70007158CA /* _WKUserInitiatedAction.h in Headers */,
@@ -8186,7 +8176,6 @@
41DC459F1E3DBDA500B11F51 /* WebRTCSocket.h in Headers */,
1A0EC906124C0AB8007EF4A5 /* PluginProcessConnection.h in Headers */,
1A0EC90F124C0AF5007EF4A5 /* PluginProcessConnectionManager.h in Headers */,
- 7A821F4C1E2F673900604577 /* CustomProtocolManagerClient.h in Headers */,
1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */,
1A2BB6D114117B4D000F35D4 /* PluginProcessConnectionMessages.h in Headers */,
1A2D90D21281C966001EB962 /* PluginProcessCreationParameters.h in Headers */,
@@ -9504,6 +9493,7 @@
B878B616133428DC006888E9 /* CorrectionPanel.mm in Sources */,
5C14271D1C23F8CF00D41183 /* CustomProtocolManagerCocoa.mm in Sources */,
2984F588164BA095004BC0C6 /* CustomProtocolManagerMessageReceiver.cpp in Sources */,
+ 29AD3096164B4C930072DEA9 /* CustomProtocolManagerProxyMac.mm in Sources */,
2984F57C164B915F004BC0C6 /* CustomProtocolManagerProxyMessageReceiver.cpp in Sources */,
51E351FF180F5D0F00E53BE9 /* DatabaseProcess.cpp in Sources */,
515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */,
@@ -10164,7 +10154,6 @@
1AB40EE51BF677E300BA81BE /* WKMenuItemIdentifiers.mm in Sources */,
BC4075FD124FF0270068F20A /* WKMutableArray.cpp in Sources */,
BC4075FF124FF0270068F20A /* WKMutableDictionary.cpp in Sources */,
- 7A821F4A1E2F65E900604577 /* CustomProtocolManagerProxy.cpp in Sources */,
1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */,
1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */,
2D3A65DA1A7C3A1F00CAC637 /* WKNavigationActionRef.cpp in Sources */,
@@ -10268,7 +10257,6 @@
1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
1A7C0DF61B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp in Sources */,
BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,
- 7A821F4E1E2F67A800604577 /* CustomProtocolManagerClient.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
