Changeset 179958 in webkit

Timestamp:

Feb 11, 2015 2:15:31 PM (9 years ago)

Author:

Chris Dumez

Message:

Turn recent assertions into release assertions to help track down crash in DocumentLoader::stopLoadingForPolicyChange()
​https://bugs.webkit.org/show_bug.cgi?id=141484
<rdar://problem/13811738>

Reviewed by Andy Estes.

Turn recent assertions into release assertions to help track down crash in
DocumentLoader::stopLoadingForPolicyChange(). This should increase the
likelyhood of tripping them so that we better understand why this happens.

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::~DocumentLoader):
(WebCore::DocumentLoader::detachFromFrame):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-11  Chris Dumez  <cdumez@apple.com>
+
+        Turn recent assertions into release assertions to help track down crash in DocumentLoader::stopLoadingForPolicyChange()
+        https://bugs.webkit.org/show_bug.cgi?id=141484
+        <rdar://problem/13811738>
+
+        Reviewed by Andy Estes.
+
+        Turn recent assertions into release assertions to help track down crash in
+        DocumentLoader::stopLoadingForPolicyChange(). This should increase the
+        likelyhood of tripping them so that we better understand why this happens.
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::~DocumentLoader):
+        (WebCore::DocumentLoader::detachFromFrame):
+
 2015-02-11  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -162 +162 @@
 {
     ASSERT(!m_frame || frameLoader()->activeDocumentLoader() != this || !isLoading());
-    ASSERT(!m_waitingForContentPolicy);
+    RELEASE_ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback should never outlive its DocumentLoader.");
     if (m_iconLoadDecisionCallback)
         m_iconLoadDecisionCallback->invalidate();
@@ -676 +676 @@
 void DocumentLoader::continueAfterContentPolicy(PolicyAction policy)
 {
-    ASSERT(m_waitingForContentPolicy);
+    RELEASE_ASSERT(m_waitingForContentPolicy);
     m_waitingForContentPolicy = false;
     if (isStopping())
@@ -953 +953 @@
     m_frame = nullptr;
     // The call to stopLoading() above should have canceled any pending content policy check.
-    ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback needs a valid frame.");
+    RELEASE_ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback needs a valid frame.");
 }