Title: [277693] branches/safari-612.1.15.1-branch/Source/WebCore
- Revision
- 277693
- Author
- rubent...@apple.com
- Date
- 2021-05-18 16:55:40 -0700 (Tue, 18 May 2021)
Log Message
Revert "Cherry-pick r277603. rdar://problem/78130222"
This reverts commit r277623
Modified Paths
Diff
Modified: branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog (277692 => 277693)
--- branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog 2021-05-18 23:55:08 UTC (rev 277692)
+++ branches/safari-612.1.15.1-branch/Source/WebCore/ChangeLog 2021-05-18 23:55:40 UTC (rev 277693)
@@ -1,39 +1,5 @@
2021-05-17 Alan Coon <alanc...@apple.com>
- Cherry-pick r277603. rdar://problem/78130222
-
- Null check m_resource in SubresourceLoader::didReceiveResponse
- https://bugs.webkit.org/show_bug.cgi?id=225879
-
- Reviewed by Chris Dumez.
-
- Add ASSERT_NOT_REACHED and RELEASE_LOG_FAULT if m_resource is null.
- This will help us notice this invalid state in debug builds and diagnose strange loading failures in simulated crash logs.
- On further investigation, the crash fixed in r277594 was likely already fixed by something else, but that made it more robust.
-
- * loader/SubresourceLoader.cpp:
- (WebCore::SubresourceLoader::didReceiveResponse):
-
-
-
- git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
- 2021-05-17 Alex Christensen <achristen...@webkit.org>
-
- Null check m_resource in SubresourceLoader::didReceiveResponse
- https://bugs.webkit.org/show_bug.cgi?id=225879
-
- Reviewed by Chris Dumez.
-
- Add ASSERT_NOT_REACHED and RELEASE_LOG_FAULT if m_resource is null.
- This will help us notice this invalid state in debug builds and diagnose strange loading failures in simulated crash logs.
- On further investigation, the crash fixed in r277594 was likely already fixed by something else, but that made it more robust.
-
- * loader/SubresourceLoader.cpp:
- (WebCore::SubresourceLoader::didReceiveResponse):
-
-2021-05-17 Alan Coon <alanc...@apple.com>
-
Cherry-pick r277600. rdar://problem/78130132
REGRESSION(r277425): Crash in FrameSelection::selectFrameElementInParentIfFullySelected
Modified: branches/safari-612.1.15.1-branch/Source/WebCore/loader/SubresourceLoader.cpp (277692 => 277693)
--- branches/safari-612.1.15.1-branch/Source/WebCore/loader/SubresourceLoader.cpp 2021-05-18 23:55:08 UTC (rev 277692)
+++ branches/safari-612.1.15.1-branch/Source/WebCore/loader/SubresourceLoader.cpp 2021-05-18 23:55:40 UTC (rev 277693)
@@ -409,11 +409,6 @@
if (shouldIncludeCertificateInfo())
response.includeCertificateInfo();
- if (!m_resource) {
- ASSERT_NOT_REACHED();
- RELEASE_LOG_FAULT(Loading, "Resource was unexpectedly null in SubresourceLoader::didReceiveResponse");
- }
-
if (m_resource && m_resource->resourceToRevalidate()) {
if (response.httpStatusCode() == 304) {
// 304 Not modified / Use local copy
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
