[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
hamaji at chromium.org
hamaji at chromium.org
Fri Feb 26 22:15:23 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ae65b8c137d343dbc12e5259908165273ec19360
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 9 06:17:04 2010 +0000
2010-02-08 Hayato Ito <hayato at chromium.org>
Reviewed by Darin Adler.
Schedule a loading request when there are many in-flight requests beyond
the limit to avoid forever page loading.
https://bugs.webkit.org/show_bug.cgi?id=31227
* http/tests/loading/load-javascript-after-many-xhrs-expected.txt: Added.
* http/tests/loading/load-javascript-after-many-xhrs.html: Added.
* http/tests/loading/resources/zero-length.js: Added.
* http/tests/loading/resources/zero-length.txt: Added.
2010-02-08 Hayato Ito <hayato at chromium.org>
Reviewed by Darin Adler.
Schedule a loading request when there are many in-flight requests beyond
the limit to avoid forever page loading.
https://bugs.webkit.org/show_bug.cgi?id=31227
Test: http/tests/loading/load-javascript-after-many-xhrs.html
* loader/loader.cpp:
(WebCore::Loader::Host::servePendingRequests):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54526 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c520546..aebf2a3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-08 Hayato Ito <hayato at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Schedule a loading request when there are many in-flight requests beyond
+ the limit to avoid forever page loading.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31227
+
+ * http/tests/loading/load-javascript-after-many-xhrs-expected.txt: Added.
+ * http/tests/loading/load-javascript-after-many-xhrs.html: Added.
+ * http/tests/loading/resources/zero-length.js: Added.
+ * http/tests/loading/resources/zero-length.txt: Added.
+
2010-02-08 Darin Adler <darin at apple.com>
Reviewed by Dan Bernstein.
diff --git a/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs-expected.txt b/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs-expected.txt
new file mode 100644
index 0000000..24597fe
--- /dev/null
+++ b/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs-expected.txt
@@ -0,0 +1,6 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+Test for https://bugs.webkit.org/show_bug.cgi?id=31227. If it didn't crash, the browser passed the test.
diff --git a/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs.html b/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs.html
new file mode 100644
index 0000000..1a2d474
--- /dev/null
+++ b/LayoutTests/http/tests/loading/load-javascript-after-many-xhrs.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script type="text/javascript">
+for (var i = 0; i < 10; ++i) {
+ var req = new window.XMLHttpRequest();
+ req.open("GET", "resources/zero-length.txt");
+ req.send();
+}
+</script>
+<script>
+if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+</script>
+</head>
+<body>
+<script type="text/javascript" src="resources/zero-length.js"></script>
+Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=31227">https://bugs.webkit.org/show_bug.cgi?id=31227</a>.
+If it didn't crash, the browser passed the test.
+</body>
+</html>
diff --git a/BugsSite/data/mail b/LayoutTests/http/tests/loading/resources/zero-length.js
similarity index 100%
copy from BugsSite/data/mail
copy to LayoutTests/http/tests/loading/resources/zero-length.js
diff --git a/LayoutTests/http/tests/xmlhttprequest/resources/zero-length.txt b/LayoutTests/http/tests/loading/resources/zero-length.txt
similarity index 100%
copy from LayoutTests/http/tests/xmlhttprequest/resources/zero-length.txt
copy to LayoutTests/http/tests/loading/resources/zero-length.txt
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 13d0be4..14a683e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-08 Hayato Ito <hayato at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Schedule a loading request when there are many in-flight requests beyond
+ the limit to avoid forever page loading.
+
+ https://bugs.webkit.org/show_bug.cgi?id=31227
+
+ Test: http/tests/loading/load-javascript-after-many-xhrs.html
+
+ * loader/loader.cpp:
+ (WebCore::Loader::Host::servePendingRequests):
+
2010-02-08 David Levin <levin at chromium.org>
Reviewed by Gavin Barraclough.
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index d693341..4d2b474 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -322,6 +322,7 @@ void Loader::Host::servePendingRequests(RequestQueue& requestsPending, bool& ser
bool shouldLimitRequests = !m_name.isNull() || docLoader->doc()->parsing() || !docLoader->doc()->haveStylesheetsLoaded();
if (shouldLimitRequests && m_requestsLoading.size() + m_nonCachedRequestsInFlight >= m_maxRequestsInFlight) {
serveLowerPriority = false;
+ cache()->loader()->scheduleServePendingRequests();
return;
}
requestsPending.removeFirst();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list