Changeset 261405 in webkit

Timestamp:

May 8, 2020, 1:05:27 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Revert r260390
​https://bugs.webkit.org/show_bug.cgi?id=210759
<rdar://problem/62608140>

r260390 was intended to stop hitting some assertions in ~PendingFrameLoad, but it seems to have caused a regression.
Reverting it and removing the invalid assertions.

• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:

(WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::~PendingFrameLoad):
(WebKit::NetworkCache::SpeculativeLoadManager::~SpeculativeLoadManager):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-08  Alex Christensen  <achristensen@webkit.org>
+
+        Revert r260390
+        https://bugs.webkit.org/show_bug.cgi?id=210759
+        <rdar://problem/62608140>
+
+        r260390 was intended to stop hitting some assertions in ~PendingFrameLoad, but it seems to have caused a regression.
+        Reverting it and removing the invalid assertions.
+
+        * NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp:
+        (WebKit::NetworkCache::SpeculativeLoadManager::PendingFrameLoad::~PendingFrameLoad):
+        (WebKit::NetworkCache::SpeculativeLoadManager::~SpeculativeLoadManager):
+
 2020-05-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp

@@ -169 +169 @@
     ~PendingFrameLoad()
     {
-        ASSERT(m_didFinishLoad);
-        ASSERT(m_didRetrieveExistingEntry);
     }
 
@@ -268 +266 @@
 SpeculativeLoadManager::~SpeculativeLoadManager()
 {
-    for (auto& pendingFrameLoad : copyToVector(m_pendingFrameLoads.values())) {
-        if (pendingFrameLoad)
-            pendingFrameLoad->markLoadAsCompleted();
-    }
 }