Modified: trunk/Source/WebKit/ChangeLog (235000 => 235001)
--- trunk/Source/WebKit/ChangeLog 2018-08-18 00:09:32 UTC (rev 235000)
+++ trunk/Source/WebKit/ChangeLog 2018-08-18 00:11:49 UTC (rev 235001)
@@ -1,3 +1,16 @@
+2018-08-17 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r234991.
+
+ Caused an assertion failure on the bots.
+
+ Reverted changeset:
+
+ "Pass webPageID and webFrameID to NetworkLoad for speculative
+ loads"
+ https://bugs.webkit.org/show_bug.cgi?id=188682
+ https://trac.webkit.org/changeset/234991
+
2018-08-17 Alex Christensen <[email protected]>
Add some plumbing for safe browsing
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (235000 => 235001)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2018-08-18 00:09:32 UTC (rev 235000)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2018-08-18 00:11:49 UTC (rev 235001)
@@ -41,9 +41,9 @@
using namespace WebCore;
-SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& globalFrameID, const ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
+SpeculativeLoad::SpeculativeLoad(Cache& cache, const GlobalFrameID& frameID, const ResourceRequest& request, std::unique_ptr<NetworkCache::Entry> cacheEntryForValidation, RevalidationCompletionHandler&& completionHandler)
: m_cache(cache)
- , m_globalFrameID(globalFrameID)
+ , m_frameID(frameID)
, m_completionHandler(WTFMove(completionHandler))
, m_originalRequest(request)
, m_bufferedDataForCache(SharedBuffer::create())
@@ -52,8 +52,6 @@
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;
@@ -89,7 +87,7 @@
bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
if (validationSucceeded && m_cacheEntry)
- m_cacheEntry = m_cache->update(m_originalRequest, m_globalFrameID, *m_cacheEntry, m_response);
+ m_cacheEntry = m_cache->update(m_originalRequest, m_frameID, *m_cacheEntry, m_response);
else
m_cacheEntry = nullptr;
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (235000 => 235001)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2018-08-18 00:09:32 UTC (rev 235000)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2018-08-18 00:11:49 UTC (rev 235001)
@@ -64,7 +64,7 @@
void didComplete();
Ref<Cache> m_cache;
- GlobalFrameID m_globalFrameID;
+ GlobalFrameID m_frameID;
RevalidationCompletionHandler m_completionHandler;
WebCore::ResourceRequest m_originalRequest;
Modified: trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp (235000 => 235001)
--- trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp 2018-08-18 00:09:32 UTC (rev 235000)
+++ trunk/Source/WebKit/Shared/Authentication/AuthenticationManager.cpp 2018-08-18 00:11:49 UTC (rev 235001)
@@ -111,8 +111,8 @@
void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler&& completionHandler)
{
- ASSERT(pageID);
- ASSERT(frameID);
+ if (!pageID || !frameID) // Initiated by SpeculativeLoadManager
+ return completionHandler(AuthenticationChallengeDisposition::RejectProtectionSpace, { });
uint64_t challengeID = addChallengeToChallengeMap({ pageID, authenticationChallenge, WTFMove(completionHandler) });
