Changeset 149884 in webkit


Ignore:
Timestamp:
May 10, 2013 10:16:54 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[WK2] Make the WebSoupRequestManager a supplement to the WebProcess
https://bugs.webkit.org/show_bug.cgi?id=115717

Reviewed by Andreas Kling.

WebSoupRequestManager should inherit from WebProcessSupplement and should be used as such
by the WebProcess. This removes the need for the m_soupRequestManager member variable in
the WebProcess class and brings the WebSoupRequestManager in line with other manager classes
of which instances are controlled by the WebProcess class.

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Add the WebSoupRequestManager as a supplement.

  • WebProcess/WebProcess.h:

(WebProcess): Remove the m_soupRequestManager member variable and its getter method.

  • WebProcess/soup/WebKitSoupRequestGeneric.cpp:

(webkitSoupRequestGenericSendAsync): Access the WebSoupRequestManager as a supplement.
(webkitSoupRequestGenericSendFinish): Ditto.

  • WebProcess/soup/WebProcessSoup.cpp:

(WebKit::WebProcess::platformInitializeWebProcess): Access the WebSoupRequestManager as a supplement.

  • WebProcess/soup/WebSoupRequestManager.cpp:

(WebKit::WebSoupRequestManager::supplementName): Specify the supplement's name.

  • WebProcess/soup/WebSoupRequestManager.h:

(WebSoupRequestManager): Inherit from the WebProcessSupplement interface.

Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r149879 r149884  
     12013-05-10  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [WK2] Make the WebSoupRequestManager a supplement to the WebProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=115717
     5
     6        Reviewed by Andreas Kling.
     7
     8        WebSoupRequestManager should inherit from WebProcessSupplement and should be used as such
     9        by the WebProcess. This removes the need for the m_soupRequestManager member variable in
     10        the WebProcess class and brings the WebSoupRequestManager in line with other manager classes
     11        of which instances are controlled by the WebProcess class.
     12
     13        * WebProcess/WebProcess.cpp:
     14        (WebKit::WebProcess::WebProcess): Add  the WebSoupRequestManager as a supplement.
     15        * WebProcess/WebProcess.h:
     16        (WebProcess): Remove the m_soupRequestManager member variable and its getter method.
     17        * WebProcess/soup/WebKitSoupRequestGeneric.cpp:
     18        (webkitSoupRequestGenericSendAsync): Access the WebSoupRequestManager as a supplement.
     19        (webkitSoupRequestGenericSendFinish): Ditto.
     20        * WebProcess/soup/WebProcessSoup.cpp:
     21        (WebKit::WebProcess::platformInitializeWebProcess): Access the WebSoupRequestManager as a supplement.
     22        * WebProcess/soup/WebSoupRequestManager.cpp:
     23        (WebKit::WebSoupRequestManager::supplementName): Specify the supplement's name.
     24        * WebProcess/soup/WebSoupRequestManager.h:
     25        (WebSoupRequestManager): Inherit from the WebProcessSupplement interface.
     26
    1272013-05-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    228
  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r149848 r149884  
    132132#endif
    133133
     134#if USE(SOUP)
     135#include "WebSoupRequestManager.h"
     136#endif
     137
    134138using namespace JSC;
    135139using namespace WebCore;
     
    174178    , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
    175179#endif
    176 #if USE(SOUP)
    177     , m_soupRequestManager(this)
    178 #endif
    179180    , m_inWindowPageCount(0)
    180181    , m_nonVisibleProcessCleanupTimer(this, &WebProcess::nonVisibleProcessCleanupTimerFired)
     
    212213#if ENABLE(NETWORK_INFO)
    213214    addSupplement<WebNetworkInfoManager>();
     215#endif
     216#if USE(SOUP)
     217    addSupplement<WebSoupRequestManager>();
    214218#endif
    215219}
  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r149848 r149884  
    4444#include <wtf/text/AtomicStringHash.h>
    4545
    46 #if USE(SOUP)
    47 #include "WebSoupRequestManager.h"
    48 #endif
    49 
    5046#if PLATFORM(QT)
    5147QT_BEGIN_NAMESPACE
     
    145141    QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; }
    146142#endif
    147 #if USE(SOUP)
    148     WebSoupRequestManager& soupRequestManager() { return m_soupRequestManager; }
    149 #endif
    150143
    151144    void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
     
    317310#endif
    318311
    319 #if USE(SOUP)
    320     WebSoupRequestManager m_soupRequestManager;
    321 #endif
    322    
    323312    int m_inWindowPageCount;
    324313    WebCore::Timer<WebProcess> m_nonVisibleProcessCleanupTimer;
  • trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp

    r129096 r149884  
    2222
    2323#include "WebProcess.h"
     24#include "WebSoupRequestManager.h"
    2425#include <wtf/text/CString.h>
    2526
     
    4950{
    5051    GSimpleAsyncResult* result = g_simple_async_result_new(G_OBJECT(request), callback, userData, reinterpret_cast<void*>(webkitSoupRequestGenericSendAsync));
    51     WebProcess::shared().soupRequestManager().send(result, cancellable);
     52    WebProcess::shared().supplement<WebSoupRequestManager>()->send(result, cancellable);
    5253}
    5354
     
    6061        return 0;
    6162
    62     return WebProcess::shared().soupRequestManager().finish(simpleResult);
     63    return WebProcess::shared().supplement<WebSoupRequestManager>()->finish(simpleResult);
    6364}
    6465
  • trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

    r148886 r149884  
    3434#include "WebCookieManager.h"
    3535#include "WebProcessCreationParameters.h"
     36#include "WebSoupRequestManager.h"
    3637#include <WebCore/FileSystem.h>
    3738#include <WebCore/Language.h>
     
    185186
    186187    for (size_t i = 0; i < parameters.urlSchemesRegistered.size(); i++)
    187         m_soupRequestManager.registerURIScheme(parameters.urlSchemesRegistered[i]);
     188        supplement<WebSoupRequestManager>()->registerURIScheme(parameters.urlSchemesRegistered[i]);
    188189
    189190    if (!parameters.cookiePersistentStoragePath.isEmpty()) {
  • trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp

    r149642 r149884  
    7575    GRefPtr<GInputStream> stream;
    7676};
     77
     78const char* WebSoupRequestManager::supplementName()
     79{
     80    return "WebSoupRequestManager";
     81}
    7782
    7883WebSoupRequestManager::WebSoupRequestManager(WebProcess* process)
  • trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h

    r149642 r149884  
    2323#include "DataReference.h"
    2424#include "MessageReceiver.h"
     25#include "WebProcessSupplement.h"
    2526#include <WebCore/ResourceError.h>
    2627#include <wtf/HashMap.h>
     
    3839struct WebSoupRequestAsyncData;
    3940
    40 class WebSoupRequestManager : private CoreIPC::MessageReceiver {
     41class WebSoupRequestManager : public WebProcessSupplement, private CoreIPC::MessageReceiver {
    4142    WTF_MAKE_NONCOPYABLE(WebSoupRequestManager);
    4243public:
    4344    explicit WebSoupRequestManager(WebProcess*);
    4445    ~WebSoupRequestManager();
     46
     47    static const char* supplementName();
    4548
    4649    void send(GSimpleAsyncResult*, GCancellable*);
Note: See TracChangeset for help on using the changeset viewer.