summaryrefslogtreecommitdiffstats
path: root/WebCore/loader/ResourceLoader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/loader/ResourceLoader.cpp')
-rw-r--r--WebCore/loader/ResourceLoader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/loader/ResourceLoader.cpp b/WebCore/loader/ResourceLoader.cpp
index b679795..f66aa67 100644
--- a/WebCore/loader/ResourceLoader.cpp
+++ b/WebCore/loader/ResourceLoader.cpp
@@ -412,7 +412,7 @@ void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse&
{
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent::instanceCount()) {
- InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+ InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
if (timelineAgent)
timelineAgent->willReceiveResourceResponse(identifier(), response);
}
@@ -424,7 +424,7 @@ void ResourceLoader::didReceiveResponse(ResourceHandle*, const ResourceResponse&
didReceiveResponse(response);
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent::instanceCount()) {
- InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+ InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
if (timelineAgent)
timelineAgent->didReceiveResourceResponse();
}
@@ -435,7 +435,7 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
{
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent::instanceCount()) {
- InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+ InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
if (timelineAgent)
timelineAgent->willReceiveResourceData(identifier());
}
@@ -443,7 +443,7 @@ void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, int lengt
didReceiveData(data, length, lengthReceived, false);
#if ENABLE(INSPECTOR)
if (InspectorTimelineAgent::instanceCount()) {
- InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0;
+ InspectorTimelineAgent* timelineAgent = (m_frame && m_frame->page()) ? m_frame->page()->inspectorTimelineAgent() : 0;
if (timelineAgent)
timelineAgent->didReceiveResourceData();
}