Changeset 149884 in webkit
- Timestamp:
- May 10, 2013 10:16:54 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r149879 r149884 1 2013-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 1 27 2013-05-10 Carlos Garcia Campos <cgarcia@igalia.com> 2 28 -
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
r149848 r149884 132 132 #endif 133 133 134 #if USE(SOUP) 135 #include "WebSoupRequestManager.h" 136 #endif 137 134 138 using namespace JSC; 135 139 using namespace WebCore; … … 174 178 , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create()) 175 179 #endif 176 #if USE(SOUP)177 , m_soupRequestManager(this)178 #endif179 180 , m_inWindowPageCount(0) 180 181 , m_nonVisibleProcessCleanupTimer(this, &WebProcess::nonVisibleProcessCleanupTimerFired) … … 212 213 #if ENABLE(NETWORK_INFO) 213 214 addSupplement<WebNetworkInfoManager>(); 215 #endif 216 #if USE(SOUP) 217 addSupplement<WebSoupRequestManager>(); 214 218 #endif 215 219 } -
trunk/Source/WebKit2/WebProcess/WebProcess.h
r149848 r149884 44 44 #include <wtf/text/AtomicStringHash.h> 45 45 46 #if USE(SOUP)47 #include "WebSoupRequestManager.h"48 #endif49 50 46 #if PLATFORM(QT) 51 47 QT_BEGIN_NAMESPACE … … 145 141 QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; } 146 142 #endif 147 #if USE(SOUP)148 WebSoupRequestManager& soupRequestManager() { return m_soupRequestManager; }149 #endif150 143 151 144 void clearResourceCaches(ResourceCachesToClear = AllResourceCaches); … … 317 310 #endif 318 311 319 #if USE(SOUP)320 WebSoupRequestManager m_soupRequestManager;321 #endif322 323 312 int m_inWindowPageCount; 324 313 WebCore::Timer<WebProcess> m_nonVisibleProcessCleanupTimer; -
trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestGeneric.cpp
r129096 r149884 22 22 23 23 #include "WebProcess.h" 24 #include "WebSoupRequestManager.h" 24 25 #include <wtf/text/CString.h> 25 26 … … 49 50 { 50 51 GSimpleAsyncResult* result = g_simple_async_result_new(G_OBJECT(request), callback, userData, reinterpret_cast<void*>(webkitSoupRequestGenericSendAsync)); 51 WebProcess::shared().s oupRequestManager().send(result, cancellable);52 WebProcess::shared().supplement<WebSoupRequestManager>()->send(result, cancellable); 52 53 } 53 54 … … 60 61 return 0; 61 62 62 return WebProcess::shared().s oupRequestManager().finish(simpleResult);63 return WebProcess::shared().supplement<WebSoupRequestManager>()->finish(simpleResult); 63 64 } 64 65 -
trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
r148886 r149884 34 34 #include "WebCookieManager.h" 35 35 #include "WebProcessCreationParameters.h" 36 #include "WebSoupRequestManager.h" 36 37 #include <WebCore/FileSystem.h> 37 38 #include <WebCore/Language.h> … … 185 186 186 187 for (size_t i = 0; i < parameters.urlSchemesRegistered.size(); i++) 187 m_soupRequestManager.registerURIScheme(parameters.urlSchemesRegistered[i]);188 supplement<WebSoupRequestManager>()->registerURIScheme(parameters.urlSchemesRegistered[i]); 188 189 189 190 if (!parameters.cookiePersistentStoragePath.isEmpty()) { -
trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp
r149642 r149884 75 75 GRefPtr<GInputStream> stream; 76 76 }; 77 78 const char* WebSoupRequestManager::supplementName() 79 { 80 return "WebSoupRequestManager"; 81 } 77 82 78 83 WebSoupRequestManager::WebSoupRequestManager(WebProcess* process) -
trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h
r149642 r149884 23 23 #include "DataReference.h" 24 24 #include "MessageReceiver.h" 25 #include "WebProcessSupplement.h" 25 26 #include <WebCore/ResourceError.h> 26 27 #include <wtf/HashMap.h> … … 38 39 struct WebSoupRequestAsyncData; 39 40 40 class WebSoupRequestManager : p rivate CoreIPC::MessageReceiver {41 class WebSoupRequestManager : public WebProcessSupplement, private CoreIPC::MessageReceiver { 41 42 WTF_MAKE_NONCOPYABLE(WebSoupRequestManager); 42 43 public: 43 44 explicit WebSoupRequestManager(WebProcess*); 44 45 ~WebSoupRequestManager(); 46 47 static const char* supplementName(); 45 48 46 49 void send(GSimpleAsyncResult*, GCancellable*);
Note: See TracChangeset
for help on using the changeset viewer.