Title: [134665] trunk/Source/WebCore
- Revision
- 134665
- Author
- [email protected]
- Date
- 2012-11-14 14:02:05 -0800 (Wed, 14 Nov 2012)
Log Message
2012-11-14 Nate Chapin <[email protected]>
Fix chromium asserts from r134649.
Rubber-stamped by Adam Barth.
MainResourceLoader was calling releaseResources() twice when cancelled
within MainResourceLoader::load(), so check reachedTerminalState() before
calling releaseResources() there.
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::load):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134664 => 134665)
--- trunk/Source/WebCore/ChangeLog 2012-11-14 21:58:13 UTC (rev 134664)
+++ trunk/Source/WebCore/ChangeLog 2012-11-14 22:02:05 UTC (rev 134665)
@@ -1,3 +1,16 @@
+2012-11-14 Nate Chapin <[email protected]>
+
+ Fix chromium asserts from r134649.
+
+ Rubber-stamped by Adam Barth.
+
+ MainResourceLoader was calling releaseResources() twice when cancelled
+ within MainResourceLoader::load(), so check reachedTerminalState() before
+ calling releaseResources() there.
+
+ * loader/MainResourceLoader.cpp:
+ (WebCore::MainResourceLoader::load):
+
2012-11-14 Andreas Kling <[email protected]>
Only resolve presentation attribute style once per shared ElementAttributeData.
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (134664 => 134665)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-11-14 21:58:13 UTC (rev 134664)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-11-14 22:02:05 UTC (rev 134665)
@@ -632,7 +632,8 @@
// <rdar://problem/4801066>
// willSendRequest() is liable to make the call to frameLoader() return null, so we need to check that here
if (!frameLoader() || request.isNull()) {
- releaseResources();
+ if (!reachedTerminalState())
+ releaseResources();
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
