Diff
Modified: trunk/ChangeLog (174802 => 174803)
--- trunk/ChangeLog 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/ChangeLog 2014-10-17 01:14:24 UTC (rev 174803)
@@ -1,3 +1,12 @@
+2014-10-16 Pascal Jacquemart <[email protected]>
+
+ Removing CUSTOM_PROTOCOLS guard
+ https://bugs.webkit.org/show_bug.cgi?id=137741
+
+ Reviewed by Benjamin Poulain.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2014-10-11 KwangHyuk Kim <[email protected]>
[EFL] Enable WebP support.
Modified: trunk/Source/WebKit2/ChangeLog (174802 => 174803)
--- trunk/Source/WebKit2/ChangeLog 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/ChangeLog 2014-10-17 01:14:24 UTC (rev 174803)
@@ -1,3 +1,60 @@
+2014-10-16 Pascal Jacquemart <[email protected]>
+
+ Removing CUSTOM_PROTOCOLS guard
+ https://bugs.webkit.org/show_bug.cgi?id=137741
+
+ Reviewed by Benjamin Poulain.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::NetworkProcess):
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/soup/WKAPICastSoup.h:
+ * UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp:
+ (WKSoupCustomProtocolRequestManagerGetTypeID):
+ (WKSoupCustomProtocolRequestManagerSetClient):
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
+ * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in:
+ * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
+ * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::NetworkProcessProxy):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::WebContext):
+ (WebKit::WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
+ (WebKit::WebContext::unregisterSchemeForCustomProtocol):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformInitializeWebProcess):
+ (WebKit::WebContext::platformInitializeNetworkProcess):
+ * WebKit2Prefix.h:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ * WebProcess/soup/WebKitSoupRequestGeneric.cpp:
+ (webkitSoupRequestGenericSendAsync):
+ (webkitSoupRequestGenericSendFinish):
+ * WebProcess/soup/WebKitSoupRequestGeneric.h:
+
2014-10-16 Simon Fraser <[email protected]>
Crash under RemoteLayerTreeHost::getLayer() when closing a tab
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (174802 => 174803)
--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -76,9 +76,7 @@
addSupplement<AuthenticationManager>();
addSupplement<WebCookieManager>();
-#if ENABLE(CUSTOM_PROTOCOLS)
addSupplement<CustomProtocolManager>();
-#endif
}
NetworkProcess::~NetworkProcess()
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2014-10-17 01:14:24 UTC (rev 174803)
@@ -26,8 +26,6 @@
#import "config.h"
#import "CustomProtocolManager.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#import "ChildProcess.h"
#import "CustomProtocolManagerMessages.h"
#import "CustomProtocolManagerProxyMessages.h"
@@ -274,5 +272,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -26,8 +26,6 @@
#ifndef CustomProtocolManager_h
#define CustomProtocolManager_h
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "Connection.h"
#include "NetworkProcessSupplement.h"
#include "WebProcessSupplement.h"
@@ -119,6 +117,4 @@
} // namespace WebKit
-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
#endif // CustomProtocolManager_h
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
# 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.
-#if ENABLE(CUSTOM_PROTOCOLS)
-
messages -> CustomProtocolManager {
DidFailWithError(uint64_t customProtocolID, WebCore::ResourceError error)
DidLoadData(uint64_t customProtocolID, IPC::DataReference data)
@@ -31,5 +29,3 @@
RegisterScheme(String name)
UnregisterScheme(String name)
}
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#include "config.h"
#include "CustomProtocolManagerImpl.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "ChildProcess.h"
#include "CustomProtocolManagerProxyMessages.h"
#include "DataReference.h"
@@ -203,5 +201,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#ifndef CustomProtocolManagerImpl_h
#define CustomProtocolManagerImpl_h
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include <wtf/HashMap.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/WTFString.h>
@@ -69,6 +67,4 @@
} // namespace WebKit
-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
#endif // CustomProtocolManagerImpl_h
Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#include "config.h"
#include "CustomProtocolManager.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "ChildProcess.h"
#include "CustomProtocolManagerImpl.h"
#include "CustomProtocolManagerMessages.h"
@@ -109,5 +107,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -50,9 +50,7 @@
encoder << parentBundleDirectoryExtensionHandle;
#endif
encoder << shouldUseTestingNetworkSession;
-#if ENABLE(CUSTOM_PROTOCOLS)
encoder << urlSchemesRegisteredForCustomProtocols;
-#endif
#if PLATFORM(COCOA)
encoder << parentProcessName;
encoder << uiProcessBundleIdentifier;
@@ -94,10 +92,8 @@
#endif
if (!decoder.decode(result.shouldUseTestingNetworkSession))
return false;
-#if ENABLE(CUSTOM_PROTOCOLS)
if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
return false;
-#endif
#if PLATFORM(COCOA)
if (!decoder.decode(result.parentProcessName))
return false;
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (174802 => 174803)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -69,9 +69,7 @@
#endif
bool shouldUseTestingNetworkSession;
-#if ENABLE(CUSTOM_PROTOCOLS)
Vector<String> urlSchemesRegisteredForCustomProtocols;
-#endif
#if PLATFORM(COCOA)
String parentProcessName;
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (174802 => 174803)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -84,9 +84,7 @@
#if ENABLE(CACHE_PARTITIONING)
encoder << urlSchemesRegisteredAsCachePartitioned;
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
encoder << urlSchemesRegisteredForCustomProtocols;
-#endif
#if USE(SOUP)
encoder << cookiePersistentStoragePath;
encoder << cookiePersistentStorageType;
@@ -192,10 +190,8 @@
if (!decoder.decode(parameters.urlSchemesRegisteredAsCachePartitioned))
return false;
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
if (!decoder.decode(parameters.urlSchemesRegisteredForCustomProtocols))
return false;
-#endif
#if USE(SOUP)
if (!decoder.decode(parameters.cookiePersistentStoragePath))
return false;
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (174802 => 174803)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -91,9 +91,7 @@
#if ENABLE(CACHE_PARTITIONING)
Vector<String> urlSchemesRegisteredAsCachePartitioned;
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
Vector<String> urlSchemesRegisteredForCustomProtocols;
-#endif
#if USE(SOUP)
String cookiePersistentStoragePath;
uint32_t cookiePersistentStorageType;
Modified: trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -35,9 +35,7 @@
class WebSoupCustomProtocolRequestManager;
class WebSoupRequestManagerProxy;
-#if ENABLE(CUSTOM_PROTOCOLS)
WK_ADD_API_MAPPING(WKSoupCustomProtocolRequestManagerRef, WebSoupCustomProtocolRequestManager)
-#endif
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -33,19 +33,10 @@
WKTypeID WKSoupCustomProtocolRequestManagerGetTypeID()
{
-#if ENABLE(CUSTOM_PROTOCOLS)
return toAPI(WebSoupCustomProtocolRequestManager::APIType);
-#else
- return 0;
-#endif
}
void WKSoupCustomProtocolRequestManagerSetClient(WKSoupCustomProtocolRequestManagerRef soupRequestManagerRef, const WKSoupCustomProtocolRequestManagerClientBase* wkClient)
{
-#if ENABLE(CUSTOM_PROTOCOLS)
toImpl(soupRequestManagerRef)->initializeClient(wkClient);
-#else
- UNUSED_PARAM(soupRequestManagerRef);
- UNUSED_PARAM(wkClient);
-#endif
}
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -26,8 +26,6 @@
#ifndef CustomProtocolManagerProxy_h
#define CustomProtocolManagerProxy_h
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "MessageReceiver.h"
#if PLATFORM(COCOA)
@@ -67,6 +65,4 @@
} // namespace WebKit
-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
#endif // CustomProtocolManagerProxy_h
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,11 +20,7 @@
# 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.
-#if ENABLE(CUSTOM_PROTOCOLS)
-
messages -> CustomProtocolManagerProxy {
StartLoading(uint64_t customProtocolID, WebCore::ResourceRequest request)
StopLoading(uint64_t customProtocolID)
}
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm 2014-10-17 01:14:24 UTC (rev 174803)
@@ -26,8 +26,6 @@
#import "config.h"
#import "CustomProtocolManagerProxy.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#import "ChildProcessProxy.h"
#import "Connection.h"
#import "CustomProtocolManagerMessages.h"
@@ -149,5 +147,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#include "config.h"
#include "CustomProtocolManagerProxy.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "ChildProcessProxy.h"
#include "CustomProtocolManagerMessages.h"
#include "CustomProtocolManagerProxyMessages.h"
@@ -50,5 +48,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#include "config.h"
#include "WebSoupCustomProtocolRequestManager.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "APIData.h"
#include "CustomProtocolManagerMessages.h"
#include "WebContext.h"
@@ -146,5 +144,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#ifndef WebSoupCustomProtocolRequestManager_h
#define WebSoupCustomProtocolRequestManager_h
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "APIObject.h"
#include "WebContextSupplement.h"
#include "WebSoupCustomProtocolRequestManagerClient.h"
@@ -83,6 +81,4 @@
} // namespace WebKit
-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
#endif // WebSoupCustomProtocolRequestManager_h
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#include "config.h"
#include "WebSoupCustomProtocolRequestManagerClient.h"
-#if ENABLE(CUSTOM_PROTOCOLS)
-
namespace WebKit {
bool WebSoupCustomProtocolRequestManagerClient::startLoading(WebSoupCustomProtocolRequestManager* soupRequestManager, uint64_t customProtocolID, const WebCore::ResourceRequest& request)
@@ -41,5 +39,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,8 +20,6 @@
#ifndef WebSoupCustomProtocolRequestManagerClient_h
#define WebSoupCustomProtocolRequestManagerClient_h
-#if ENABLE(CUSTOM_PROTOCOLS)
-
#include "APIClient.h"
#include "WKAPICast.h"
#include "WKSoupCustomProtocolRequestManager.h"
@@ -49,6 +47,4 @@
} // namespace WebKit
-#endif // ENABLE(CUSTOM_PROTOCOLS)
-
#endif // WebSoupCustomProtocolRequestManagerClient_h
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -55,9 +55,7 @@
NetworkProcessProxy::NetworkProcessProxy(WebContext& webContext)
: m_webContext(webContext)
, m_numPendingConnectionRequests(0)
-#if ENABLE(CUSTOM_PROTOCOLS)
, m_customProtocolManagerProxy(this, webContext)
-#endif
{
connect();
}
Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -29,15 +29,12 @@
#if ENABLE(NETWORK_PROCESS)
#include "ChildProcessProxy.h"
+#include "CustomProtocolManagerProxy.h"
#include "ProcessLauncher.h"
#include "WebProcessProxyMessages.h"
#include <memory>
#include <wtf/Deque.h>
-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerProxy.h"
-#endif
-
#if PLATFORM(IOS)
#include "ProcessAssertion.h"
#endif
@@ -98,10 +95,7 @@
Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
-
-#if ENABLE(CUSTOM_PROTOCOLS)
CustomProtocolManagerProxy m_customProtocolManagerProxy;
-#endif
#if PLATFORM(IOS)
std::unique_ptr<ProcessAssertion> m_assertion;
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -29,6 +29,7 @@
#include "APIArray.h"
#include "APIDownloadClient.h"
#include "APIHistoryClient.h"
+#include "CustomProtocolManagerMessages.h"
#include "DownloadProxy.h"
#include "DownloadProxyMessages.h"
#include "Logging.h"
@@ -91,15 +92,11 @@
#include "ServicesController.h"
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerMessages.h"
-#endif
-
#if ENABLE(REMOTE_INSPECTOR)
#include <_javascript_Core/RemoteInspector.h>
#endif
-#if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
+#if USE(SOUP)
#include "WebSoupCustomProtocolRequestManager.h"
#endif
@@ -205,7 +202,7 @@
#if ENABLE(SQL_DATABASE)
addSupplement<WebDatabaseManagerProxy>();
#endif
-#if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
+#if USE(SOUP)
addSupplement<WebSoupCustomProtocolRequestManager>();
#endif
#if ENABLE(BATTERY_STATUS)
@@ -1011,7 +1008,6 @@
sendToAllProcesses(Messages::WebProcess::RegisterURLSchemeAsCORSEnabled(urlScheme));
}
-#if ENABLE(CUSTOM_PROTOCOLS)
HashSet<String>& WebContext::globalURLSchemesWithCustomProtocolHandlers()
{
static NeverDestroyed<HashSet<String>> set;
@@ -1039,7 +1035,6 @@
for (auto* context : allContexts())
context->unregisterSchemeForCustomProtocol(schemeLower);
}
-#endif
#if ENABLE(CACHE_PARTITIONING)
void WebContext::registerURLSchemeAsCachePartitioned(const String& urlScheme)
@@ -1397,7 +1392,6 @@
m_plugInAutoStartProvider.setAutoStartOriginsFilteringOutEntriesAddedAfterTime(dictionary, time);
}
-#if ENABLE(CUSTOM_PROTOCOLS)
void WebContext::registerSchemeForCustomProtocol(const String& scheme)
{
sendToNetworkingProcess(Messages::CustomProtocolManager::RegisterScheme(scheme));
@@ -1407,7 +1401,6 @@
{
sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
}
-#endif
#if ENABLE(NETSCAPE_PLUGIN_API)
void WebContext::pluginInfoStoreDidLoadPlugins(PluginInfoStore* store)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -335,14 +335,12 @@
bool isURLKnownHSTSHost(const String& urlString, bool privateBrowsingEnabled) const;
void resetHSTSHosts();
-#if ENABLE(CUSTOM_PROTOCOLS)
void registerSchemeForCustomProtocol(const String&);
void unregisterSchemeForCustomProtocol(const String&);
static HashSet<String>& globalURLSchemesWithCustomProtocolHandlers();
static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
-#endif
#if PLATFORM(COCOA)
void updateProcessSuppressionState() const;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -92,9 +92,7 @@
: m_responsivenessTimer(this)
, m_context(context)
, m_mayHaveUniversalFileReadSandboxExtension(false)
-#if ENABLE(CUSTOM_PROTOCOLS)
, m_customProtocolManagerProxy(this, context)
-#endif
#if PLATFORM(COCOA)
, m_processSuppressionEnabled(false)
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -28,6 +28,7 @@
#include "APISession.h"
#include "ChildProcessProxy.h"
+#include "CustomProtocolManagerProxy.h"
#include "MessageReceiverMap.h"
#include "PlatformProcessIdentifier.h"
#include "PluginInfoStore.h"
@@ -43,10 +44,6 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerProxy.h"
-#endif
-
#if PLATFORM(IOS)
#include "ProcessThrottler.h"
#endif
@@ -224,10 +221,7 @@
HashSet<WebUserContentControllerProxy*> m_webUserContentControllerProxies;
std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
-
-#if ENABLE(CUSTOM_PROTOCOLS)
CustomProtocolManagerProxy m_customProtocolManagerProxy;
-#endif
#if PLATFORM(COCOA)
HashSet<uint64_t> m_processSuppressiblePages;
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (174802 => 174803)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-10-17 01:14:24 UTC (rev 174803)
@@ -208,10 +208,8 @@
#if ENABLE(NETWORK_PROCESS)
if (!m_usesNetworkProcess) {
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-#endif
#if ENABLE(NETWORK_PROCESS)
}
#endif
@@ -245,10 +243,8 @@
parameters.parentProcessName = [[NSProcessInfo processInfo] processName];
parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
-#if ENABLE(CUSTOM_PROTOCOLS)
for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-#endif
parameters.httpProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPProxyDefaultsKey];
parameters.httpsProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPSProxyDefaultsKey];
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (174802 => 174803)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -42,8 +42,6 @@
#define ENABLE_MEMORY_SAMPLER 1
-#define ENABLE_CUSTOM_PROTOCOLS 1
-
#define ENABLE_SHAREABLE_RESOURCE 1
#include <CoreFoundation/CoreFoundation.h>
@@ -80,7 +78,6 @@
#if PLATFORM(GTK)
#define ENABLE_NETWORK_PROCESS 1
-#define ENABLE_CUSTOM_PROTOCOLS 1
#endif
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (174802 => 174803)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -28,6 +28,7 @@
#include "APIFrameHandle.h"
#include "AuthenticationManager.h"
+#include "CustomProtocolManager.h"
#include "DrawingArea.h"
#include "EventDispatcher.h"
#include "InjectedBundle.h"
@@ -100,10 +101,6 @@
#include "SecItemShim.h"
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManager.h"
-#endif
-
#if ENABLE(DATABASE_PROCESS)
#include "WebToDatabaseProcessConnection.h"
#endif
@@ -194,9 +191,7 @@
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
addSupplement<WebNotificationManager>();
#endif
-#if ENABLE(CUSTOM_PROTOCOLS)
addSupplement<CustomProtocolManager>();
-#endif
#if ENABLE(BATTERY_STATUS)
addSupplement<WebBatteryManager>();
#endif
Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp (174802 => 174803)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp 2014-10-17 01:14:24 UTC (rev 174803)
@@ -46,23 +46,17 @@
static void webkitSoupRequestGenericSendAsync(SoupRequest* request, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer userData)
{
-#if ENABLE(CUSTOM_PROTOCOLS)
CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
ASSERT(customProtocolManager);
customProtocolManager->send(g_task_new(request, cancellable, callback, userData));
-#endif
}
static GInputStream* webkitSoupRequestGenericSendFinish(SoupRequest* request, GAsyncResult* result, GError** error)
{
g_return_val_if_fail(g_task_is_valid(result, request), 0);
-#if ENABLE(CUSTOM_PROTOCOLS)
CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
ASSERT(customProtocolManager);
return customProtocolManager->finish(G_TASK(result), error);
-#else
- return nullptr;
-#endif
}
static goffset webkitSoupRequestGenericGetContentLength(SoupRequest* request)
Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h (174802 => 174803)
--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h 2014-10-17 01:14:24 UTC (rev 174803)
@@ -20,13 +20,10 @@
#ifndef WebKitSoupRequestGeneric_h
#define WebKitSoupRequestGeneric_h
+#include "CustomProtocolManagerImpl.h"
#include <glib-object.h>
#include <libsoup/soup.h>
-#if ENABLE(CUSTOM_PROTOCOLS)
-#include "CustomProtocolManagerImpl.h"
-#endif
-
G_BEGIN_DECLS
#define WEBKIT_TYPE_SOUP_REQUEST_GENERIC (webkit_soup_request_generic_get_type())
@@ -49,9 +46,7 @@
struct _WebKitSoupRequestGenericClass {
SoupRequestClass parent;
-#if ENABLE(CUSTOM_PROTOCOLS)
WebKit::CustomProtocolManagerImpl* customProtocolManager;
-#endif
};
GType webkit_soup_request_generic_get_type();
Modified: trunk/Source/cmake/OptionsEfl.cmake (174802 => 174803)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-10-17 01:12:51 UTC (rev 174802)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-10-17 01:14:24 UTC (rev 174803)
@@ -308,7 +308,5 @@
set(HAVE_LLVM ON)
endif ()
-add_definitions(-DENABLE_CUSTOM_PROTOCOLS=1)
-
# [E]WebKit2 tests need a hint to find out where processes such as WebProcess are located at.
add_definitions(-DWEBKIT_EXEC_PATH=\"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\")
