Changeset 115411 in webkit


Ignore:
Timestamp:
Apr 27, 2012 12:13:40 AM (12 years ago)
Author:
Carlos Garcia Campos
Message:

[SOUP] Add a way to register custom uri schemes in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=84130

Reviewed by Martin Robinson.

.:

  • GNUmakefile.am: Add BUILDING_SOUP macro to compilation.

Source/WebKit2:

  • GNUmakefile.am: Add new files to compilation.
  • Platform/CoreIPC/MessageID.h: Add

MessageClassWebSoupRequestManager and
MessageClassWebSoupRequestManagerProxy message types to identify
WebSoupRequestManager messages.

  • Shared/API/c/WKBase.h: Include WKBaseSoup.h when building with

soup network backend.

  • Shared/API/c/soup/WKBaseSoup.h: Added.
  • Shared/APIObject.h: Add SoupRequestManager type when using soup.
  • UIProcess/API/C/WKAPICast.h: Include WKAPICastSoup.h when

building with soup network backend.

  • UIProcess/API/C/soup/WKAPICastSoup.h: Added.

(WebKit): Map WKSoupRequestManagerRef to
WebSoupRequestManagerProxy.

  • UIProcess/API/C/soup/WKContextSoup.cpp: Added.

(WKContextGetSoupRequestManager): Return WKSoupRequestManagerRef
associated to the context.

  • UIProcess/API/C/soup/WKContextSoup.h: Added.
  • UIProcess/API/C/soup/WKSoupRequestManager.cpp: Added.

(WKSoupRequestManagerGetTypeID): Return the
WebSoupRequestManagerProxy API type.
(WKSoupRequestManagerSetClient): Set the WKSoupRequestManagerClient.
(WKSoupRequestManagerRegisterURIScheme): Call
WebSoupRequestManagerProxy::registerURIScheme().
(WKSoupRequestManagerHandleURIRequest): Call
WebSoupRequestManagerProxy::handleURIRequest().

  • UIProcess/API/C/soup/WKSoupRequestManager.h: Added.
  • UIProcess/WebContext.cpp:

(WebKit::WebContext::WebContext): Initialize
m_soupRequestManagerProxy when using soup.
(WebKit::WebContext::~WebContext): Invalidate and clear the
m_soupRequestManagerProxy when using soup.
(WebKit::WebContext::disconnectProcess): Invalidate the
m_soupRequestManagerProxy when using soup.
(WebKit::WebContext::didReceiveMessage): Forward the message to
m_soupRequestManagerProxy if it's a
MessageClassWebSoupRequestManagerProxy message.

  • UIProcess/WebContext.h:

(WebKit::WebContext::soupRequestManagerProxy): Return
m_soupRequestManagerProxy.

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didReceiveMessage): Forward message to
the web context if it's a MessageClassWebSoupRequestManagerProxy
message.

  • UIProcess/soup/WebSoupRequestManagerClient.cpp: Added.

(WebKit::WebSoupRequestManagerClient::didReceiveURIRequest): Call
didReceiveURIRequest callback if it has an implementation.

  • UIProcess/soup/WebSoupRequestManagerClient.h: Added.
  • UIProcess/soup/WebSoupRequestManagerProxy.cpp: Added.

(WebKit::WebSoupRequestManagerProxy::create): Create a new
WebSoupRequestManagerProxy.
(WebKit::WebSoupRequestManagerProxy::WebSoupRequestManagerProxy):
(WebKit::WebSoupRequestManagerProxy::~WebSoupRequestManagerProxy):
(WebKit::WebSoupRequestManagerProxy::invalidate):
(WebKit::WebSoupRequestManagerProxy::initializeClient):
(WebKit::WebSoupRequestManagerProxy::didReceiveMessage):
(WebKit::WebSoupRequestManagerProxy::registerURIScheme): Send
RegisterURIScheme message to the WebProcess to register the given
URI scheme.
(WebKit::WebSoupRequestManagerProxy::handleURIRequest): Send
HandleURIRequest message to the WebProcess with the given data and
data type.
(WebKit::WebSoupRequestManagerProxy::didReceiveURIRequest): Call
didReceiveURIRequest callback to allow the user to handle the
request.

  • UIProcess/soup/WebSoupRequestManagerProxy.h: Added.
  • UIProcess/soup/WebSoupRequestManagerProxy.messages.in: Added.
  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Initialize m_soupRequestManager
