Changeset 236107 in webkit

Timestamp:

Sep 18, 2018, 2:16:16 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235400 - Pass webPageID and webFrameID to NetworkLoad for speculative loads
​https://bugs.webkit.org/show_bug.cgi?id=188682

Reviewed by Youenn Fablet.

This also removes an authentication shortcut I introduced in r234941

• NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:

(WebKit::NetworkCache::SpeculativeLoad::SpeculativeLoad):
(WebKit::NetworkCache::SpeculativeLoad::didReceiveResponse):

• Shared/Authentication/AuthenticationManager.cpp:

(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):

Location:

releases/WebKitGTK/webkit-2.22/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (modified) (3 diffs)
• NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (modified) (1 diff)
• Shared/Authentication/AuthenticationManager.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog

@@ +1 @@
+2018-08-27  Alex Christensen  <achristensen@webkit.org>
+
+        Pass webPageID and webFrameID to NetworkLoad for speculative loads
+        https://bugs.webkit.org/show_bug.cgi?id=188682
+
+        Reviewed by Youenn Fablet.
+
+        This also removes an authentication shortcut I introduced in r234941
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+        (WebKit::NetworkCache::SpeculativeLoad::SpeculativeLoad):
+        (WebKit::NetworkCache::SpeculativeLoad::didReceiveResponse):
+        * Shared/Authentication/AuthenticationManager.cpp:
+        (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+
 2018-08-23  Tim Horton  <timothy_horton@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp

@@ -42 +42 @@
 using namespace WebCore;
 
-SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& frameID, const ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
+SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& globalFrameID, const ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
     : m_cache(cache)
-    , m_frameID(frameID)
+    , m_globalFrameID(globalFrameID)
     , m_completionHandler(WTFMove(completionHandler))
     , m_originalRequest(request)
@@ -53 +53 @@
 
     NetworkLoadParameters parameters;
+    parameters.webPageID = globalFrameID.first;
+    parameters.webFrameID = globalFrameID.second;
     parameters.sessionID = PAL::SessionID::defaultSessionID();
     parameters.storedCredentialsPolicy = StoredCredentialsPolicy::Use;
@@ -88 +90 @@
     bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
     if (validationSucceeded && m_cacheEntry)
-        m_cacheEntry = m_cache->update(m_originalRequest, m_frameID, *m_cacheEntry, m_response);
+        m_cacheEntry = m_cache->update(m_originalRequest, m_globalFrameID, *m_cacheEntry, m_response);
     else
         m_cacheEntry = nullptr;

releases/WebKitGTK/webkit-2.22/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h

@@ -65 +65 @@
 
     Ref<Cache> m_cache;
-    GlobalFrameID m_frameID;
+    GlobalFrameID m_globalFrameID;
     RevalidationCompletionHandler m_completionHandler;
     WebCore::ResourceRequest m_originalRequest;

releases/WebKitGTK/webkit-2.22/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp

@@ -112 +112 @@
 void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler&& completionHandler)
 {
-    if (!pageID || !frameID) // Initiated by SpeculativeLoadManager
-        return completionHandler(AuthenticationChallengeDisposition::RejectProtectionSpace, { });
+    ASSERT(pageID);
+    ASSERT(frameID);
 
     uint64_t challengeID = addChallengeToChallengeMap({ pageID, authenticationChallenge, WTFMove(completionHandler) });