Changeset 260496 in webkit


Ignore:
Timestamp:
Apr 21, 2020 8:53:00 PM (4 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, reverting r260475.

New assert caused layout tests to exit early on iOS and macOS

Reverted changeset:

"REGRESSION(r260410) Frequent Network process crashes"
​https://bugs.webkit.org/show_bug.cgi?id=210825
​https://trac.webkit.org/changeset/260475

Location:
trunk/Source/WebKit
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r260492 r260496  
     12020-04-21  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Unreviewed, reverting r260475.
     4
     5        New assert caused layout tests to exit early on iOS and macOS
     6
     7        Reverted changeset:
     8
     9        "REGRESSION(r260410) Frequent Network process crashes"
     10        https://bugs.webkit.org/show_bug.cgi?id=210825
     11        https://trac.webkit.org/changeset/260475
     12
    1132020-04-21  David Kilzer  <ddkilzer@apple.com>
    214

  • trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp

    r260475 r260496  
    6464    , m_currentRequest(m_parameters.request)
    6565{
    66     ASSERT(m_parameters.webPageProxyID);
    6766    initialize(networkSession, blobRegistry);
    6867}

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r260475 r260496  
    13271327#endif // ENABLE(RESOURCE_LOAD_STATISTICS)
    13281328
    1329 void NetworkProcess::preconnectTo(WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
     1329void NetworkProcess::preconnectTo(PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
    13301330{
    13311331#if ENABLE(SERVER_PRECONNECT)
    … …  
    13361336
    13371337    NetworkLoadParameters parameters;
    1338     parameters.webPageProxyID = webPageProxyID;
    13391338    parameters.request = ResourceRequest { url };
    13401339    parameters.isNavigatingToAppBoundDomain = isNavigatingToAppBoundDomain;

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r260475 r260496  
    275275    void cacheStorageRootPath(PAL::SessionID, CacheStorageRootPathCallback&&);
    276276
    277     void preconnectTo(WebPageProxyIdentifier, PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
     277    void preconnectTo(PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
    278278
    279279    void setSessionIsControlledByAutomation(PAL::SessionID, bool);

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r260475 r260496  
    8080    ProcessDidResume()
    8181
    82     PreconnectTo(WebKit::WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool Optional<WebKit::NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain);
     82    PreconnectTo(PAL::SessionID sessionID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool Optional<WebKit::NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain);
    8383
    8484#if ENABLE(RESOURCE_LOAD_STATISTICS)

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

    r260476 r260496  
    14211421}
    14221422
    1423 void NetworkProcessProxy::preconnectTo(WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
     1423void NetworkProcessProxy::preconnectTo(PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
    14241424{
    14251425    if (!url.isValid() || !url.protocolIsInHTTPFamily() || SecurityOrigin::isLocalHostOrLoopbackIPAddress(url.host()))
    14261426        return;
    1427     send(Messages::NetworkProcess::PreconnectTo(webPageProxyID, sessionID, url, userAgent, storedCredentialsPolicy, isNavigatingToAppBoundDomain), 0);
     1427    send(Messages::NetworkProcess::PreconnectTo(sessionID, url, userAgent, storedCredentialsPolicy, isNavigatingToAppBoundDomain), 0);
    14281428}
    14291429

  • trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h

    r260475 r260496  
    112112    void getLocalStorageDetails(PAL::SessionID, CompletionHandler<void(Vector<LocalStorageDatabaseTracker::OriginDetails>&&)>&&);
    113113
    114     void preconnectTo(WebPageProxyIdentifier, PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
     114    void preconnectTo(PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
    115115
    116116#if ENABLE(RESOURCE_LOAD_STATISTICS)

  • trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

    r260476 r260496  
    43774377
    43784378    if (auto* networkProcess = m_process->processPool().networkProcess())
    4379         networkProcess->preconnectTo(identifier(), sessionID(), url, userAgent(), WebCore::StoredCredentialsPolicy::Use, m_isNavigatingToAppBoundDomain);
     4379        networkProcess->preconnectTo(sessionID(), url, userAgent(), WebCore::StoredCredentialsPolicy::Use, m_isNavigatingToAppBoundDomain);
    43804380}
    43814381
Note: See TracChangeset for help on using the changeset viewer.