Changeset 174803 in webkit


Ignore:
Timestamp:
Oct 16, 2014 6:14:24 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Removing CUSTOM_PROTOCOLS guard
​https://bugs.webkit.org/show_bug.cgi?id=137741

Patch by Pascal Jacquemart <​p.jacquemart@samsung.com> on 2014-10-16
Reviewed by Benjamin Poulain.

.:

  • Source/cmake/OptionsEfl.cmake:

Source/WebKit2:

  • 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:
Location:
trunk
Files:
35 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r174633 r174803  
     12014-10-16  Pascal Jacquemart  <p.jacquemart@samsung.com>
     2
     3        Removing CUSTOM_PROTOCOLS guard
     4        https://bugs.webkit.org/show_bug.cgi?id=137741
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * Source/cmake/OptionsEfl.cmake:
     9
    1102014-10-11  KwangHyuk Kim  <hyuki.kim@samsung.com>
    211

  • trunk/Source/WebKit2/ChangeLog

    r174799 r174803  
     12014-10-16  Pascal Jacquemart  <p.jacquemart@samsung.com>
     2
     3        Removing CUSTOM_PROTOCOLS guard
     4        https://bugs.webkit.org/show_bug.cgi?id=137741
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        * NetworkProcess/NetworkProcess.cpp:
     9        (WebKit::NetworkProcess::NetworkProcess):
     10        * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
     11        * Shared/Network/CustomProtocols/CustomProtocolManager.h:
     12        * Shared/Network/CustomProtocols/CustomProtocolManager.messages.in:
     13        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp:
     14        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
     15        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
     16        * Shared/Network/NetworkProcessCreationParameters.cpp:
     17        (WebKit::NetworkProcessCreationParameters::encode):
     18        (WebKit::NetworkProcessCreationParameters::decode):
     19        * Shared/Network/NetworkProcessCreationParameters.h:
     20        * Shared/WebProcessCreationParameters.cpp:
     21        (WebKit::WebProcessCreationParameters::encode):
     22        (WebKit::WebProcessCreationParameters::decode):
     23        * Shared/WebProcessCreationParameters.h:
     24        * UIProcess/API/C/soup/WKAPICastSoup.h:
     25        * UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp:
     26        (WKSoupCustomProtocolRequestManagerGetTypeID):
     27        (WKSoupCustomProtocolRequestManagerSetClient):
     28        * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h:
     29        * UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in:
     30        * UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm:
     31        * UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
     32        * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp:
     33        * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h:
     34        * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
     35        * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h:
     36        * UIProcess/Network/NetworkProcessProxy.cpp:
     37        (WebKit::NetworkProcessProxy::NetworkProcessProxy):
     38        * UIProcess/Network/NetworkProcessProxy.h:
     39        * UIProcess/WebContext.cpp:
     40        (WebKit::WebContext::WebContext):
     41        (WebKit::WebContext::unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers):
     42        (WebKit::WebContext::unregisterSchemeForCustomProtocol):
     43        * UIProcess/WebContext.h:
     44        * UIProcess/WebProcessProxy.cpp:
     45        (WebKit::WebProcessProxy::WebProcessProxy):
     46        * UIProcess/WebProcessProxy.h:
     47        * UIProcess/mac/WebContextMac.mm:
     48        (WebKit::WebContext::platformInitializeWebProcess):
     49        (WebKit::WebContext::platformInitializeNetworkProcess):
     50        * WebKit2Prefix.h:
     51        * WebProcess/WebProcess.cpp:
     52        (WebKit::WebProcess::WebProcess):
     53        * WebProcess/soup/WebKitSoupRequestGeneric.cpp:
     54        (webkitSoupRequestGenericSendAsync):
     55        (webkitSoupRequestGenericSendFinish):
     56        * WebProcess/soup/WebKitSoupRequestGeneric.h:
     57
    1582014-10-16  Simon Fraser  <simon.fraser@apple.com>
    259

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp

    r174369 r174803  
    7777    addSupplement<AuthenticationManager>();
    7878    addSupplement<WebCookieManager>();
    79 #if ENABLE(CUSTOM_PROTOCOLS)
    8079    addSupplement<CustomProtocolManager>();
    81 #endif
    8280}
    8381

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm

    r163886 r174803  
    2727#import "CustomProtocolManager.h"
    2828
    29 #if ENABLE(CUSTOM_PROTOCOLS)
    30 
    3129#import "ChildProcess.h"
    3230#import "CustomProtocolManagerMessages.h"
    … …  
    275273
    276274} // namespace WebKit
    277 
    278 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h

    r167854 r174803  
    2626#ifndef CustomProtocolManager_h
    2727#define CustomProtocolManager_h
    28 
    29 #if ENABLE(CUSTOM_PROTOCOLS)
    3028
    3129#include "Connection.h"
    … …  
    120118} // namespace WebKit
    121119
    122 #endif // ENABLE(CUSTOM_PROTOCOLS)
    123 
    124120#endif // CustomProtocolManager_h

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.messages.in

    r161148 r174803  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    24 
    2523messages -> CustomProtocolManager {
    2624    DidFailWithError(uint64_t customProtocolID, WebCore::ResourceError error)
    … …  
    3230    UnregisterScheme(String name)
    3331}
    34 
    35 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.cpp

    r162920 r174803  
    2121#include "CustomProtocolManagerImpl.h"
    2222
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    24 
    2523#include "ChildProcess.h"
    2624#include "CustomProtocolManagerProxyMessages.h"
    … …  
    204202
    205203} // namespace WebKit
    206 
    207 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h

    r162449 r174803  
    2020#ifndef CustomProtocolManagerImpl_h
    2121#define CustomProtocolManagerImpl_h
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include <wtf/HashMap.h>
    … …  
    7068} // namespace WebKit
    7169
    72 #endif // ENABLE(CUSTOM_PROTOCOLS)
    73 
    7470#endif // CustomProtocolManagerImpl_h

  • trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp

    r162449 r174803  
    2020#include "config.h"
    2121#include "CustomProtocolManager.h"
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include "ChildProcess.h"
    … …  
    110108
    111109} // namespace WebKit
    112 
    113 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

    r174369 r174803  
    5151#endif
    5252    encoder << shouldUseTestingNetworkSession;
    53 #if ENABLE(CUSTOM_PROTOCOLS)
    5453    encoder << urlSchemesRegisteredForCustomProtocols;
    55 #endif
    5654#if PLATFORM(COCOA)
    5755    encoder << parentProcessName;
    … …  
    9593    if (!decoder.decode(result.shouldUseTestingNetworkSession))
    9694        return false;
    97 #if ENABLE(CUSTOM_PROTOCOLS)
    9895    if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
    9996        return false;
    100 #endif
    10197#if PLATFORM(COCOA)
    10298    if (!decoder.decode(result.parentProcessName))

  • trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

    r174369 r174803  
    7070    bool shouldUseTestingNetworkSession;
    7171
    72 #if ENABLE(CUSTOM_PROTOCOLS)
    7372    Vector<String> urlSchemesRegisteredForCustomProtocols;
    74 #endif
    7573
    7674#if PLATFORM(COCOA)

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r174584 r174803  
    8585    encoder << urlSchemesRegisteredAsCachePartitioned;
    8686#endif
    87 #if ENABLE(CUSTOM_PROTOCOLS)
    8887    encoder << urlSchemesRegisteredForCustomProtocols;
    89 #endif
    9088#if USE(SOUP)
    9189    encoder << cookiePersistentStoragePath;
    … …  
    193191        return false;
    194192#endif
    195 #if ENABLE(CUSTOM_PROTOCOLS)
    196193    if (!decoder.decode(parameters.urlSchemesRegisteredForCustomProtocols))
    197194        return false;
    198 #endif
    199195#if USE(SOUP)
    200196    if (!decoder.decode(parameters.cookiePersistentStoragePath))

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r174584 r174803  
    9292    Vector<String> urlSchemesRegisteredAsCachePartitioned;
    9393#endif
    94 #if ENABLE(CUSTOM_PROTOCOLS)
    9594    Vector<String> urlSchemesRegisteredForCustomProtocols;
    96 #endif
    9795#if USE(SOUP)
    9896    String cookiePersistentStoragePath;

  • trunk/Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h

    r174584 r174803  
    3636class WebSoupRequestManagerProxy;
    3737
    38 #if ENABLE(CUSTOM_PROTOCOLS)
    3938WK_ADD_API_MAPPING(WKSoupCustomProtocolRequestManagerRef, WebSoupCustomProtocolRequestManager)
    40 #endif
    4139
    4240}

  • trunk/Source/WebKit2/UIProcess/API/C/soup/WKSoupCustomProtocolRequestManager.cpp

    r162449 r174803  
    3434WKTypeID WKSoupCustomProtocolRequestManagerGetTypeID()
    3535{
    36 #if ENABLE(CUSTOM_PROTOCOLS)
    3736    return toAPI(WebSoupCustomProtocolRequestManager::APIType);
    38 #else
    39     return 0;
    40 #endif
    4137}
    4238
    4339void WKSoupCustomProtocolRequestManagerSetClient(WKSoupCustomProtocolRequestManagerRef soupRequestManagerRef, const WKSoupCustomProtocolRequestManagerClientBase* wkClient)
    4440{
    45 #if ENABLE(CUSTOM_PROTOCOLS)
    4641    toImpl(soupRequestManagerRef)->initializeClient(wkClient);
    47 #else
    48     UNUSED_PARAM(soupRequestManagerRef);
    49     UNUSED_PARAM(wkClient);
    50 #endif
    5142}

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h

    r164172 r174803  
    2626#ifndef CustomProtocolManagerProxy_h
    2727#define CustomProtocolManagerProxy_h
    28 
    29 #if ENABLE(CUSTOM_PROTOCOLS)
    3028
    3129#include "MessageReceiver.h"
    … …  
    6866} // namespace WebKit
    6967
    70 #endif // ENABLE(CUSTOM_PROTOCOLS)
    71 
    7268#endif // CustomProtocolManagerProxy_h

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in

    r141710 r174803  
    2121# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2222
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    24 
    2523messages -> CustomProtocolManagerProxy {
    2624    StartLoading(uint64_t customProtocolID, WebCore::ResourceRequest request)
    2725    StopLoading(uint64_t customProtocolID)
    2826}
    29 
    30 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/mac/CustomProtocolManagerProxyMac.mm

    r162449 r174803  
    2626#import "config.h"
    2727#import "CustomProtocolManagerProxy.h"
    28 
    29 #if ENABLE(CUSTOM_PROTOCOLS)
    3028
    3129#import "ChildProcessProxy.h"
    … …  
    150148
    151149} // namespace WebKit
    152 
    153 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp

    r162449 r174803  
    2020#include "config.h"
    2121#include "CustomProtocolManagerProxy.h"
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include "ChildProcessProxy.h"
    … …  
    5149
    5250} // namespace WebKit
    53 
    54 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.cpp

    r174419 r174803  
    2020#include "config.h"
    2121#include "WebSoupCustomProtocolRequestManager.h"
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include "APIData.h"
    … …  
    147145
    148146} // namespace WebKit
    149 
    150 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManager.h

    r162514 r174803  
    2020#ifndef WebSoupCustomProtocolRequestManager_h
    2121#define WebSoupCustomProtocolRequestManager_h
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include "APIObject.h"
    … …  
    8482} // namespace WebKit
    8583
    86 #endif // ENABLE(CUSTOM_PROTOCOLS)
    87 
    8884#endif // WebSoupCustomProtocolRequestManager_h

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp

    r162449 r174803  
    2121#include "WebSoupCustomProtocolRequestManagerClient.h"
    2222
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    24 
    2523namespace WebKit {
    2624
    … …  
    4240
    4341} // namespace WebKit
    44 
    45 #endif // ENABLE(CUSTOM_PROTOCOLS)

  • trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.h

    r162449 r174803  
    2020#ifndef WebSoupCustomProtocolRequestManagerClient_h
    2121#define WebSoupCustomProtocolRequestManagerClient_h
    22 
    23 #if ENABLE(CUSTOM_PROTOCOLS)
    2422
    2523#include "APIClient.h"
    … …  
    5048} // namespace WebKit
    5149
    52 #endif // ENABLE(CUSTOM_PROTOCOLS)
    53 
    5450#endif // WebSoupCustomProtocolRequestManagerClient_h

  • trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

    r174230 r174803  
    5656    : m_webContext(webContext)
    5757    , m_numPendingConnectionRequests(0)
    58 #if ENABLE(CUSTOM_PROTOCOLS)
    5958    , m_customProtocolManagerProxy(this, webContext)
    60 #endif
    6159{
    6260    connect();

  • trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h

    r174230 r174803  
    3030
    3131#include "ChildProcessProxy.h"
     32#include "CustomProtocolManagerProxy.h"
    3233#include "ProcessLauncher.h"
    3334#include "WebProcessProxyMessages.h"
    3435#include <memory>
    3536#include <wtf/Deque.h>
    36 
    37 #if ENABLE(CUSTOM_PROTOCOLS)
    38 #include "CustomProtocolManagerProxy.h"
    39 #endif
    4037
    4138#if PLATFORM(IOS)
    … …  
    9996
    10097    std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
    101 
    102 #if ENABLE(CUSTOM_PROTOCOLS)
    10398    CustomProtocolManagerProxy m_customProtocolManagerProxy;
    104 #endif
    10599   
    106100#if PLATFORM(IOS)

  • trunk/Source/WebKit2/UIProcess/WebContext.cpp

    r174584 r174803  
    3030#include "APIDownloadClient.h"
    3131#include "APIHistoryClient.h"
     32#include "CustomProtocolManagerMessages.h"
    3233#include "DownloadProxy.h"
    3334#include "DownloadProxyMessages.h"
    … …  
    9293#endif
    9394
    94 #if ENABLE(CUSTOM_PROTOCOLS)
    95 #include "CustomProtocolManagerMessages.h"
    96 #endif
    97 
    9895#if ENABLE(REMOTE_INSPECTOR)
    9996#include <JavaScriptCore/RemoteInspector.h>
    10097#endif
    10198
    102 #if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
     99#if USE(SOUP)
    103100#include "WebSoupCustomProtocolRequestManager.h"
    104101#endif
    … …  
    206203    addSupplement<WebDatabaseManagerProxy>();
    207204#endif
    208 #if USE(SOUP) && ENABLE(CUSTOM_PROTOCOLS)
     205#if USE(SOUP)
    209206    addSupplement<WebSoupCustomProtocolRequestManager>();
    210207#endif
    … …  
    10121009}
    10131010
    1014 #if ENABLE(CUSTOM_PROTOCOLS)
    10151011HashSet<String>& WebContext::globalURLSchemesWithCustomProtocolHandlers()
    10161012{
    … …  
    10401036        context->unregisterSchemeForCustomProtocol(schemeLower);
    10411037}
    1042 #endif
    10431038
    10441039#if ENABLE(CACHE_PARTITIONING)
    … …  
    13981393}
    13991394
    1400 #if ENABLE(CUSTOM_PROTOCOLS)
    14011395void WebContext::registerSchemeForCustomProtocol(const String& scheme)
    14021396{
    … …  
    14081402    sendToNetworkingProcess(Messages::CustomProtocolManager::UnregisterScheme(scheme));
    14091403}
    1410 #endif
    14111404
    14121405#if ENABLE(NETSCAPE_PLUGIN_API)

  • trunk/Source/WebKit2/UIProcess/WebContext.h

    r174369 r174803  
    336336    void resetHSTSHosts();
    337337
    338 #if ENABLE(CUSTOM_PROTOCOLS)
    339338    void registerSchemeForCustomProtocol(const String&);
    340339    void unregisterSchemeForCustomProtocol(const String&);
    … …  
    343342    static void registerGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
    344343    static void unregisterGlobalURLSchemeAsHavingCustomProtocolHandlers(const String&);
    345 #endif
    346344
    347345#if PLATFORM(COCOA)

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r174230 r174803  
    9393    , m_context(context)
    9494    , m_mayHaveUniversalFileReadSandboxExtension(false)
    95 #if ENABLE(CUSTOM_PROTOCOLS)
    9695    , m_customProtocolManagerProxy(this, context)
    97 #endif
    9896#if PLATFORM(COCOA)
    9997    , m_processSuppressionEnabled(false)

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r174230 r174803  
    2929#include "APISession.h"
    3030#include "ChildProcessProxy.h"
     31#include "CustomProtocolManagerProxy.h"
    3132#include "MessageReceiverMap.h"
    3233#include "PlatformProcessIdentifier.h"
    … …  
    4445#include <wtf/RefCounted.h>
    4546
    46 #if ENABLE(CUSTOM_PROTOCOLS)
    47 #include "CustomProtocolManagerProxy.h"
    48 #endif
    49 
    5047#if PLATFORM(IOS)
    5148#include "ProcessThrottler.h"
    … …  
    225222
    226223    std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
    227 
    228 #if ENABLE(CUSTOM_PROTOCOLS)
    229224    CustomProtocolManagerProxy m_customProtocolManagerProxy;
    230 #endif
    231225
    232226#if PLATFORM(COCOA)

  • trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

    r172500 r174803  
    209209    if (!m_usesNetworkProcess) {
    210210#endif
    211 #if ENABLE(CUSTOM_PROTOCOLS)
    212211        for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
    213212            parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
    214 #endif
    215213#if ENABLE(NETWORK_PROCESS)
    216214    }
    … …  
    246244    parameters.uiProcessBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
    247245
    248 #if ENABLE(CUSTOM_PROTOCOLS)
    249246    for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
    250247        parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
    251 #endif
    252248
    253249    parameters.httpProxy = [[NSUserDefaults standardUserDefaults] stringForKey:WebKit2HTTPProxyDefaultsKey];

  • trunk/Source/WebKit2/WebKit2Prefix.h

    r169622 r174803  
    4343#define ENABLE_MEMORY_SAMPLER 1
    4444
    45 #define ENABLE_CUSTOM_PROTOCOLS 1
    46 
    4745#define ENABLE_SHAREABLE_RESOURCE 1
    4846
    … …  
    8179#if PLATFORM(GTK)
    8280#define ENABLE_NETWORK_PROCESS 1
    83 #define ENABLE_CUSTOM_PROTOCOLS 1
    8481#endif
    8582

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r174584 r174803  
    2929#include "APIFrameHandle.h"
    3030#include "AuthenticationManager.h"
     31#include "CustomProtocolManager.h"
    3132#include "DrawingArea.h"
    3233#include "EventDispatcher.h"
    … …  
    101102#endif
    102103
    103 #if ENABLE(CUSTOM_PROTOCOLS)
    104 #include "CustomProtocolManager.h"
    105 #endif
    106 
    107104#if ENABLE(DATABASE_PROCESS)
    108105#include "WebToDatabaseProcessConnection.h"
    … …  
    195192    addSupplement<WebNotificationManager>();
    196193#endif
    197 #if ENABLE(CUSTOM_PROTOCOLS)
    198194    addSupplement<CustomProtocolManager>();
    199 #endif
    200195#if ENABLE(BATTERY_STATUS)
    201196    addSupplement<WebBatteryManager>();

  • trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp

    r174584 r174803  
    4747static void webkitSoupRequestGenericSendAsync(SoupRequest* request, GCancellable* cancellable, GAsyncReadyCallback callback, gpointer userData)
    4848{
    49 #if ENABLE(CUSTOM_PROTOCOLS)
    5049    CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
    5150    ASSERT(customProtocolManager);
    5251    customProtocolManager->send(g_task_new(request, cancellable, callback, userData));
    53 #endif
    5452}
    5553
    … …  
    5755{
    5856    g_return_val_if_fail(g_task_is_valid(result, request), 0);
    59 #if ENABLE(CUSTOM_PROTOCOLS)
    6057    CustomProtocolManagerImpl* customProtocolManager = WEBKIT_SOUP_REQUEST_GENERIC_GET_CLASS(request)->customProtocolManager;
    6158    ASSERT(customProtocolManager);
    6259    return customProtocolManager->finish(G_TASK(result), error);
    63 #else
    64     return nullptr;
    65 #endif
    6660}
    6761

  • trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h

    r162449 r174803  
    2121#define WebKitSoupRequestGeneric_h
    2222
     23#include "CustomProtocolManagerImpl.h"
    2324#include <glib-object.h>
    2425#include <libsoup/soup.h>
    25 
    26 #if ENABLE(CUSTOM_PROTOCOLS)
    27 #include "CustomProtocolManagerImpl.h"
    28 #endif
    2926
    3027G_BEGIN_DECLS
    … …  
    5047    SoupRequestClass parent;
    5148
    52 #if ENABLE(CUSTOM_PROTOCOLS)
    5349    WebKit::CustomProtocolManagerImpl* customProtocolManager;
    54 #endif
    5550};
    5651

  • trunk/Source/cmake/OptionsEfl.cmake

    r174633 r174803  
    309309endif ()
    310310
    311 add_definitions(-DENABLE_CUSTOM_PROTOCOLS=1)
    312 
    313311# [E]WebKit2 tests need a hint to find out where processes such as WebProcess are located at.
    314312add_definitions(-DWEBKIT_EXEC_PATH=\"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\")
Note: See TracChangeset for help on using the changeset viewer.