[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[zecke at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit cae7c9c09c124321761dd6b107615781e89662d6
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 14 03:10:56 2009 +0000

    [Qt] Implement initializeMaximumHTTPConnectionCountPerHost.
    
    Qt allows to have three connections per host on Symbian, for
    every other platform the limit is set to six connections per
    host but the default implementation will only schedule four
    connections per host.
    In a manual test we seem to get the best loading speed by
    going with Qt's limit and schedule two more jobs to allow Qt
    to prepare them.
    
    * platform/network/ResourceRequestBase.cpp:
    * platform/network/qt/ResourceRequestQt.cpp:
    (WebCore::initializeMaximumHTTPConnectionCountPerHost):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3d91653..7080227 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-11-30  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Implement initializeMaximumHTTPConnectionCountPerHost.
+        https://bugs.webkit.org/show_bug.cgi?id=31849
+
+        Qt allows to have three connections per host on Symbian, for
+        every other platform the limit is set to six connections per
+        host but the default implementation will only schedule four
+        connections per host.
+        In a manual test we seem to get the best loading speed by
+        going with Qt's limit and schedule two more jobs to allow Qt
+        to prepare them.
+
+        * platform/network/ResourceRequestBase.cpp:
+        * platform/network/qt/ResourceRequestQt.cpp:
+        (WebCore::initializeMaximumHTTPConnectionCountPerHost):
+
 2009-12-13  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/platform/network/ResourceRequestBase.cpp b/WebCore/platform/network/ResourceRequestBase.cpp
index 41afb92..0a68972 100644
--- a/WebCore/platform/network/ResourceRequestBase.cpp
+++ b/WebCore/platform/network/ResourceRequestBase.cpp
@@ -390,7 +390,7 @@ void ResourceRequestBase::updateResourceRequest() const
     m_resourceRequestUpdated = true;
 }
 
-#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID)
+#if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) && !PLATFORM(ANDROID) && !PLATFORM(QT)
 unsigned initializeMaximumHTTPConnectionCountPerHost()
 {
     // This is used by the loader to control the number of issued parallel load requests. 
diff --git a/WebCore/platform/network/qt/ResourceRequestQt.cpp b/WebCore/platform/network/qt/ResourceRequestQt.cpp
index 752abfe..341e6ae 100644
--- a/WebCore/platform/network/qt/ResourceRequestQt.cpp
+++ b/WebCore/platform/network/qt/ResourceRequestQt.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -27,6 +27,20 @@
 
 namespace WebCore {
 
+// Currently Qt allows three connections per host on symbian and six
+// for everyone else. The limit can be found in qhttpnetworkconnection.cpp.
+// To achieve the best result we want WebKit to schedule the jobs so we
+// are using the limit as found in Qt. To allow Qt to fill its queue
+// and prepare jobs we will schedule two more downloads.
+unsigned initializeMaximumHTTPConnectionCountPerHost()
+{
+#ifdef Q_OS_SYMBIAN
+    return 3 + 2;
+#else
+    return 6 + 2;
+#endif
+}
+
 QNetworkRequest ResourceRequest::toNetworkRequest(QObject* originatingFrame) const
 {
     QNetworkRequest request;

-- 
WebKit Debian packaging