Attachment 347322 Details for Bug 188682 – Patch

[patch] Patch

bug-188682-20180816164525.patch (text/plain), 4.34 KB, created by Alex Christensen on 2018-08-16 16:45:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-16 16:45:26 PDT

Size: 4.34 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234970)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+2018-08-16  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 NOBODY (OOPS!).
>+
>+        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-16  Sihui Liu  <sihui_liu@apple.com>
> 
>         Remove unused parentProcessName from NetworkProcessCreationParameters
>Index: Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp	(revision 234941)
>+++ Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp	(working copy)
>@@ -41,9 +41,9 @@ namespace NetworkCache {
> 
> 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)
>     , m_bufferedDataForCache(SharedBuffer::create())
>@@ -52,6 +52,8 @@ SpeculativeLoad::SpeculativeLoad(Cache& 
>     ASSERT(!m_cacheEntry || m_cacheEntry->needsValidation());
> 
>     NetworkLoadParameters parameters;
>+    parameters.webPageID = globalFrameID.first;
>+    parameters.webFrameID = globalFrameID.second;
>     parameters.sessionID = PAL::SessionID::defaultSessionID();
>     parameters.storedCredentialsPolicy = StoredCredentialsPolicy::Use;
>     parameters.contentSniffingPolicy = ContentSniffingPolicy::DoNotSniffContent;
>@@ -87,7 +89,7 @@ auto SpeculativeLoad::didReceiveResponse
> 
>     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;
> 
>Index: Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h
>===================================================================
>--- Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h	(revision 234941)
>+++ Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h	(working copy)
>@@ -64,7 +64,7 @@ private:
>     void didComplete();
> 
>     Ref<Cache> m_cache;
>-    GlobalFrameID m_frameID;
>+    GlobalFrameID m_globalFrameID;
>     RevalidationCompletionHandler m_completionHandler;
>     WebCore::ResourceRequest m_originalRequest;
> 
>Index: Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
>===================================================================
>--- Source/WebKit/Shared/Authentication/AuthenticationManager.cpp	(revision 234941)
>+++ Source/WebKit/Shared/Authentication/AuthenticationManager.cpp	(working copy)
>@@ -111,8 +111,8 @@ Vector<uint64_t> AuthenticationManager::
> 
> 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) });
>

Flags:

youennf: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188682: 347322