Changeset 85684 in webkit

Timestamp:

May 3, 2011 4:25:15 PM (13 years ago)

Author:

ddkilzer@apple.com

Message:

<​http://webkit.org/b/59838> Implement HTTP pipelining for CoreFoundation-based networking

Reviewed by Antti Koivisto.

Source/WebCore:

• platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::ResourceRequest::doUpdatePlatformRequest): Set the
priority on the request if HTTP pipelining is enabled.
(WebCore::ResourceRequest::doUpdateResourceRequest): Read the
priority from the request if HTTP pipelining is enabled.
(readBooleanPreference): Enable code when compiling with
USE(CFNETWORK).
(WebCore::initializeMaximumHTTPConnectionCountPerHost): Ditto.
Comment out setting the minimum fast lane priority on Windows
since it's not currently available.

Source/WebKit/win:

• Interfaces/IWebViewPrivate.idl:

(IWebViewPrivate::httpPipeliningEnabled): Added declaration.
(IWebViewPrivate::setHTTPPipeliningEnabled): Added declaration.

• WebView.cpp:

(WebView::httpPipeliningEnabled): Added.
(WebView::setHTTPPipeliningEnabled): Added.

• WebView.h:

(WebView::httpPipeliningEnabled): Added declaration.
(WebView::setHTTPPipeliningEnabled): Added declaration.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/network/cf/ResourceRequestCFNet.cpp (modified) (5 diffs)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebViewPrivate.idl (modified) (1 diff)
• WebKit/win/WebView.cpp (modified) (2 diffs)
• WebKit/win/WebView.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-03  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/59838> Implement HTTP pipelining for CoreFoundation-based networking
+
+        Reviewed by Antti Koivisto.
+
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::ResourceRequest::doUpdatePlatformRequest): Set the
+        priority on the request if HTTP pipelining is enabled.
+        (WebCore::ResourceRequest::doUpdateResourceRequest): Read the
+        priority from the request if HTTP pipelining is enabled.
+        (readBooleanPreference): Enable code when compiling with
+        USE(CFNETWORK).
+        (WebCore::initializeMaximumHTTPConnectionCountPerHost): Ditto.
+        Comment out setting the minimum fast lane priority on Windows
+        since it's not currently available.
+
 2011-05-03  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp

@@ -131 +131 @@
     CFURLRequestSetHTTPRequestMethod(cfRequest, requestMethod.get());
 
+    if (httpPipeliningEnabled())
+        wkSetHTTPPipeliningPriority(cfRequest, toHTTPPipeliningPriority(m_priority));
+
     setHeaderFields(cfRequest, httpHeaderFields());
     WebCore::setHTTPBody(cfRequest, httpBody());
@@ -173 +176 @@
     }
     m_allowCookies = CFURLRequestShouldHandleHTTPCookies(m_cfRequest.get());
+
+    if (httpPipeliningEnabled())
+        m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority(m_cfRequest.get()));
 
     m_httpHeaderFields.clear();
@@ -222 +228 @@
 }
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
 static inline bool readBooleanPreference(CFStringRef key)
 {
@@ -238 +244 @@
     unsigned maximumHTTPConnectionCountPerHost = wkInitializeMaximumHTTPConnectionCountPerHost(preferredConnectionCount);
 
-#if PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#if USE(CFNETWORK) || PLATFORM(MAC) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     static const unsigned unlimitedConnectionCount = 10000;
 
@@ -246 +252 @@
     if (ResourceRequest::httpPipeliningEnabled()) {
         wkSetHTTPPipeliningMaximumPriority(ResourceLoadPriorityHighest);
+#if !PLATFORM(WIN)
+        // FIXME: <rdar://problem/9375609> Implement minimum fast lane priority setting on Windows
         wkSetHTTPPipeliningMinimumFastLanePriority(ResourceLoadPriorityMedium);
+#endif
         // When pipelining do not rate-limit requests sent from WebCore since CFNetwork handles that.
         return unlimitedConnectionCount;

trunk/Source/WebKit/win/ChangeLog

@@ +1 @@
+2011-05-03  David Kilzer  <ddkilzer@apple.com>
+
+        <http://webkit.org/b/59838> Implement HTTP pipelining for CoreFoundation-based networking
+
+        Reviewed by Antti Koivisto.
+
+        * Interfaces/IWebViewPrivate.idl:
+        (IWebViewPrivate::httpPipeliningEnabled): Added declaration.
+        (IWebViewPrivate::setHTTPPipeliningEnabled): Added declaration.
+        * WebView.cpp:
+        (WebView::httpPipeliningEnabled): Added.
+        (WebView::setHTTPPipeliningEnabled): Added.
+        * WebView.h:
+        (WebView::httpPipeliningEnabled): Added declaration.
+        (WebView::setHTTPPipeliningEnabled): Added declaration.
+
 2011-05-03  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl

@@ -260 +260 @@
     */
     HRESULT setMinimumTimerInterval([in] double interval);
+
+    /*!
+        @method _HTTPPipeliningEnabled
+        @abstract Checks the HTTP pipelining status.
+        @discussion Defaults to NO.
+        @result YES if HTTP pipelining is enabled, NO if not enabled.
+     */
+    HRESULT httpPipeliningEnabled([out, retval] BOOL* enabled);
+
+    /*!
+        @method _setHTTPPipeliningEnabled:
+        @abstract Set the HTTP pipelining status.
+        @discussion Defaults to NO.
+        @param enabled The new HTTP pipelining status.
+     */
+    HRESULT setHTTPPipeliningEnabled([in] BOOL enabled);
 }

trunk/Source/WebKit/win/WebView.cpp

@@ -122 +122 @@
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/ResourceHandleClient.h>
+#include <WebCore/ResourceRequest.h>
 #include <WebCore/SchemeRegistry.h>
 #include <WebCore/ScriptValue.h>
@@ -6738 +6739 @@
 }
 
+HRESULT WebView::httpPipeliningEnabled(BOOL* enabled)
+{
+    if (!enabled)
+        return E_POINTER;
+    *enabled = ResourceRequest::httpPipeliningEnabled();
+    return S_OK;
+}
+
+HRESULT WebView::setHTTPPipeliningEnabled(BOOL enabled)
+{
+    ResourceRequest::setHTTPPipeliningEnabled(enabled);
+    return S_OK;
+}
+
 void WebView::setGlobalHistoryItem(HistoryItem* historyItem)
 {

trunk/Source/WebKit/win/WebView.h

@@ -830 +830 @@
     virtual HRESULT STDMETHODCALLTYPE setMinimumTimerInterval(
         /* [in] */ double);
+
+    virtual HRESULT STDMETHODCALLTYPE httpPipeliningEnabled(
+        /* [out, retval] */ BOOL* enabled);
+
+    virtual HRESULT STDMETHODCALLTYPE setHTTPPipeliningEnabled(
+        /* [in] */ BOOL);
 
     virtual HRESULT STDMETHODCALLTYPE setUsesLayeredWindow(BOOL);