Title: [251029] trunk/Source/WebCore
- Revision
- 251029
- Author
- cdu...@apple.com
- Date
- 2019-10-11 16:29:02 -0700 (Fri, 11 Oct 2019)
Log Message
Unreviewed, address post-landing feedback from Darin for r251019.
Added a new comment for clarity.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::stopForPageCache):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (251028 => 251029)
--- trunk/Source/WebCore/ChangeLog 2019-10-11 23:17:52 UTC (rev 251028)
+++ trunk/Source/WebCore/ChangeLog 2019-10-11 23:29:02 UTC (rev 251029)
@@ -1,3 +1,12 @@
+2019-10-11 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, address post-landing feedback from Darin for r251019.
+
+ Added a new comment for clarity.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopForPageCache):
+
2019-10-11 Alex Christensen <achristen...@webkit.org>
Only use CFNetwork SPI for metrics where needed
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (251028 => 251029)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2019-10-11 23:17:52 UTC (rev 251028)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2019-10-11 23:29:02 UTC (rev 251029)
@@ -1863,7 +1863,8 @@
for (RefPtr<Frame> child = m_frame.tree().firstChild(); child; child = child->tree().nextSibling())
child->loader().stopForPageCache();
- // Make sure there are no scheduled loads or policy checks.
+ // We cancel pending navigations & policy checks *after* cancelling loads because cancelling loads might end up
+ // running script, which could schedule new navigations.
policyChecker().stopCheck();
m_frame.navigationScheduler().cancel();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