when using soup.
(WebKit::WebProcess::didReceiveMessage): Forward the message to
m_soupRequestManager if it's a MessageClassWebSoupRequestManager
message.

  • WebProcess/WebProcess.h:

(WebKit::WebProcess::soupRequestManager): Return m_soupRequestManager.

  • WebProcess/soup/WebKitSoupRequestGeneric.cpp: Added.

(webkitSoupRequestGenericFinalize):
(webkit_soup_request_generic_init):
(webkitSoupRequestGenericSendAsync): Create a GSimpleAsyncResult
to handle the request and pass it to the WebSoupRequestManager.
(webkitSoupRequestGenericSendFinish): Finish the async operation
started by webkitSoupRequestGenericSendAsync() and return the
contents of the request as returned by WebSoupRequestManager.
(webkitSoupRequestGenericGetContentLength): Get the request
contents length.
(webkitSoupRequestGenericGetContentType): Get the request mime
type.
(webkit_soup_request_generic_class_init):
(webkitSoupRequestGenericSetContentLength): Set the request
contents length.
(webkitSoupRequestGenericSetContentType): Set the request mime
type.

  • WebProcess/soup/WebKitSoupRequestGeneric.h: Added.
  • WebProcess/soup/WebSoupRequestManager.cpp: Added.

(WebKit::generateSoupRequestID): Helper function to generate a
unique request identifier.
(WebKit::WebSoupRequestManager::WebSoupRequestManager):
(WebKit::WebSoupRequestManager::~WebSoupRequestManager):
(WebKit::WebSoupRequestManager::didReceiveMessage):
(WebKit::WebSoupRequestManager::registerURIScheme): Add the scheme
to the schemes array and add a new WebKitSoupRequestGeneric
feature with the new scheme list to the SoupRequester feature.
(WebKit::WebSoupRequestManager::handleURIRequest): Complete the
async operation by creating a GInputStream with the request data,
or setting an error in case of failure.
(WebKit::WebSoupRequestManager::send): Send DidReceiveURIRequest
message to the UI process.
(WebKit::WebSoupRequestManager::finish): Return the GInputStream
containing the request data.

  • WebProcess/soup/WebSoupRequestManager.h: Added.
  • WebProcess/soup/WebSoupRequestManager.messages.in: Added.

Source/WTF:

Add GPtrArray template to be able to use GRefPtr with GPtrArrays.

  • wtf/gobject/GRefPtr.cpp:

(WTF::refGPtr):
(WTF):
(WTF::derefGPtr):

  • wtf/gobject/GRefPtr.h:

(WTF):

  • wtf/gobject/GTypedefs.h:

Tools:

  • Scripts/webkitpy/style/checkers/cpp.py:

(check_identifier_name_in_declaration): Add webkit_soup prefix to
the list of exceptions to the underscores in identifiers rule.

