Changeset 82900 in webkit


Ignore:
Timestamp:
Apr 4, 2011 9:37:05 PM (13 years ago)
Author:
ddkilzer@apple.com
Message:

<​http://webkit.org/b/57384> CFNetwork and WebCore load priorities should match

Reviewed by Alexey Proskuryakov.

Source/WebCore:

  • WebCore.exp.in: Export wkSetHTTPPipeliningMaximumPriority().
  • platform/mac/WebCoreSystemInterface.h:

(wkSetHTTPPipeliningMaximumPriority): Added function pointer
declaration.

  • platform/mac/WebCoreSystemInterface.mm:

(wkSetHTTPPipeliningMaximumPriority): Added function pointer.

  • platform/network/cf/ResourceRequestCFNet.cpp:

(WebCore::initializeMaximumHTTPConnectionCountPerHost): Call
wkSetHTTPPipeliningMaximumPriority() to set the maximum HTTP
pipelining priority.

  • platform/network/cf/ResourceRequestCFNet.h:

(WebCore::toResourceLoadPriority): Renamed from
mapHTTPPipeliningPriorityToResourceLoadPriority(). Updated to
to handle Unresolved case.
(WebCore::toHTTPPipeliningPriority): Renamed from
mapResourceLoadPriorityToHTTPPipeliningPriority(). Updated to
handle Unresolved case.

  • platform/network/mac/ResourceRequestMac.mm:

(WebCore::ResourceRequest::doUpdateResourceRequest): Switched to
use toResourceLoadPriority().
(WebCore::ResourceRequest::doUpdatePlatformRequest): Switched to
use toHTTPPipeliningPriority(). Moved
shouldForceHTTPPipeliningPriorityHigh() check into the argument
of toHTTPPipeliningPriority() instead of hard-coding a
now-incorrect value.

Source/WebKit/mac:

  • WebCoreSupport/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Added initialization for
wkSetHTTPPipeliningMaximumPriority().

Source/WebKit2:

  • WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:

(InitWebCoreSystemInterface): Added initialization for
wkSetHTTPPipeliningMaximumPriority().

WebKitLibraries:

  • WebKitSystemInterface.h:

