Title: [139672] tags/Safari-537.26/Source/WebKit2
Diff
Modified: tags/Safari-537.26/Source/WebKit2/ChangeLog (139671 => 139672)
--- tags/Safari-537.26/Source/WebKit2/ChangeLog 2013-01-14 22:48:56 UTC (rev 139671)
+++ tags/Safari-537.26/Source/WebKit2/ChangeLog 2013-01-14 22:57:46 UTC (rev 139672)
@@ -1,3 +1,20 @@
+2013-01-14 Lucas Forschler <[email protected]>
+
+ Merge r139655
+
+ 2013-01-14 Alexey Proskuryakov <[email protected]>
+
+ NetworkProcess scheduler never resumes resource loads that were postponed
+ due to connection limit
+ https://bugs.webkit.org/show_bug.cgi?id=106821
+
+ Reviewed by Brady Eidson.
+
+ * NetworkProcess/NetworkResourceLoadScheduler.cpp:
+ (WebKit::NetworkResourceLoadScheduler::servePendingRequests):
+ * NetworkProcess/NetworkResourceLoadScheduler.h:
+ Remove an uninitialized variable that could prevent loading.
+
2013-01-11 Balazs Kelemen <[email protected]>
[Qt][WK2] plugin tests assert in debug
Modified: tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp (139671 => 139672)
--- tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2013-01-14 22:48:56 UTC (rev 139671)
+++ tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2013-01-14 22:57:46 UTC (rev 139672)
@@ -146,9 +146,6 @@
void NetworkResourceLoadScheduler::servePendingRequests(ResourceLoadPriority minimumPriority)
{
- if (m_suspendPendingRequestsCount)
- return;
-
LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::servePendingRequests Serving requests for up to %i hosts", m_hosts.size());
m_requestTimer.stop();
Modified: tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h (139671 => 139672)
--- tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2013-01-14 22:48:56 UTC (rev 139671)
+++ tags/Safari-537.26/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h 2013-01-14 22:57:46 UTC (rev 139672)
@@ -92,7 +92,6 @@
HostRecord* m_nonHTTPProtocolHost;
- unsigned m_suspendPendingRequestsCount;
bool m_isSerialLoadingEnabled;
WebCore::Timer<NetworkResourceLoadScheduler> m_requestTimer;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
