Title: [228145] branches/safari-605-branch/Source/WebCore
- Revision
- 228145
- Author
- jmarc...@apple.com
- Date
- 2018-02-05 17:28:17 -0800 (Mon, 05 Feb 2018)
Log Message
Apply patch. rdar://problem/37145473
Temporarily replace RELEASE_ASSERT with ASSERT in FrameLoader::stopAllLoaders.
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228144 => 228145)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-06 01:21:51 UTC (rev 228144)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-02-06 01:28:17 UTC (rev 228145)
@@ -1,5 +1,31 @@
2018-02-05 Jason Marcell <jmarc...@apple.com>
+ Apply patch. rdar://problem/37145473
+
+ Temporarily replace RELEASE_ASSERT with ASSERT in FrameLoader::stopAllLoaders.
+
+ 2018-02-05 Per Arne Vollan <pvol...@apple.com>
+
+ Temporarily replace RELEASE_ASSERT with ASSERT in FrameLoader::stopAllLoaders.
+ https://bugs.webkit.org/show_bug.cgi?id=182489
+
+ Reviewed by Ryosuke Niwa.
+
+ On trunk, we currently have a release assert that asserts that scripts are allowed when calling
+ FrameLoader::stopAllLoaders. This is correct since stopAllLoaders might dispatch events. We should
+ continue to have the release assert in trunk, because we should catch when this happens. However,
+ there still might be cases where the assert fails, but the backtrace will turn out to be one where
+ scripting could be allowed. The release assert in trunk will help us catch these cases. On the
+ branch, however, we should avoid crashing in these cases, and replace the release assert with a
+ debug assert. If approved, this patch should only land on a branch, not on trunk.
+
+ No new tests, covered by existing tests.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::stopAllLoaders):
+
+2018-02-05 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228096. rdar://problem/37240973
2018-02-05 Antti Koivisto <an...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/loader/FrameLoader.cpp (228144 => 228145)
--- branches/safari-605-branch/Source/WebCore/loader/FrameLoader.cpp 2018-02-06 01:21:51 UTC (rev 228144)
+++ branches/safari-605-branch/Source/WebCore/loader/FrameLoader.cpp 2018-02-06 01:28:17 UTC (rev 228145)
@@ -1680,7 +1680,7 @@
return;
// This method might dispatch events.
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(ScriptDisallowedScope::InMainThread::isScriptAllowed());
+ ASSERT_WITH_SECURITY_IMPLICATION(ScriptDisallowedScope::InMainThread::isScriptAllowed());
// Calling stopLoading() on the provisional document loader can blow away
// the frame from underneath.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
