Changeset 138301 in webkit
- Timestamp:
- Dec 20, 2012 2:20:31 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r138273 r138301 1 2012-12-20 Brady Eidson <beidson@apple.com> 2 3 NetworkProcess has no need for suspend/resumePendingRequests. 4 <rdar://problem/12866005> and https://bugs.webkit.org/show_bug.cgi?id=105550 5 6 Reviewed by Alexey Proskuryakov. 7 8 suspend/resumePendingRequests were important in a single-process, WebKit1 API world to help prevent 9 client callbacks from occurring during layout/painting. 10 11 In a WebKit2 + NetworkProcess world, they aren't important. 12 13 Remove the Web->Network process messages: 14 * NetworkProcess/NetworkConnectionToWebProcess.cpp: 15 * NetworkProcess/NetworkConnectionToWebProcess.h: 16 * NetworkProcess/NetworkConnectionToWebProcess.messages.in: 17 * NetworkProcess/NetworkResourceLoadScheduler.cpp: 18 * NetworkProcess/NetworkResourceLoadScheduler.h: 19 20 For now, still keep the per-WebProcess count to help keep servePendingRequest working as WebCore intends: 21 * WebProcess/Network/WebResourceLoadScheduler.cpp: 22 (WebKit::WebResourceLoadScheduler::servePendingRequests): 23 (WebKit::WebResourceLoadScheduler::suspendPendingRequests): 24 (WebKit::WebResourceLoadScheduler::resumePendingRequests): 25 1 26 2012-12-20 Carlos Garcia Campos <cgarcia@igalia.com> 2 27 -
trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
r138109 r138301 140 140 } 141 141 142 void NetworkConnectionToWebProcess::suspendPendingRequests()143 {144 NetworkProcess::shared().networkResourceLoadScheduler().suspendPendingRequests();145 }146 147 void NetworkConnectionToWebProcess::resumePendingRequests()148 {149 NetworkProcess::shared().networkResourceLoadScheduler().resumePendingRequests();150 }151 152 142 void NetworkConnectionToWebProcess::setSerialLoadingEnabled(bool enabled) 153 143 { -
trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
r138109 r138301 84 84 void crossOriginRedirectReceived(ResourceLoadIdentifier, const WebCore::KURL& redirectURL); 85 85 void servePendingRequests(uint32_t resourceLoadPriority); 86 void suspendPendingRequests();87 void resumePendingRequests();88 86 void setSerialLoadingEnabled(bool); 89 87 void startDownload(bool privateBrowsingEnabled, uint64_t downloadID, const WebCore::ResourceRequest&); -
trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in
r138109 r138301 34 34 35 35 ServePendingRequests(uint32_t resourceLoadPriority) 36 37 SuspendPendingRequests() -> ()38 ResumePendingRequests() -> ()39 36 40 37 SetSerialLoadingEnabled(bool enabled) -> () -
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp
r137515 r138301 210 210 } 211 211 212 void NetworkResourceLoadScheduler::suspendPendingRequests()213 {214 ++m_suspendPendingRequestsCount;215 }216 217 void NetworkResourceLoadScheduler::resumePendingRequests()218 {219 ASSERT(m_suspendPendingRequestsCount);220 --m_suspendPendingRequestsCount;221 if (m_suspendPendingRequestsCount)222 return;223 224 if (!m_hosts.isEmpty() || m_nonHTTPProtocolHost->hasRequests())225 scheduleServePendingRequests();226 }227 228 212 static bool removeScheduledLoadIdentifiersCalled = false; 229 213 -
trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h
r135017 r138301 62 62 void receivedRedirect(ResourceLoadIdentifier, const WebCore::KURL& redirectURL); 63 63 void servePendingRequests(WebCore::ResourceLoadPriority = WebCore::ResourceLoadPriorityVeryLow); 64 void suspendPendingRequests();65 void resumePendingRequests();66 64 67 65 NetworkResourceLoader* networkResourceLoaderForIdentifier(ResourceLoadIdentifier); -
trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
r137351 r138301 163 163 LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::servePendingRequests"); 164 164 165 // If this WebProcess has its own request suspension count then we don't even166 // have to bother messaging the NetworkProcess.165 // The NetworkProcess scheduler is good at making sure loads are serviced until there are no more pending requests. 166 // If this WebProcess isn't expecting requests to be served then we can ignore messaging the NetworkProcess right now. 167 167 if (m_suspendPendingRequestsCount) 168 168 return; … … 173 173 void WebResourceLoadScheduler::suspendPendingRequests() 174 174 { 175 WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::SuspendPendingRequests(), Messages::NetworkConnectionToWebProcess::SuspendPendingRequests::Reply(), 0);176 177 175 ++m_suspendPendingRequestsCount; 178 176 } … … 180 178 void WebResourceLoadScheduler::resumePendingRequests() 181 179 { 182 WebProcess::shared().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::ResumePendingRequests(), Messages::NetworkConnectionToWebProcess::ResumePendingRequests::Reply(), 0);183 184 180 ASSERT(m_suspendPendingRequestsCount); 185 181 --m_suspendPendingRequestsCount;
Note: See TracChangeset
for help on using the changeset viewer.