Attachment 349554 Details for Bug 189537 – Patch

[patch] Patch

bug-189537-20180912091312.patch (text/plain), 13.25 KB, created by Alex Christensen on 2018-09-12 09:13:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-09-12 09:13:12 PDT

Size: 13.25 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 235916)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused httpPipeliningEnabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/network/cf/ResourceRequest.h:
>+        * platform/network/cf/ResourceRequestCFNet.cpp:
>+        (WebCore::ResourceRequest::doUpdatePlatformRequest):
>+        (WebCore::initializeMaximumHTTPConnectionCountPerHost):
>+        (WebCore::ResourceRequest::httpPipeliningEnabled): Deleted.
>+        (WebCore::ResourceRequest::setHTTPPipeliningEnabled): Deleted.
>+        * platform/network/cocoa/ResourceRequestCocoa.mm:
>+        (WebCore::ResourceRequest::doUpdatePlatformRequest):
>+
> 2018-09-11  Per Arne Vollan  <pvollan@apple.com>
> 
>         Addressing post-review feedback on r235619.
>Index: Source/WebCore/platform/network/cf/ResourceRequest.h
>===================================================================
>--- Source/WebCore/platform/network/cf/ResourceRequest.h	(revision 235912)
>+++ Source/WebCore/platform/network/cf/ResourceRequest.h	(working copy)
>@@ -90,9 +90,6 @@ public:
>     void setStorageSession(CFURLStorageSessionRef);
> #endif
> 
>-    WEBCORE_EXPORT static bool httpPipeliningEnabled();
>-    WEBCORE_EXPORT static void setHTTPPipeliningEnabled(bool);
>-
>     static bool resourcePrioritiesEnabled();
> 
> private:
>Index: Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
>===================================================================
>--- Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	(revision 235912)
>+++ Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp	(working copy)
>@@ -54,13 +54,6 @@ WTF_DECLARE_CF_TYPE_TRAIT(CFURL);
> 
> namespace WebCore {
> 
>-// FIXME: Make this a NetworkingContext property.
>-#if PLATFORM(IOS)
>-bool ResourceRequest::s_httpPipeliningEnabled = true;
>-#else
>-bool ResourceRequest::s_httpPipeliningEnabled = false;
>-#endif
>-
> #if USE(CFURLCONNECTION)
> 
> typedef void (*CFURLRequestSetContentDispositionEncodingFallbackArrayFunction)(CFMutableURLRequestRef, CFArrayRef);
>@@ -193,8 +186,9 @@ void ResourceRequest::doUpdatePlatformRe
> 
>     CFURLRequestSetHTTPRequestMethod(cfRequest, httpMethod().createCFString().get());
> 
>-    if (httpPipeliningEnabled())
>-        CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
>+#if PLATFORM(IOS)
>+    CFURLRequestSetShouldPipelineHTTP(cfRequest, true, true);
>+#endif
> 
>     if (resourcePrioritiesEnabled())
>         CFURLRequestSetRequestPriority(cfRequest, toPlatformRequestPriority(priority()));
>@@ -381,16 +375,6 @@ void ResourceRequest::updateFromDelegate
>     setInitiatorIdentifier(oldInitiatorIdentifier);
> }
> 
>-bool ResourceRequest::httpPipeliningEnabled()
>-{
>-    return s_httpPipeliningEnabled;
>-}
>-
>-void ResourceRequest::setHTTPPipeliningEnabled(bool flag)
>-{
>-    s_httpPipeliningEnabled = flag;
>-}
>-
> // FIXME: It is confusing that this function both sets connection count and determines maximum request count at network layer. This can and should be done separately.
> unsigned initializeMaximumHTTPConnectionCountPerHost()
> {
>@@ -400,11 +384,6 @@ unsigned initializeMaximumHTTPConnection
>     _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
>     unsigned maximumHTTPConnectionCountPerHost = _CFNetworkHTTPConnectionCacheGetLimit(kHTTPLoadWidth);
> 
>-    Boolean keyExistsAndHasValidFormat = false;
>-    Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
>-    if (keyExistsAndHasValidFormat)
>-        ResourceRequest::setHTTPPipeliningEnabled(prefValue);
>-
>     // Use WebCore scheduler when we can't use request priorities with CFNetwork.
>     if (!ResourceRequest::resourcePrioritiesEnabled())
>         return maximumHTTPConnectionCountPerHost;
>Index: Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
>===================================================================
>--- Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	(revision 235912)
>+++ Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm	(working copy)
>@@ -165,8 +165,9 @@ void ResourceRequest::doUpdatePlatformRe
>     else
>         nsRequest = [[NSMutableURLRequest alloc] initWithURL:url()];
> 
>-    if (ResourceRequest::httpPipeliningEnabled())
>-        CFURLRequestSetShouldPipelineHTTP([nsRequest _CFURLRequest], true, true);
>+#if PLATFORM(IOS)
>+    CFURLRequestSetShouldPipelineHTTP([nsRequest _CFURLRequest], true, true);
>+#endif
> 
>     if (ResourceRequest::resourcePrioritiesEnabled())
>         CFURLRequestSetRequestPriority([nsRequest _CFURLRequest], toPlatformRequestPriority(priority()));
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235928)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused httpPipeliningEnabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::initializeNetworkSettings):
>+        * UIProcess/API/C/WKContext.cpp:
>+        (WKContextSetHTTPPipeliningEnabled): Deleted.
>+        * UIProcess/API/C/WKContextPrivate.h:
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::setHTTPPipeliningEnabled): Deleted.
>+        (WebKit::WebProcessPool::httpPipeliningEnabled const): Deleted.
>+        * UIProcess/WebProcessPool.h:
>+
> 2018-09-11  Olivia Barnett  <obarnett@apple.com>
> 
>         Implement the Web Share API for mac
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(revision 235912)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(working copy)
>@@ -55,11 +55,6 @@ static void initializeNetworkSettings()
> 
>     _CFNetworkHTTPConnectionCacheSetLimit(kHTTPLoadWidth, preferredConnectionCount);
> 
>-    Boolean keyExistsAndHasValidFormat = false;
>-    Boolean prefValue = CFPreferencesGetAppBooleanValue(CFSTR("WebKitEnableHTTPPipelining"), kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
>-    if (keyExistsAndHasValidFormat)
>-        WebCore::ResourceRequest::setHTTPPipeliningEnabled(prefValue);
>-
>     if (WebCore::ResourceRequest::resourcePrioritiesEnabled()) {
>         const unsigned fastLaneConnectionCount = 1;
> 
>Index: Source/WebKit/UIProcess/WebProcessPool.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebProcessPool.cpp	(revision 235912)
>+++ Source/WebKit/UIProcess/WebProcessPool.cpp	(working copy)
>@@ -1678,24 +1678,6 @@ void WebProcessPool::setAutomationSessio
> #endif
> }
> 
>-void WebProcessPool::setHTTPPipeliningEnabled(bool enabled)
>-{
>-#if PLATFORM(COCOA)
>-    ResourceRequest::setHTTPPipeliningEnabled(enabled);
>-#else
>-    UNUSED_PARAM(enabled);
>-#endif
>-}
>-
>-bool WebProcessPool::httpPipeliningEnabled() const
>-{
>-#if PLATFORM(COCOA)
>-    return ResourceRequest::httpPipeliningEnabled();
>-#else
>-    return false;
>-#endif
>-}
>-
> void WebProcessPool::getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&& callbackFunction)
> {
>     if (!statisticsMask) {
>Index: Source/WebKit/UIProcess/WebProcessPool.h
>===================================================================
>--- Source/WebKit/UIProcess/WebProcessPool.h	(revision 235912)
>+++ Source/WebKit/UIProcess/WebProcessPool.h	(working copy)
>@@ -305,10 +305,6 @@ public:
>     void setAutomationSession(RefPtr<WebAutomationSession>&&);
>     WebAutomationSession* automationSession() const { return m_automationSession.get(); }
> 
>-    // Defaults to false.
>-    void setHTTPPipeliningEnabled(bool);
>-    bool httpPipeliningEnabled() const;
>-
>     void getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&&);
>     
>     bool javaScriptConfigurationFileEnabled() { return m_javaScriptConfigurationFileEnabled; }
>Index: Source/WebKit/UIProcess/API/C/WKContext.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContext.cpp	(revision 235912)
>+++ Source/WebKit/UIProcess/API/C/WKContext.cpp	(working copy)
>@@ -508,11 +508,6 @@ void WKContextEnableProcessTermination(W
>     toImpl(contextRef)->enableProcessTermination();
> }
> 
>-void WKContextSetHTTPPipeliningEnabled(WKContextRef contextRef, bool enabled)
>-{
>-    toImpl(contextRef)->setHTTPPipeliningEnabled(enabled);
>-}
>-
> void WKContextWarmInitialProcess(WKContextRef contextRef)
> {
>     toImpl(contextRef)->prewarmProcess();
>Index: Source/WebKit/UIProcess/API/C/WKContextPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContextPrivate.h	(revision 235912)
>+++ Source/WebKit/UIProcess/API/C/WKContextPrivate.h	(working copy)
>@@ -82,8 +82,6 @@ WK_EXPORT void WKContextAllowSpecificHTT
> WK_EXPORT void WKContextDisableProcessTermination(WKContextRef context);
> WK_EXPORT void WKContextEnableProcessTermination(WKContextRef context);
> 
>-WK_EXPORT void WKContextSetHTTPPipeliningEnabled(WKContextRef context, bool enabled);
>-
> WK_EXPORT void WKContextWarmInitialProcess(WKContextRef context);
> 
> // FIXME: This function is temporary and useful during the development of the NetworkProcess feature.
>Index: Source/WebKitLegacy/mac/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/mac/ChangeLog	(revision 235937)
>+++ Source/WebKitLegacy/mac/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused httpPipeliningEnabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView/WebView.mm:
>+        (+[WebView _HTTPPipeliningEnabled]): Deleted.
>+        (+[WebView _setHTTPPipeliningEnabled:]): Deleted.
>+        * WebView/WebViewPrivate.h:
>+
> 2018-09-12  Guillaume Emont  <guijemont@igalia.com>
> 
>         Add IGNORE_WARNING_.* macros
>Index: Source/WebKitLegacy/mac/WebView/WebView.mm
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebView.mm	(revision 235912)
>+++ Source/WebKitLegacy/mac/WebView/WebView.mm	(working copy)
>@@ -5189,16 +5189,6 @@ + (void)_setLoadResourcesSerially:(BOOL)
>     webResourceLoadScheduler().setSerialLoadingEnabled(serialize);
> }
> 
>-+ (BOOL)_HTTPPipeliningEnabled
>-{
>-    return ResourceRequest::httpPipeliningEnabled();
>-}
>-
>-+ (void)_setHTTPPipeliningEnabled:(BOOL)enabled
>-{
>-    ResourceRequest::setHTTPPipeliningEnabled(enabled);
>-}
>-
> - (void)_didScrollDocumentInFrameView:(WebFrameView *)frameView
> {
>     [self hideFormValidationMessage];
>Index: Source/WebKitLegacy/mac/WebView/WebViewPrivate.h
>===================================================================
>--- Source/WebKitLegacy/mac/WebView/WebViewPrivate.h	(revision 235912)
>+++ Source/WebKitLegacy/mac/WebView/WebViewPrivate.h	(working copy)
>@@ -893,22 +893,6 @@ Could be worth adding to the API.
> // Deprecated. Use findString.
> - (BOOL)searchFor:(NSString *)string direction:(BOOL)forward caseSensitive:(BOOL)caseFlag wrap:(BOOL)wrapFlag startInSelection:(BOOL)startInSelection;
> 
>-/*!
>-    @method _HTTPPipeliningEnabled
>-    @abstract Checks the HTTP pipelining status.
>-    @discussion Defaults to NO.
>-    @result YES if HTTP pipelining is enabled, NO if not enabled.
>- */
>-+ (BOOL)_HTTPPipeliningEnabled;
>-
>-/*!
>-    @method _setHTTPPipeliningEnabled:
>-    @abstract Set the HTTP pipelining status.
>-    @discussion Defaults to NO.
>-    @param enabled The new HTTP pipelining status.
>- */
>-+ (void)_setHTTPPipeliningEnabled:(BOOL)enabled;
>-
> @property (nonatomic, copy, getter=_sourceApplicationAuditData, setter=_setSourceApplicationAuditData:) NSData *sourceApplicationAuditData;
> 
> - (void)_setFontFallbackPrefersPictographs:(BOOL)flag;
>Index: Source/WebKitLegacy/win/ChangeLog
>===================================================================
>--- Source/WebKitLegacy/win/ChangeLog	(revision 235912)
>+++ Source/WebKitLegacy/win/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-09-12  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused httpPipeliningEnabled
>+        https://bugs.webkit.org/show_bug.cgi?id=189537
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebView.cpp:
>+        (WebView::httpPipeliningEnabled):
>+        (WebView::setHTTPPipeliningEnabled):
>+
> 2018-09-06  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Refactor WebCore::EditAction to be an 8-bit enum class
>Index: Source/WebKitLegacy/win/WebView.cpp
>===================================================================
>--- Source/WebKitLegacy/win/WebView.cpp	(revision 235912)
>+++ Source/WebKitLegacy/win/WebView.cpp	(working copy)
>@@ -7506,13 +7506,12 @@ HRESULT WebView::httpPipeliningEnabled(_
> {
>     if (!enabled)
>         return E_POINTER;
>-    *enabled = ResourceRequest::httpPipeliningEnabled();
>+    *enabled = false;
>     return S_OK;
> }
> 
>-HRESULT WebView::setHTTPPipeliningEnabled(BOOL enabled)
>+HRESULT WebView::setHTTPPipeliningEnabled(BOOL)
> {
>-    ResourceRequest::setHTTPPipeliningEnabled(enabled);
>     return S_OK;
> }
>

Flags:

cdumez: review+
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 189537: 349514 | 349554 | 349648