Title: [261405] trunk/Source/WebKit
- Revision
- 261405
- Author
- [email protected]
- Date
- 2020-05-08 13:05:27 -0700 (Fri, 08 May 2020)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (261404 => 261405)
--- trunk/Source/WebKit/ChangeLog 2020-05-08 19:59:37 UTC (rev 261404)
+++ trunk/Source/WebKit/ChangeLog 2020-05-08 20:05:27 UTC (rev 261405)
@@ -1,3 +1,16 @@
+2020-05-08 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[iOS] caret appears in the middle of a search field when field is focused on agoda.com
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp (261404 => 261405)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2020-05-08 19:59:37 UTC (rev 261404)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp 2020-05-08 20:05:27 UTC (rev 261405)
@@ -168,8 +168,6 @@
~PendingFrameLoad()
{
- ASSERT(m_didFinishLoad);
- ASSERT(m_didRetrieveExistingEntry);
}
void registerSubresourceLoad(const ResourceRequest& request, const Key& subresourceKey)
@@ -267,10 +265,6 @@
SpeculativeLoadManager::~SpeculativeLoadManager()
{
- for (auto& pendingFrameLoad : copyToVector(m_pendingFrameLoads.values())) {
- if (pendingFrameLoad)
- pendingFrameLoad->markLoadAsCompleted();
- }
}
bool SpeculativeLoadManager::canUsePreloadedEntry(const PreloadedEntry& entry, const ResourceRequest& actualRequest)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
