Attachment 91750 Details for Bug 59838 – Patch

[patch] Patch

20110429153003.patch (text/plain), 8.88 KB, created by David Kilzer (:ddkilzer) on 2011-04-29 15:30:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2011-04-29 15:30:04 PDT

Size: 8.88 KB

patch

obsolete

>Subversion Revision: 85353
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3a08b13399b3a215be90b66afd89cb4905e4c75f..44b965f7472f849a664f47aef900d5244999258b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,20 @@
> 2011-04-29  David Kilzer  <ddkilzer@apple.com>
> 
>+        <http://webkit.org/b/00000> Implement HTTP pipelining for CoreFoundation-based networking
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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.
>+
>+2011-04-29  David Kilzer  <ddkilzer@apple.com>
>+
>         Remove WML
>         https://bugs.webkit.org/show_bug.cgi?id=59678
> 
>diff --git a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
>index 6a390140d13a3bb8a866f0f3ec8d8d21830eb3f4..7666c077fed76e619e66f8cafb4ec0e5510a7b81 100644
>--- a/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
>+++ b/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
>@@ -130,6 +130,9 @@ void ResourceRequest::doUpdatePlatformRequest()
>     RetainPtr<CFStringRef> requestMethod(AdoptCF, httpMethod().createCFString());
>     CFURLRequestSetHTTPRequestMethod(cfRequest, requestMethod.get());
> 
>+    if (httpPipeliningEnabled())
>+        wkSetHTTPPipeliningPriority(cfRequest, toHTTPPipeliningPriority(m_priority));
>+
>     setHeaderFields(cfRequest, httpHeaderFields());
>     WebCore::setHTTPBody(cfRequest, httpBody());
>     CFURLRequestSetShouldHandleHTTPCookies(cfRequest, allowCookies());
>@@ -173,6 +176,9 @@ void ResourceRequest::doUpdateResourceRequest()
>     }
>     m_allowCookies = CFURLRequestShouldHandleHTTPCookies(m_cfRequest.get());
> 
>+    if (httpPipeliningEnabled())
>+        m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority(m_cfRequest.get()));
>+
>     m_httpHeaderFields.clear();
>     if (CFDictionaryRef headers = CFURLRequestCopyAllHTTPHeaderFields(m_cfRequest.get())) {
>         CFIndex headerCount = CFDictionaryGetCount(headers);
>@@ -221,7 +227,7 @@ void ResourceRequest::setHTTPPipeliningEnabled(bool flag)
>     s_httpPipeliningEnabled = flag;
> }
> 
>-#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)
> {
>     Boolean keyExistsAndHasValidFormat;
>@@ -237,7 +243,7 @@ unsigned initializeMaximumHTTPConnectionCountPerHost()
>     // Always set the connection count per host, even when pipelining.
>     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;
> 
>     if (!ResourceRequest::httpPipeliningEnabled() && readBooleanPreference(CFSTR("WebKitEnableHTTPPipelining")))
>diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
>index f6d1897d2b36febc72042b69daf5ef430300af67..58217044d8c1a82f4d01e2d59cedd1493e292700 100644
>--- a/Source/WebKit/win/ChangeLog
>+++ b/Source/WebKit/win/ChangeLog
>@@ -1,3 +1,19 @@
>+2011-04-29  David Kilzer  <ddkilzer@apple.com>
>+
>+        <http://webkit.org/b/00000> Implement HTTP pipelining for CoreFoundation-based networking
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-04-28  Adam Barth  <abarth@webkit.org>
> 
>         Reviewed by Eric Seidel.
>diff --git a/Source/WebKit/win/Interfaces/IWebViewPrivate.idl b/Source/WebKit/win/Interfaces/IWebViewPrivate.idl
>index 6c6abfd1a54c3a8a1661e131aadd3346db8c1b8b..13f942f6f4a84861b441a93a80069284a2b5ba82 100644
>--- a/Source/WebKit/win/Interfaces/IWebViewPrivate.idl
>+++ b/Source/WebKit/win/Interfaces/IWebViewPrivate.idl
>@@ -259,4 +259,20 @@ interface IWebViewPrivate : IUnknown
>         - (double)interval;
>     */
>     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);
> }
>diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
>index 78b9ba84feda7ac23d8d4f87c7005446dfcaeab0..f12b941c487359694d23854bab65791ac6039d8c 100644
>--- a/Source/WebKit/win/WebView.cpp
>+++ b/Source/WebKit/win/WebView.cpp
>@@ -121,6 +121,7 @@
> #include <WebCore/RenderWidget.h>
> #include <WebCore/ResourceHandle.h>
> #include <WebCore/ResourceHandleClient.h>
>+#include <WebCore/ResourceRequest.h>
> #include <WebCore/SchemeRegistry.h>
> #include <WebCore/ScriptValue.h>
> #include <WebCore/Scrollbar.h>
>@@ -6719,6 +6720,20 @@ HRESULT WebView::setMinimumTimerInterval(double interval)
>     return S_OK;
> }
> 
>+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)
> {
>     m_globalHistoryItem = historyItem;
>diff --git a/Source/WebKit/win/WebView.h b/Source/WebKit/win/WebView.h
>index c80b135d3f0cc19a78d29d051eff873bde28fb22..4b2689db9337725ddcfe9cfd9ffca5f38ff48030 100644
>--- a/Source/WebKit/win/WebView.h
>+++ b/Source/WebKit/win/WebView.h
>@@ -825,6 +825,12 @@ public:
>     virtual HRESULT STDMETHODCALLTYPE setMinimumTimerInterval(
>         /* [in] */ double);
> 
>+    virtual HRESULT STDMETHODCALLTYPE httpPipeliningEnabled(
>+        /* [out, retval] */ BOOL* enabled);
>+
>+    virtual HRESULT STDMETHODCALLTYPE setHTTPPipeliningEnabled(
>+        /* [in] */ BOOL enabled);
>+
>     virtual HRESULT STDMETHODCALLTYPE setUsesLayeredWindow(BOOL);
>     virtual HRESULT STDMETHODCALLTYPE usesLayeredWindow(BOOL*);
> 
>diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
>index 9cddcd02d50d5419c1cc564739db996f3520d4f6..91c5236387b8dbb692bb47beeec4aff48e4dbdb9 100644
>--- a/WebKitLibraries/ChangeLog
>+++ b/WebKitLibraries/ChangeLog
>@@ -1,3 +1,14 @@
>+2011-04-29  David Kilzer  <ddkilzer@apple.com>
>+
>+        <http://webkit.org/b/00000> Implement HTTP pipelining for CoreFoundation-based networking
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
>+        (wkGetHTTPPipeliningPriority): Added declaration.
>+        (wkSetHTTPPipeliningMaximumPriority): Added declaration.
>+        (wkSetHTTPPipeliningPriority): Added declaration.
>+
> 2011-04-28  David Levin  <levin@chromium.org>
> 
>         Reviewed by Adam Barth.
>diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
>index 08380288819e589c5990d5e8a493b071fa229292..b2cda98a73e8d4f4bf4a82645b713fb795d442a1 100644
>--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
>+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
>@@ -108,6 +108,9 @@ CFArrayRef wkCFURLCacheCopyAllHostNamesInPersistentStore();
> void wkCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames);
> 
> unsigned wkInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
>+int wkGetHTTPPipeliningPriority(CFURLRequestRef);
>+void wkSetHTTPPipeliningMaximumPriority(int maximumPriority);
>+void wkSetHTTPPipeliningPriority(CFURLRequestRef, int priority);
> 
> void wkSetCONNECTProxyForStream(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);
> void wkSetCONNECTProxyAuthorizationForStream(CFReadStreamRef, CFStringRef proxyAuthorizationString);

Flags:

eric: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 59838: 91750 | 92093