Title: [216119] trunk/Source/WebCore
- Revision
- 216119
- Author
- dba...@webkit.org
- Date
- 2017-05-03 09:52:42 -0700 (Wed, 03 May 2017)
Log Message
Cleanup: Remove out-of-date comment and null check from DocumentLoader::detachFromFrame()
https://bugs.webkit.org/show_bug.cgi?id=171604
Reviewed by Brady Eidson.
We no longer want to passively allow DocumentLoader::detachFromFrame() to be called twice.
It does not make sense to be called twice and should never be called twice. A release assert
in DocumentLoader::cancelPolicyCheckIfNeeded() (added in r187558) called by DocumentLoader::detachFromFrame()
enforces this invariant. Therefore we can remove the null check of DocumentLoader::m_frame
and the comment that explains the purpose of this null check from DocumentLoader::detachFromFrame().
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::detachFromFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216118 => 216119)
--- trunk/Source/WebCore/ChangeLog 2017-05-03 16:28:47 UTC (rev 216118)
+++ trunk/Source/WebCore/ChangeLog 2017-05-03 16:52:42 UTC (rev 216119)
@@ -1,3 +1,19 @@
+2017-05-03 Daniel Bates <daba...@apple.com>
+
+ Cleanup: Remove out-of-date comment and null check from DocumentLoader::detachFromFrame()
+ https://bugs.webkit.org/show_bug.cgi?id=171604
+
+ Reviewed by Brady Eidson.
+
+ We no longer want to passively allow DocumentLoader::detachFromFrame() to be called twice.
+ It does not make sense to be called twice and should never be called twice. A release assert
+ in DocumentLoader::cancelPolicyCheckIfNeeded() (added in r187558) called by DocumentLoader::detachFromFrame()
+ enforces this invariant. Therefore we can remove the null check of DocumentLoader::m_frame
+ and the comment that explains the purpose of this null check from DocumentLoader::detachFromFrame().
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::detachFromFrame):
+
2017-05-03 Ryan Haddad <ryanhad...@apple.com>
Unreviewed attempt to fix the Windows build after r216117.
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (216118 => 216119)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-05-03 16:28:47 UTC (rev 216118)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-05-03 16:52:42 UTC (rev 216119)
@@ -1021,12 +1021,7 @@
cancelPolicyCheckIfNeeded();
- // Even though we ASSERT at the top of this method that we have an m_frame, we're seeing crashes where m_frame is null.
- // This means either that a DocumentLoader is detaching twice, or is detaching before ever having attached.
- // Until we figure out how that is happening, null check m_frame before dereferencing it here.
- // <rdar://problem/21293082> and https://bugs.webkit.org/show_bug.cgi?id=146786
- if (m_frame)
- InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+ InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
m_frame = nullptr;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
