Index: Source/core/loader/FrameFetchContext.cpp |
diff --git a/Source/core/loader/FrameFetchContext.cpp b/Source/core/loader/FrameFetchContext.cpp |
index 508176d43b7ce4af49998f53650ad9436652c7f4..ebdb3e41252b624856d1df5d6b061b0821c1225d 100644 |
--- a/Source/core/loader/FrameFetchContext.cpp |
+++ b/Source/core/loader/FrameFetchContext.cpp |
@@ -159,30 +159,26 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const ResourceReq |
void FrameFetchContext::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader) |
{ |
- if (Page* page = m_frame->page()) |
- page->progress().incrementProgress(identifier, r); |
+ m_frame->loader().progress().incrementProgress(identifier, r); |
m_frame->loader().client()->dispatchDidReceiveResponse(loader, identifier, r); |
InspectorInstrumentation::didReceiveResourceResponse(m_frame, identifier, ensureLoader(loader), r, resourceLoader); |
} |
void FrameFetchContext::dispatchDidReceiveData(DocumentLoader*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength) |
{ |
- if (Page* page = m_frame->page()) |
- page->progress().incrementProgress(identifier, data, dataLength); |
+ m_frame->loader().progress().incrementProgress(identifier, data, dataLength); |
InspectorInstrumentation::didReceiveData(m_frame, identifier, data, dataLength, encodedDataLength); |
} |
void FrameFetchContext::dispatchDidDownloadData(DocumentLoader*, unsigned long identifier, int dataLength, int encodedDataLength) |
{ |
- if (Page* page = m_frame->page()) |
- page->progress().incrementProgress(identifier, 0, dataLength); |
+ m_frame->loader().progress().incrementProgress(identifier, 0, dataLength); |
InspectorInstrumentation::didReceiveData(m_frame, identifier, 0, dataLength, encodedDataLength); |
} |
void FrameFetchContext::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier, double finishTime, int64_t encodedDataLength) |
{ |
- if (Page* page = m_frame->page()) |
- page->progress().completeProgress(identifier); |
+ m_frame->loader().progress().completeProgress(identifier); |
m_frame->loader().client()->dispatchDidFinishLoading(loader, identifier); |
InspectorInstrumentation::didFinishLoading(m_frame, identifier, ensureLoader(loader), finishTime, encodedDataLength); |
@@ -190,8 +186,7 @@ void FrameFetchContext::dispatchDidFinishLoading(DocumentLoader* loader, unsigne |
void FrameFetchContext::dispatchDidFail(DocumentLoader* loader, unsigned long identifier, const ResourceError& error) |
{ |
- if (Page* page = m_frame->page()) |
- page->progress().completeProgress(identifier); |
+ m_frame->loader().progress().completeProgress(identifier); |
InspectorInstrumentation::didFailLoading(m_frame, identifier, error); |
} |