(WKSetHTTPPipeliningMaximumPriority): Added declaration.
(WKExtractWordDefinitionTokenRangeFromContextualString): Added
missing declaration from r81890.
(WKShowWordDefinitionWindow): Ditto.
(WKHideWordDefinitionWindow): Ditto.

  • libWebKitSystemInterfaceLeopard.a: Updated.
  • libWebKitSystemInterfaceSnowLeopard.a: Updated.
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r82899 r82900  
     12011-04-04  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/57384> CFNetwork and WebCore load priorities should match
     4
     5        Reviewed by Alexey Proskuryakov.
     6
     7        * WebCore.exp.in: Export wkSetHTTPPipeliningMaximumPriority().
     8        * platform/mac/WebCoreSystemInterface.h:
     9        (wkSetHTTPPipeliningMaximumPriority): Added function pointer
     10        declaration.
     11        * platform/mac/WebCoreSystemInterface.mm:
     12        (wkSetHTTPPipeliningMaximumPriority): Added function pointer.
     13        * platform/network/cf/ResourceRequestCFNet.cpp:
     14        (WebCore::initializeMaximumHTTPConnectionCountPerHost): Call
     15        wkSetHTTPPipeliningMaximumPriority() to set the maximum HTTP
     16        pipelining priority.
     17        * platform/network/cf/ResourceRequestCFNet.h:
     18        (WebCore::toResourceLoadPriority): Renamed from
     19        mapHTTPPipeliningPriorityToResourceLoadPriority().  Updated to
     20        to handle Unresolved case.
     21        (WebCore::toHTTPPipeliningPriority): Renamed from
     22        mapResourceLoadPriorityToHTTPPipeliningPriority().  Updated to
     23        handle Unresolved case.
     24        * platform/network/mac/ResourceRequestMac.mm:
     25        (WebCore::ResourceRequest::doUpdateResourceRequest): Switched to
     26        use toResourceLoadPriority().
     27        (WebCore::ResourceRequest::doUpdatePlatformRequest): Switched to
     28        use toHTTPPipeliningPriority().  Moved
     29        shouldForceHTTPPipeliningPriorityHigh() check into the argument
     30        of toHTTPPipeliningPriority() instead of hard-coding a
     31        now-incorrect value.
     32
    1332011-04-04  MORITA Hajime  <morrita@google.com>
    234

  • trunk/Source/WebCore/WebCore.exp.in

    r82868 r82900  
    13671367_wkSetDragImage
    13681368_wkSetHTTPCookiesForURL
     1369_wkSetHTTPPipeliningMaximumPriority
    13691370_wkSetHTTPPipeliningPriority
    13701371_wkSetNSURLConnectionDefersCallbacks

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h

    r82709 r82900  
    156156extern unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    157157extern int (*wkGetHTTPPipeliningPriority)(NSURLRequest *);
     158extern void (*wkSetHTTPPipeliningMaximumPriority)(int maximumPriority);
    158159extern void (*wkSetHTTPPipeliningPriority)(NSMutableURLRequest *, int priority);
    159160extern void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);

  • trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm

    r82709 r82900  
    9292unsigned (*wkInitializeMaximumHTTPConnectionCountPerHost)(unsigned preferredConnectionCount);
    9393int (*wkGetHTTPPipeliningPriority)(NSURLRequest *);
     94void (*wkSetHTTPPipeliningMaximumPriority)(int priority);
    9495void (*wkSetHTTPPipeliningPriority)(NSMutableURLRequest *, int priority);
    9596void (*wkSetCONNECTProxyForStream)(CFReadStreamRef, CFStringRef proxyHost, CFNumberRef proxyPort);

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

    r80381 r82900  
    3030
    3131#if PLATFORM(MAC)
     32#include "ResourceLoadPriority.h"
    3233#include "WebCoreSystemInterface.h"
    3334#endif
    … …  
    219220#if PLATFORM(MAC)
    220221    if (isHTTPPipeliningEnabled()) {
     222        wkSetHTTPPipeliningMaximumPriority(ResourceLoadPriorityHighest);
    221223        // When pipelining do not rate-limit requests sent from WebCore since CFNetwork handles that.
    222224        return unlimitedConnectionCount;

  • trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.h

    r80734 r82900  
    4242#endif
    4343
    44 inline ResourceLoadPriority mapHTTPPipeliningPriorityToResourceLoadPriority(int priority)
     44inline ResourceLoadPriority toResourceLoadPriority(int priority)
    4545{
    4646    switch (priority) {
     47    case -1:
     48        return ResourceLoadPriorityUnresolved;
    4749    case 0:
     50        return ResourceLoadPriorityVeryLow;
     51    case 1:
    4852        return ResourceLoadPriorityLow;
    49     case 1:
     53    case 2:
    5054        return ResourceLoadPriorityMedium;
    51     case 2:
     55    case 3:
    5256        return ResourceLoadPriorityHigh;
    53     case 3:
    54         return ResourceLoadPriorityUnresolved;
    5557    default:
    5658        ASSERT_NOT_REACHED();
    … …  
    5961}
    6062
    61 inline int mapResourceLoadPriorityToHTTPPipeliningPriority(ResourceLoadPriority priority)
     63inline int toHTTPPipeliningPriority(ResourceLoadPriority priority)
    6264{
    6365    switch (priority) {
     66    case ResourceLoadPriorityUnresolved:
     67        return -1;
    6468    case ResourceLoadPriorityVeryLow:
     69        return 0;
    6570    case ResourceLoadPriorityLow:
    66         return 0;
     71        return 1;
    6772    case ResourceLoadPriorityMedium:
    68         return 1;
     73        return 2;
    6974    case ResourceLoadPriorityHigh:
    70         return 2;
    71     case ResourceLoadPriorityUnresolved:
    7275        return 3;
    7376    }

  • trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm

    r80381 r82900  
    7272#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    7373    if (isHTTPPipeliningEnabled() && !shouldForceHTTPPipeliningPriorityHigh())
    74         m_priority = mapHTTPPipeliningPriorityToResourceLoadPriority(wkGetHTTPPipeliningPriority(m_nsRequest.get()));
     74        m_priority = toResourceLoadPriority(wkGetHTTPPipeliningPriority(m_nsRequest.get()));
    7575#endif
    7676
    … …  
    122122#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
    123123    if (isHTTPPipeliningEnabled()) {
    124         int priority = mapResourceLoadPriorityToHTTPPipeliningPriority(m_priority);
    125         wkSetHTTPPipeliningPriority(nsRequest, shouldForceHTTPPipeliningPriorityHigh() ? 2 : priority);
     124        int priority = toHTTPPipeliningPriority(shouldForceHTTPPipeliningPriorityHigh() ? ResourceLoadPriorityHigh : m_priority);
     125        wkSetHTTPPipeliningPriority(nsRequest, priority);
    126126    }
    127127#endif

  • trunk/Source/WebKit/mac/ChangeLog

    r82870 r82900  
     12011-04-04  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/57384> CFNetwork and WebCore load priorities should match
     4
     5        Reviewed by Alexey Proskuryakov.
     6
     7        * WebCoreSupport/WebSystemInterface.mm:
     8        (InitWebCoreSystemInterface): Added initialization for
     9        wkSetHTTPPipeliningMaximumPriority().
     10
    1112011-04-04  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm

    r82709 r82900  
    7777    INIT(SetCookieStoragePrivateBrowsingEnabled);
    7878    INIT(SetDragImage);
     79    INIT(SetHTTPPipeliningMaximumPriority);
    7980    INIT(SetHTTPPipeliningPriority);
    8081    INIT(SetNSURLConnectionDefersCallbacks);

  • trunk/Source/WebKit2/ChangeLog

    r82896 r82900  
     12011-04-04  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/57384> CFNetwork and WebCore load priorities should match
     4
     5        Reviewed by Alexey Proskuryakov.
     6
     7        * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
     8        (InitWebCoreSystemInterface): Added initialization for
     9        wkSetHTTPPipeliningMaximumPriority().
     10
    1112011-04-04  Anders Carlsson  <andersca@apple.com>
    212

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm

    r82709 r82900  
    8585        INIT(SetCookieStoragePrivateBrowsingEnabled);
    8686        INIT(SetDragImage);
     87        INIT(SetHTTPPipeliningMaximumPriority);
    8788        INIT(SetHTTPPipeliningPriority);
    8889        INIT(SetNSURLConnectionDefersCallbacks);

  • trunk/WebKitLibraries/ChangeLog

    r82861 r82900  
     12011-04-04  David Kilzer  <ddkilzer@apple.com>
     2
     3        <http://webkit.org/b/57384> CFNetwork and WebCore load priorities should match
     4
     5        Reviewed by Alexey Proskuryakov.
     6
     7        * WebKitSystemInterface.h:
     8        (WKSetHTTPPipeliningMaximumPriority): Added declaration.
     9        (WKExtractWordDefinitionTokenRangeFromContextualString): Added
     10        missing declaration from r81890.
     11        (WKShowWordDefinitionWindow): Ditto.
     12        (WKHideWordDefinitionWindow): Ditto.
     13        * libWebKitSystemInterfaceLeopard.a: Updated.
     14        * libWebKitSystemInterfaceSnowLeopard.a: Updated.
     15
    1162011-04-04  Steve Falkenburg  <sfalken@apple.com>
    217

  • trunk/WebKitLibraries/WebKitSystemInterface.h

    r82709 r82900  
    353353unsigned WKInitializeMaximumHTTPConnectionCountPerHost(unsigned preferredConnectionCount);
    354354int WKGetHTTPPipeliningPriority(NSURLRequest *);
     355void WKSetHTTPPipeliningMaximumPriority(int maximumPriority);
    355356void WKSetHTTPPipeliningPriority(NSMutableURLRequest *, int priority);
    356357
Note: See TracChangeset for help on using the changeset viewer.