Title: [184383] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 184383
- Author
- [email protected]
- Date
- 2015-05-15 05:37:09 -0700 (Fri, 15 May 2015)
Log Message
Merge r184323 - REGRESION (r179958): Crash in WebCore::DocumentLoader::detachFromFrame when -[id<WebPolicyDelegate> decidePolicyForMIMEType:request:frame:decisionListener:] fails to call -[id<WebPolicyDecisionListener> download|ignore|use]
<http://webkit.org/b/144975>
Reviewed by Andy Estes.
This change reverts r179958. It changes RELEASE_ASSERT*()
statements back to Debug-only ASSERT*() statements.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::~DocumentLoader):
(WebCore::DocumentLoader::continueAfterContentPolicy):
(WebCore::DocumentLoader::detachFromFrame):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184382 => 184383)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-15 12:22:12 UTC (rev 184382)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-15 12:37:09 UTC (rev 184383)
@@ -1,3 +1,18 @@
+2015-05-13 David Kilzer <[email protected]>
+
+ REGRESION (r179958): Crash in WebCore::DocumentLoader::detachFromFrame when -[id<WebPolicyDelegate> decidePolicyForMIMEType:request:frame:decisionListener:] fails to call -[id<WebPolicyDecisionListener> download|ignore|use]
+ <http://webkit.org/b/144975>
+
+ Reviewed by Andy Estes.
+
+ This change reverts r179958. It changes RELEASE_ASSERT*()
+ statements back to Debug-only ASSERT*() statements.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::~DocumentLoader):
+ (WebCore::DocumentLoader::continueAfterContentPolicy):
+ (WebCore::DocumentLoader::detachFromFrame):
+
2015-05-12 David Hyatt <[email protected]>
Don't compute selection painting info when we don't have selection.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp (184382 => 184383)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp 2015-05-15 12:22:12 UTC (rev 184382)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/DocumentLoader.cpp 2015-05-15 12:37:09 UTC (rev 184383)
@@ -161,7 +161,7 @@
DocumentLoader::~DocumentLoader()
{
ASSERT(!m_frame || frameLoader()->activeDocumentLoader() != this || !isLoading());
- RELEASE_ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback should never outlive its DocumentLoader.");
+ ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback should never outlive its DocumentLoader.");
if (m_iconLoadDecisionCallback)
m_iconLoadDecisionCallback->invalidate();
if (m_iconDataCallback)
@@ -675,7 +675,7 @@
void DocumentLoader::continueAfterContentPolicy(PolicyAction policy)
{
- RELEASE_ASSERT(m_waitingForContentPolicy);
+ ASSERT(m_waitingForContentPolicy);
m_waitingForContentPolicy = false;
if (isStopping())
return;
@@ -952,7 +952,7 @@
InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
m_frame = nullptr;
// The call to stopLoading() above should have canceled any pending content policy check.
- RELEASE_ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback needs a valid frame.");
+ ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, "The content policy callback needs a valid frame.");
}
void DocumentLoader::clearMainResourceLoader()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
