summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-11-04 14:49:26 +0000
committerKristian Monsen <kristianm@google.com>2010-11-04 14:49:26 +0000
commit07017de2da3288f802d8424d61aff826a72f736d (patch)
treee63cbbd7d1297d293f0952904618b9ff63a981f1
parent6be0d5f748267d7691c09a458651f0a2d8f9affc (diff)
downloadexternal_webkit-07017de2da3288f802d8424d61aff826a72f736d.zip
external_webkit-07017de2da3288f802d8424d61aff826a72f736d.tar.gz
external_webkit-07017de2da3288f802d8424d61aff826a72f736d.tar.bz2
Let Chrome HTTP stack handle number of connections
First of changes based on willchan's feedback. Note that this code doesn't really work as intended anyway. Change-Id: I91d43f1daa78248700738338cf3d24a12496ac19
-rw-r--r--WebCore/platform/network/android/ResourceRequestAndroid.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/platform/network/android/ResourceRequestAndroid.cpp b/WebCore/platform/network/android/ResourceRequestAndroid.cpp
index 7f4bccb..00735f3 100644
--- a/WebCore/platform/network/android/ResourceRequestAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceRequestAndroid.cpp
@@ -30,10 +30,17 @@ namespace WebCore {
unsigned initializeMaximumHTTPConnectionCountPerHost()
{
+#if USE(CHROME_NETWORK_STACK)
+ // The chromium network stack already handles limiting the number of
+ // parallel requests per host, so there's no need to do it here. Therefore,
+ // this is set to a high value that should never be hit in practice.
+ return 10000;
+#else
// This is used by the loader to control the number of parallel load
// requests. Our java framework has 4 threads that can each pipeline up to
// 5 requests. Use 20 as a maximum number.
return 20;
+#endif
}
} // namespace WebCore