Title: [187559] trunk/Source/WebCore
- Revision
- 187559
- Author
- beid...@apple.com
- Date
- 2015-07-29 14:34:41 -0700 (Wed, 29 Jul 2015)
Log Message
Review feedback followup to: Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
https://bugs.webkit.org/show_bug.cgi?id=147418
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::cancelPolicyCheckIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (187558 => 187559)
--- trunk/Source/WebCore/ChangeLog 2015-07-29 21:32:58 UTC (rev 187558)
+++ trunk/Source/WebCore/ChangeLog 2015-07-29 21:34:41 UTC (rev 187559)
@@ -1,5 +1,13 @@
2015-07-29 Brady Eidson <beid...@apple.com>
+ Review feedback followup to: Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
+ https://bugs.webkit.org/show_bug.cgi?id=147418
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::cancelPolicyCheckIfNeeded):
+
+2015-07-29 Brady Eidson <beid...@apple.com>
+
RELEASE_ASSERT followup to: Crash in WebCore::DocumentLoader::stopLoadingForPolicyChange.
https://bugs.webkit.org/show_bug.cgi?id=147418
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (187558 => 187559)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-07-29 21:32:58 UTC (rev 187558)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2015-07-29 21:34:41 UTC (rev 187559)
@@ -1473,10 +1473,10 @@
{
RELEASE_ASSERT(frameLoader());
- if (m_waitingForContentPolicy)
+ if (m_waitingForContentPolicy) {
frameLoader()->policyChecker().cancelCheck();
-
- m_waitingForContentPolicy = false;
+ m_waitingForContentPolicy = false;
+ }
}
void DocumentLoader::cancelMainResourceLoad(const ResourceError& resourceError)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
