[webkit-changes] [260496] trunk/Source/WebKit

Tue, 21 Apr 2020 20:54:14 -0700

Title: [260496] trunk/Source/WebKit
Revision
260496
Author
ryanhad...@apple.com
Date
2020-04-21 20:53:00 -0700 (Tue, 21 Apr 2020)

Log 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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (260495 => 260496)


--- trunk/Source/WebKit/ChangeLog	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/ChangeLog	2020-04-22 03:53:00 UTC (rev 260496)
@@ -1,3 +1,15 @@
+2020-04-21  Ryan Haddad  <ryanhad...@apple.com>
+
+        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
+
 2020-04-21  David Kilzer  <ddkil...@apple.com>
 
         IPC::Encoder::reserve() can be private

Modified: trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp (260495 => 260496)


--- trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/NetworkProcess/NetworkLoad.cpp	2020-04-22 03:53:00 UTC (rev 260496)
@@ -63,7 +63,6 @@
     , m_loadThrottleLatency(networkSession.loadThrottleLatency())
     , m_currentRequest(m_parameters.request)
 {
-    ASSERT(m_parameters.webPageProxyID);
     initialize(networkSession, blobRegistry);
 }

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (260495 => 260496)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp	2020-04-22 03:53:00 UTC (rev 260496)
@@ -1326,7 +1326,7 @@
 }
 #endif // ENABLE(RESOURCE_LOAD_STATISTICS)
 
-void NetworkProcess::preconnectTo(WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
+void NetworkProcess::preconnectTo(PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
 {
 #if ENABLE(SERVER_PRECONNECT)
 #if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
@@ -1335,7 +1335,6 @@
 #endif
 
     NetworkLoadParameters parameters;
-    parameters.webPageProxyID = webPageProxyID;
     parameters.request = ResourceRequest { url };
     parameters.isNavigatingToAppBoundDomain = isNavigatingToAppBoundDomain;
     if (!userAgent.isEmpty()) {

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (260495 => 260496)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h	2020-04-22 03:53:00 UTC (rev 260496)
@@ -274,7 +274,7 @@
     using CacheStorageRootPathCallback = CompletionHandler<void(String&&)>;
     void cacheStorageRootPath(PAL::SessionID, CacheStorageRootPathCallback&&);
 
-    void preconnectTo(WebPageProxyIdentifier, PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
+    void preconnectTo(PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
 
     void setSessionIsControlledByAutomation(PAL::SessionID, bool);
     bool sessionIsControlledByAutomation(PAL::SessionID) const;

Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (260495 => 260496)


--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in	2020-04-22 03:53:00 UTC (rev 260496)
@@ -79,7 +79,7 @@
     PrepareToSuspend(bool isSuspensionImminent) -> () Async
     ProcessDidResume()
 
-    PreconnectTo(WebKit::WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool Optional<WebKit::NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain);
+    PreconnectTo(PAL::SessionID sessionID, URL url, String userAgent, enum:uint8_t WebCore::StoredCredentialsPolicy storedCredentialsPolicy, enum:bool Optional<WebKit::NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain);
 
 #if ENABLE(RESOURCE_LOAD_STATISTICS)
     ClearPrevalentResource(PAL::SessionID sessionID, WebCore::RegistrableDomain resourceDomain) -> () Async

Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (260495 => 260496)


--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp	2020-04-22 03:53:00 UTC (rev 260496)
@@ -1420,11 +1420,11 @@
     sendWithAsyncReply(Messages::NetworkProcess::GetLocalStorageOriginDetails(sessionID), WTFMove(completionHandler));
 }
 
-void NetworkProcessProxy::preconnectTo(WebPageProxyIdentifier webPageProxyID, PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
+void NetworkProcessProxy::preconnectTo(PAL::SessionID sessionID, const URL& url, const String& userAgent, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, Optional<NavigatingToAppBoundDomain> isNavigatingToAppBoundDomain)
 {
     if (!url.isValid() || !url.protocolIsInHTTPFamily() || SecurityOrigin::isLocalHostOrLoopbackIPAddress(url.host()))
         return;
-    send(Messages::NetworkProcess::PreconnectTo(webPageProxyID, sessionID, url, userAgent, storedCredentialsPolicy, isNavigatingToAppBoundDomain), 0);
+    send(Messages::NetworkProcess::PreconnectTo(sessionID, url, userAgent, storedCredentialsPolicy, isNavigatingToAppBoundDomain), 0);
 }
 
 void NetworkProcessProxy::updateProcessAssertion()

Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (260495 => 260496)


--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h	2020-04-22 03:53:00 UTC (rev 260496)
@@ -111,7 +111,7 @@
 
     void getLocalStorageDetails(PAL::SessionID, CompletionHandler<void(Vector<LocalStorageDatabaseTracker::OriginDetails>&&)>&&);
 
-    void preconnectTo(WebPageProxyIdentifier, PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
+    void preconnectTo(PAL::SessionID, const URL&, const String&, WebCore::StoredCredentialsPolicy, Optional<NavigatingToAppBoundDomain>);
 
 #if ENABLE(RESOURCE_LOAD_STATISTICS)
     void clearPrevalentResource(PAL::SessionID, const RegistrableDomain&, CompletionHandler<void()>&&);

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (260495 => 260496)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2020-04-22 03:45:21 UTC (rev 260495)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp	2020-04-22 03:53:00 UTC (rev 260496)
@@ -4376,7 +4376,7 @@
         return;
 
     if (auto* networkProcess = m_process->processPool().networkProcess())
-        networkProcess->preconnectTo(identifier(), sessionID(), url, userAgent(), WebCore::StoredCredentialsPolicy::Use, m_isNavigatingToAppBoundDomain);
+        networkProcess->preconnectTo(sessionID(), url, userAgent(), WebCore::StoredCredentialsPolicy::Use, m_isNavigatingToAppBoundDomain);
 }
 
 void WebPageProxy::didDestroyNavigation(uint64_t navigationID)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to