Title: [94216] branches/chromium/835/Source/WebCore/inspector/InspectorResourceAgent.cpp
- Revision
- 94216
- Author
- vse...@chromium.org
- Date
- 2011-08-31 12:21:51 -0700 (Wed, 31 Aug 2011)
Log Message
Merge 94078 - Web Inspector: Inspected page sometimes crashes in InspectorResourceAgent::didFailLoading
https://bugs.webkit.org/show_bug.cgi?id=67193
Reviewed by Pavel Feldman.
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::didFailLoading):
TBR=vse...@chromium.org
Review URL: http://codereview.chromium.org/7819001
Modified Paths
Diff
Modified: branches/chromium/835/Source/WebCore/inspector/InspectorResourceAgent.cpp (94215 => 94216)
--- branches/chromium/835/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-31 19:12:36 UTC (rev 94215)
+++ branches/chromium/835/Source/WebCore/inspector/InspectorResourceAgent.cpp 2011-08-31 19:21:51 UTC (rev 94216)
@@ -300,9 +300,13 @@
void InspectorResourceAgent::didFailLoading(unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
{
String resourceId = IdentifiersFactory::resourceId(identifier);
- if (m_resourcesData->resourceType(resourceId) == InspectorPageAgent::DocumentResource)
- m_resourcesData->addResourceSharedBuffer(resourceId, loader->frameLoader()->documentLoader()->mainResourceData(), loader->frame()->document()->inputEncoding());
+ if (m_resourcesData->resourceType(resourceId) == InspectorPageAgent::DocumentResource) {
+ Frame* frame = loader ? loader->frame() : 0;
+ if (frame && frame->loader()->documentLoader() && frame->document())
+ m_resourcesData->addResourceSharedBuffer(resourceId, frame->loader()->documentLoader()->mainResourceData(), frame->document()->inputEncoding());
+ }
+
m_frontend->loadingFailed(resourceId, currentTime(), error.localizedDescription(), error.isCancellation());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