Location:
trunk
Files:
20 added
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r115348 r115411  
     12012-04-26  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Add a way to register custom uri schemes in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=84130
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Add BUILDING_SOUP__ macro to compilation.
     9
    1102012-04-26  Antonio Gomes  <agomes@rim.com>
    211

  • trunk/GNUmakefile.am

    r115075 r115411  
    147147        -DBUILDING_CAIRO__=1 \
    148148        -DBUILDING_GTK__=1 \
     149        -DBUILDING_SOUP__=1 \
    149150        -DWTF_CHANGES
    150151

  • trunk/Source/WTF/ChangeLog

    r115406 r115411  
     12012-04-26  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Add a way to register custom uri schemes in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=84130
     5
     6        Reviewed by Martin Robinson.
     7
     8        Add GPtrArray template to be able to use GRefPtr with GPtrArrays.
     9
     10        * wtf/gobject/GRefPtr.cpp:
     11        (WTF::refGPtr):
     12        (WTF):
     13        (WTF::derefGPtr):
     14        * wtf/gobject/GRefPtr.h:
     15        (WTF):
     16        * wtf/gobject/GTypedefs.h:
     17
    1182012-04-26  Nico Weber  <thakis@chromium.org>
    219

  • trunk/Source/WTF/wtf/gobject/GRefPtr.cpp

    r111778 r115411  
    108108}
    109109
     110template <> GPtrArray* refGPtr(GPtrArray* ptr)
     111{
     112    if (ptr)
     113        g_ptr_array_ref(ptr);
     114    return ptr;
     115}
     116
     117template <> void derefGPtr(GPtrArray* ptr)
     118{
     119    if (ptr)
     120        g_ptr_array_unref(ptr);
     121}
     122
    110123} // namespace WTF
    111124

  • trunk/Source/WTF/wtf/gobject/GRefPtr.h

    r111778 r115411  
    209209template <> GSource* refGPtr(GSource* ptr);
    210210template <> void derefGPtr(GSource* ptr);
     211template <> GPtrArray* refGPtr(GPtrArray*);
     212template <> void derefGPtr(GPtrArray*);
    211213
    212214template <typename T> inline T* refGPtr(T* ptr)

  • trunk/Source/WTF/wtf/gobject/GTypedefs.h

    r111778 r115411  
    6464typedef struct _GTimer GTimer;
    6565typedef struct _GKeyFile GKeyFile;
     66typedef struct _GPtrArray GPtrArray;
    6667
    6768#if USE(CAIRO)

  • trunk/Source/WebKit2/ChangeLog

    r115402 r115411  
     12012-04-26  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Add a way to register custom uri schemes in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=84130
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Add new files to compilation.
     9        * Platform/CoreIPC/MessageID.h: Add
     10        MessageClassWebSoupRequestManager and
     11        MessageClassWebSoupRequestManagerProxy message types to identify
     12        WebSoupRequestManager messages.
     13        * Shared/API/c/WKBase.h: Include WKBaseSoup.h when building with
     14        soup network backend.
     15        * Shared/API/c/soup/WKBaseSoup.h: Added.
     16        * Shared/APIObject.h: Add SoupRequestManager type when using soup.
     17        * UIProcess/API/C/WKAPICast.h: Include WKAPICastSoup.h when
     18        building with soup network backend.
     19        * UIProcess/API/C/soup/WKAPICastSoup.h: Added.
     20        (WebKit): Map WKSoupRequestManagerRef to
     21        WebSoupRequestManagerProxy.
     22        * UIProcess/API/C/soup/WKContextSoup.cpp: Added.
     23        (WKContextGetSoupRequestManager): Return WKSoupRequestManagerRef
     24        associated to the context.
     25        * UIProcess/API/C/soup/WKContextSoup.h: Added.
     26        * UIProcess/API/C/soup/WKSoupRequestManager.cpp: Added.
     27        (WKSoupRequestManagerGetTypeID): Return the
     28        WebSoupRequestManagerProxy API type.
     29        (WKSoupRequestManagerSetClient): Set the WKSoupRequestManagerClient.
     30        (WKSoupRequestManagerRegisterURIScheme): Call
     31        WebSoupRequestManagerProxy::registerURIScheme().
     32        (WKSoupRequestManagerHandleURIRequest): Call
     33        WebSoupRequestManagerProxy::handleURIRequest().
     34        * UIProcess/API/C/soup/WKSoupRequestManager.h: Added.
     35        * UIProcess/WebContext.cpp:
     36        (WebKit::WebContext::WebContext): Initialize
     37        m_soupRequestManagerProxy when using soup.
     38        (WebKit::WebContext::~WebContext): Invalidate and clear the
     39        m_soupRequestManagerProxy when using soup.
     40        (WebKit::WebContext::disconnectProcess): Invalidate the
     41        m_soupRequestManagerProxy when using soup.
     42        (WebKit::WebContext::didReceiveMessage): Forward the message to
     43        m_soupRequestManagerProxy if it's a
     44        MessageClassWebSoupRequestManagerProxy message.
     45        * UIProcess/WebContext.h:
     46        (WebKit::WebContext::soupRequestManagerProxy): Return
     47        m_soupRequestManagerProxy.
     48        * UIProcess/WebProcessProxy.cpp:
     49        (WebKit::WebProcessProxy::didReceiveMessage): Forward message to
     50        the web context if it's a MessageClassWebSoupRequestManagerProxy
     51        message.
     52        * UIProcess/soup/WebSoupRequestManagerClient.cpp: Added.
     53        (WebKit::WebSoupRequestManagerClient::didReceiveURIRequest): Call
     54        didReceiveURIRequest callback if it has an implementation.
     55        * UIProcess/soup/WebSoupRequestManagerClient.h: Added.
     56        * UIProcess/soup/WebSoupRequestManagerProxy.cpp: Added.
     57        (WebKit::WebSoupRequestManagerProxy::create): Create a new
     58        WebSoupRequestManagerProxy.
     59        (WebKit::WebSoupRequestManagerProxy::WebSoupRequestManagerProxy):
     60        (WebKit::WebSoupRequestManagerProxy::~WebSoupRequestManagerProxy):
     61        (WebKit::WebSoupRequestManagerProxy::invalidate):
     62        (WebKit::WebSoupRequestManagerProxy::initializeClient):
     63        (WebKit::WebSoupRequestManagerProxy::didReceiveMessage):
     64        (WebKit::WebSoupRequestManagerProxy::registerURIScheme): Send
     65        RegisterURIScheme message to the WebProcess to register the given
     66        URI scheme.
     67        (WebKit::WebSoupRequestManagerProxy::handleURIRequest): Send
     68        HandleURIRequest message to the WebProcess with the given data and
     69        data type.
     70        (WebKit::WebSoupRequestManagerProxy::didReceiveURIRequest): Call
     71        didReceiveURIRequest callback to allow the user to handle the
     72        request.
     73        * UIProcess/soup/WebSoupRequestManagerProxy.h: Added.
     74        * UIProcess/soup/WebSoupRequestManagerProxy.messages.in: Added.
     75        * WebProcess/WebProcess.cpp:
     76        (WebKit::WebProcess::WebProcess): Initialize m_soupRequestManager
     77        when using soup.
     78        (WebKit::WebProcess::didReceiveMessage): Forward the message to
     79        m_soupRequestManager if it's a MessageClassWebSoupRequestManager
     80        message.
     81        * WebProcess/WebProcess.h:
     82        (WebKit::WebProcess::soupRequestManager): Return m_soupRequestManager.
     83        * WebProcess/soup/WebKitSoupRequestGeneric.cpp: Added.
     84        (webkitSoupRequestGenericFinalize):
     85        (webkit_soup_request_generic_init):
     86        (webkitSoupRequestGenericSendAsync): Create a GSimpleAsyncResult
     87        to handle the request and pass it to the WebSoupRequestManager.
     88        (webkitSoupRequestGenericSendFinish): Finish the async operation
     89        started by webkitSoupRequestGenericSendAsync() and return the
     90        contents of the request as returned by WebSoupRequestManager.
     91        (webkitSoupRequestGenericGetContentLength): Get the request
     92        contents length.
     93        (webkitSoupRequestGenericGetContentType): Get the request mime
     94        type.
     95        (webkit_soup_request_generic_class_init):
     96        (webkitSoupRequestGenericSetContentLength): Set the request
     97        contents length.
     98        (webkitSoupRequestGenericSetContentType): Set the request mime
     99        type.
     100        * WebProcess/soup/WebKitSoupRequestGeneric.h: Added.
     101        * WebProcess/soup/WebSoupRequestManager.cpp: Added.
     102        (WebKit::generateSoupRequestID): Helper function to generate a
     103        unique request identifier.
     104        (WebKit::WebSoupRequestManager::WebSoupRequestManager):
     105        (WebKit::WebSoupRequestManager::~WebSoupRequestManager):
     106        (WebKit::WebSoupRequestManager::didReceiveMessage):
     107        (WebKit::WebSoupRequestManager::registerURIScheme): Add the scheme
     108        to the schemes array and add a new WebKitSoupRequestGeneric
     109        feature with the new scheme list to the SoupRequester feature.
     110        (WebKit::WebSoupRequestManager::handleURIRequest): Complete the
     111        async operation by creating a GInputStream with the request data,
     112        or setting an error in case of failure.
     113        (WebKit::WebSoupRequestManager::send): Send DidReceiveURIRequest
     114        message to the UI process.
     115        (WebKit::WebSoupRequestManager::finish): Return the GInputStream
     116        containing the request data.
     117        * WebProcess/soup/WebSoupRequestManager.h: Added.
     118        * WebProcess/soup/WebSoupRequestManager.messages.in: Added.
     119
    11202012-04-26  No'am Rosenthal  <noam.rosenthal@nokia.com>
    2121

  • trunk/Source/WebKit2/GNUmakefile.am

    r115083 r115411  
    22        $(WebKit2)/Shared/API/c/gtk/WKBaseGtk.h \
    33        $(WebKit2)/Shared/API/c/gtk/WKGraphicsContextGtk.h \
     4        $(WebKit2)/Shared/API/c/soup/WKBaseSoup.h \
    45        $(WebKit2)/Shared/API/c/WKArray.h \
    56        $(WebKit2)/Shared/API/c/WKBase.h \
    … …  
    3637        $(WebKit2)/UIProcess/API/C/gtk/WKFullScreenClientGtk.h \
    3738        $(WebKit2)/UIProcess/API/C/gtk/WKView.h \
     39        $(WebKit2)/UIProcess/API/C/soup/WKAPICastSoup.h \
     40        $(WebKit2)/UIProcess/API/C/soup/WKContextSoup.h \
     41        $(WebKit2)/UIProcess/API/C/soup/WKSoupRequestManager.h \
    3842        $(WebKit2)/UIProcess/API/C/WebKit2.h \
    3943        $(WebKit2)/UIProcess/API/C/WKAPICast.h \
    … …  
    191195        DerivedSources/WebKit2/WebProcessMessages.h \
    192196        DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
    193         DerivedSources/WebKit2/WebProcessProxyMessages.h
     197        DerivedSources/WebKit2/WebProcessProxyMessages.h \
     198        DerivedSources/WebKit2/WebSoupRequestManagerMessageReceiver.cpp \
     199        DerivedSources/WebKit2/WebSoupRequestManagerMessages.h \
     200        DerivedSources/WebKit2/WebSoupRequestManagerProxyMessageReceiver.cpp \
     201        DerivedSources/WebKit2/WebSoupRequestManagerProxyMessages.h
    194202
    195203webkit2_built_sources += \
    … …  
    264272        Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.h \
    265273        Source/WebKit2/Shared/API/c/gtk/WKGraphicsContextGtk.cpp \
     274        Source/WebKit2/Shared/API/c/soup/WKBaseSoup.h \
    266275        Source/WebKit2/Shared/API/c/WKArray.cpp \
    267276        Source/WebKit2/Shared/API/c/WKArray.h \
    … …  
    468477        Source/WebKit2/UIProcess/API/C/gtk/WKView.cpp \
    469478        Source/WebKit2/UIProcess/API/C/gtk/WKView.h \
     479        Source/WebKit2/UIProcess/API/C/soup/WKAPICastSoup.h \
     480        Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.cpp \
     481        Source/WebKit2/UIProcess/API/C/soup/WKContextSoup.h \
     482        Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.cpp \
     483        Source/WebKit2/UIProcess/API/C/soup/WKSoupRequestManager.h \
    470484        Source/WebKit2/UIProcess/API/C/WebKit2.h \
    471485        Source/WebKit2/UIProcess/API/C/WKAPICast.h \
    … …  
    693707        Source/WebKit2/UIProcess/ResponsivenessTimer.cpp \
    694708        Source/WebKit2/UIProcess/ResponsivenessTimer.h \
     709        Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.cpp \
     710        Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h \
     711        Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.cpp \
     712        Source/WebKit2/UIProcess/soup/WebSoupRequestManagerProxy.h \
    695713        Source/WebKit2/UIProcess/TextChecker.h \
    696714        Source/WebKit2/UIProcess/VisitedLinkProvider.cpp \
    … …  
    923941        Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h \
    924942        Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp \
     943        Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp \
     944        Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h \
     945        Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp \
     946        Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.h \
    925947        Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp \
    926948        Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp \
    … …  
    10221044        -I$(srcdir)/Source/WebKit2/Shared/API/c \
    10231045        -I$(srcdir)/Source/WebKit2/Shared/API/c/gtk \
     1046        -I$(srcdir)/Source/WebKit2/Shared/API/c/soup \
    10241047        -I$(srcdir)/Source/WebKit2/Shared/CoreIPCSupport \
    10251048        -I$(srcdir)/Source/WebKit2/Shared/gtk \
    … …  
    10311054        -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
    10321055        -I$(srcdir)/Source/WebKit2/UIProcess/API/C/gtk \
     1056        -I$(srcdir)/Source/WebKit2/UIProcess/API/C/soup \
    10331057        -I$(srcdir)/Source/WebKit2/UIProcess/API/cpp \
    10341058        -I$(srcdir)/Source/WebKit2/UIProcess/API/gtk \
    … …  
    10411065        -I$(srcdir)/Source/WebKit2/UIProcess/Plugins \
    10421066        -I$(srcdir)/Source/WebKit2/UIProcess/Plugins/gtk \
     1067        -I$(srcdir)/Source/WebKit2/UIProcess/soup \
    10431068        -I$(srcdir)/Source/WebKit2/WebProcess \
    10441069        -I$(srcdir)/Source/WebKit2/WebProcess/ApplicationCache \
    … …  
    10601085        -I$(srcdir)/Source/WebKit2/WebProcess/Notifications \
    10611086        -I$(srcdir)/Source/WebKit2/WebProcess/ResourceCache \
     1087        -I$(srcdir)/Source/WebKit2/WebProcess/soup \
    10621088        -I$(srcdir)/Source/WebKit2/WebProcess/Plugins \
    10631089        -I$(srcdir)/Source/WebKit2/WebProcess/Plugins/Netscape \
    … …  
    11891215        $(WebKit2)/UIProcess/Plugins \
    11901216        $(WebKit2)/UIProcess/ResourceCache \
     1217        $(WebKit2)/UIProcess/soup \
    11911218        $(WebKit2)/WebProcess \
    11921219        $(WebKit2)/WebProcess/ApplicationCache \
    … …  
    12021229        $(WebKit2)/WebProcess/ResourceCache \
    12031230        $(WebKit2)/WebProcess/WebCoreSupport \
    1204         $(WebKit2)/WebProcess/WebPage
     1231        $(WebKit2)/WebProcess/WebPage \
     1232        $(WebKit2)/WebProcess/soup
    12051233
    12061234message_gen_scripts = \
    … …  
    15901618        $(shell ls $(WebKit2)/UIProcess/Notifications/*.in) \
    15911619        $(shell ls $(WebKit2)/UIProcess/Plugins/*.in) \
     1620        $(shell ls $(WebKit2)/UIProcess/soup/*.in) \
    15921621        $(shell ls $(WebKit2)/WebProcess/*.in) \
    15931622        $(shell ls $(WebKit2)/WebProcess/ApplicationCache/*.in) \
    … …  
    16031632        $(shell ls $(WebKit2)/WebProcess/ResourceCache/*.in) \
    16041633        $(shell ls $(WebKit2)/WebProcess/WebCoreSupport/*.in) \
    1605         $(shell ls $(WebKit2)/WebProcess/WebPage/*.in)
     1634        $(shell ls $(WebKit2)/WebProcess/WebPage/*.in) \
     1635        $(shell ls $(WebKit2)/WebProcess/soup/*.in)

  • trunk/Source/WebKit2/Platform/CoreIPC/MessageID.h

    r102640 r115411  
    5454    MessageClassWebResourceCacheManager,
    5555    MessageClassEventDispatcher,
    56    
     56#if USE(SOUP)
     57    MessageClassWebSoupRequestManager,
     58#endif
     59
    5760    // Messages sent by the web process to the UI process.
    5861    MessageClassDownloadProxy,
    … …  
    7477    MessageClassWebProcessProxy,
    7578    MessageClassWebResourceCacheManagerProxy,
     79#if USE(SOUP)
     80    MessageClassWebSoupRequestManagerProxy,
     81#endif
    7682
    7783    // Messages sent to a WebConnection

  • trunk/Source/WebKit2/Shared/API/c/WKBase.h

    r115083 r115411  
    3636#if defined(BUILDING_GTK__)
    3737#include <WebKit2/WKBaseGtk.h>
     38#endif
     39
     40#if defined(BUILDING_SOUP__)
     41#include <WebKit2/WKBaseSoup.h>
    3842#endif
    3943

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

    r115083 r115411  
    121121        // Platform specific
    122122        TypeEditCommandProxy,
    123         TypeView
     123        TypeView,
     124#if USE(SOUP)
     125        TypeSoupRequestManager,
     126#endif
    124127    };
    125128

  • trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

    r110397 r115411  
    360360#include "WKAPICastGtk.h"
    361361#endif
     362
     363#if USE(SOUP)
     364#include "WKAPICastSoup.h"
     365#endif
     366
    362367#endif // WKAPICast_h

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

    r110784 r115411  
    6767#endif
    6868
     69#if USE(SOUP)
     70#include "WebSoupRequestManagerProxy.h"
     71#endif
     72
    6973#ifndef NDEBUG
    7074#include <wtf/RefCountedLeakCounter.h>
    … …  
    136140    , m_pluginSiteDataManager(WebPluginSiteDataManager::create(this))
    137141    , m_resourceCacheManagerProxy(WebResourceCacheManagerProxy::create(this))
     142#if USE(SOUP)
     143    , m_soupRequestManagerProxy(WebSoupRequestManagerProxy::create(this))
     144#endif
    138145#if PLATFORM(WIN)
    139146    , m_shouldPaintNativeControls(true)
    … …  
    193200    m_resourceCacheManagerProxy->invalidate();
    194201    m_resourceCacheManagerProxy->clearContext();
    195    
     202
     203#if USE(SOUP)
     204    m_soupRequestManagerProxy->invalidate();
     205    m_soupRequestManagerProxy->clearContext();
     206#endif
     207
    196208    invalidateCallbackMap(m_dictionaryCallbacks);
    197209
    … …  
    381393    m_notificationManagerProxy->invalidate();
    382394    m_resourceCacheManagerProxy->invalidate();
     395#if USE(SOUP)
     396    m_soupRequestManagerProxy->invalidate();
     397#endif
    383398
    384399    // When out of process plug-ins are enabled, we don't want to invalidate the plug-in site data
    … …  
    716731        return;
    717732    }
     733
     734#if USE(SOUP)
     735    if (messageID.is<CoreIPC::MessageClassWebSoupRequestManagerProxy>()) {
     736        m_soupRequestManagerProxy->didReceiveMessage(connection, messageID, arguments);
     737        return;
     738    }
     739#endif
    718740
    719741    switch (messageID.get<WebContextLegacyMessage::Kind>()) {

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

    r111080 r115411  
    5959class WebPageProxy;
    6060class WebResourceCacheManagerProxy;
     61#if USE(SOUP)
     62class WebSoupRequestManagerProxy;
     63#endif
    6164struct StatisticsData;
    6265struct WebProcessCreationParameters;
    … …  
    162165    WebPluginSiteDataManager* pluginSiteDataManager() const { return m_pluginSiteDataManager.get(); }
    163166    WebResourceCacheManagerProxy* resourceCacheManagerProxy() const { return m_resourceCacheManagerProxy.get(); }
     167#if USE(SOUP)
     168    WebSoupRequestManagerProxy* soupRequestManagerProxy() const { return m_soupRequestManagerProxy.get(); }
     169#endif
    164170
    165171    struct Statistics {
    … …  
    297303    RefPtr<WebPluginSiteDataManager> m_pluginSiteDataManager;
    298304    RefPtr<WebResourceCacheManagerProxy> m_resourceCacheManagerProxy;
     305#if USE(SOUP)
     306    RefPtr<WebSoupRequestManagerProxy> m_soupRequestManagerProxy;
     307#endif
    299308
    300309#if PLATFORM(WIN)

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

    r114451 r115411  
    315315        || messageID.is<CoreIPC::MessageClassWebMediaCacheManagerProxy>()
    316316        || messageID.is<CoreIPC::MessageClassWebNotificationManagerProxy>()
     317#if USE(SOUP)
     318        || messageID.is<CoreIPC::MessageClassWebSoupRequestManagerProxy>()
     319#endif
    317320        || messageID.is<CoreIPC::MessageClassWebResourceCacheManagerProxy>()) {
    318321        m_context->didReceiveMessage(connection, messageID, arguments);

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

    r115288 r115411  
    152152    , m_disablePluginProcessMessageTimeout(false)
    153153#endif
     154#if USE(SOUP)
     155    , m_soupRequestManager(this)
     156#endif
    154157{
    155158#if USE(PLATFORM_STRATEGIES)
    … …  
    653656        return;
    654657    }
     658
     659#if USE(SOUP)
     660    if (messageID.is<CoreIPC::MessageClassWebSoupRequestManager>()) {
     661        m_soupRequestManager.didReceiveMessage(connection, messageID, arguments);
     662        return;
     663    }
     664#endif
    655665
    656666    if (messageID.is<CoreIPC::MessageClassInjectedBundle>()) {

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

    r114958 r115411  
    4545#include <wtf/HashSet.h>
    4646
     47#if USE(SOUP)
     48#include "WebSoupRequestManager.h"
     49#endif
     50
    4751#if PLATFORM(QT)
    4852class QNetworkAccessManager;
    … …  
    152156
    153157    EventDispatcher& eventDispatcher() { return m_eventDispatcher; }
     158
     159#if USE(SOUP)
     160    WebSoupRequestManager& soupRequestManager() { return m_soupRequestManager; }
     161#endif
    154162
    155163private:
    … …  
    288296#endif
    289297
     298#if USE(SOUP)
     299    WebSoupRequestManager m_soupRequestManager;
     300#endif
     301
    290302};
    291303

  • trunk/Tools/ChangeLog

    r115410 r115411  
     12012-04-26  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [SOUP] Add a way to register custom uri schemes in WebKit2
     4        https://bugs.webkit.org/show_bug.cgi?id=84130
     5
     6        Reviewed by Martin Robinson.
     7
     8        * Scripts/webkitpy/style/checkers/cpp.py:
     9        (check_identifier_name_in_declaration): Add webkit_soup prefix to
     10        the list of exceptions to the underscores in identifiers rule.
     11
    1122012-04-26  Ryosuke Niwa  <rniwa@webkit.org>
    213

  • trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py

    r113565 r115411  
    31103110                and not modified_identifier.startswith('tst_')
    31113111                and not modified_identifier.startswith('webkit_dom_object_')
     3112                and not modified_identifier.startswith('webkit_soup')
    31123113                and not modified_identifier.startswith('NPN_')
    31133114                and not modified_identifier.startswith('NPP_')
Note: See TracChangeset for help on using the changeset viewer.