diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/loader/ResourceLoadScheduler.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/loader/ResourceLoadScheduler.cpp')
| -rw-r--r-- | WebCore/loader/ResourceLoadScheduler.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/loader/ResourceLoadScheduler.cpp b/WebCore/loader/ResourceLoadScheduler.cpp index ca85ff4..7c50dc1 100644 --- a/WebCore/loader/ResourceLoadScheduler.cpp +++ b/WebCore/loader/ResourceLoadScheduler.cpp @@ -192,10 +192,9 @@ void ResourceLoadScheduler::servePendingRequests(HostInformation* host, Priority if (shouldLimitRequests && host->limitRequests()) return; - resourceLoader->start(); - if (!resourceLoader->reachedTerminalState()) - host->addLoadInProgress(resourceLoader.get()); requestsPending.removeFirst(); + host->addLoadInProgress(resourceLoader.get()); + resourceLoader->start(); } } } |