Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Unified Diff: Source/core/loader/ProgressTracker.cpp

Issue 31063004: Have Frame::loader() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/Prerenderer.cpp ('k') | Source/core/loader/appcache/ApplicationCache.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/ProgressTracker.cpp
diff --git a/Source/core/loader/ProgressTracker.cpp b/Source/core/loader/ProgressTracker.cpp
index 060fce886106b222f3450e477e32995f8f83cf64..3139dfae3476ccfd80048023ed65b64151f3f2ee 100644
--- a/Source/core/loader/ProgressTracker.cpp
+++ b/Source/core/loader/ProgressTracker.cpp
@@ -111,7 +111,7 @@ void ProgressTracker::progressStarted(Frame* frame)
m_progressValue = initialProgressValue;
m_originatingProgressFrame = frame;
- m_originatingProgressFrame->loader()->client()->postProgressStartedNotification();
+ m_originatingProgressFrame->loader().client()->postProgressStartedNotification();
}
m_numProgressTrackedFrames++;
InspectorInstrumentation::frameStartedLoading(frame);
@@ -138,11 +138,11 @@ void ProgressTracker::finalProgressComplete()
// with final progress value.
if (!m_finalProgressChangedSent) {
m_progressValue = 1;
- frame->loader()->client()->postProgressEstimateChangedNotification();
+ frame->loader().client()->postProgressEstimateChangedNotification();
}
reset();
- frame->loader()->client()->postProgressFinishedNotification();
+ frame->loader().client()->postProgressFinishedNotification();
InspectorInstrumentation::frameStoppedLoading(frame.get());
}
@@ -186,7 +186,7 @@ void ProgressTracker::incrementProgress(unsigned long identifier, const char*, i
item->estimatedLength = item->bytesReceived * 2;
}
- int numPendingOrLoadingRequests = frame->loader()->numPendingOrLoadingRequests(true);
+ int numPendingOrLoadingRequests = frame->loader().numPendingOrLoadingRequests(true);
estimatedBytesForPendingRequests = progressItemDefaultEstimatedLength * numPendingOrLoadingRequests;
remainingBytes = ((m_totalPageAndResourceBytesToLoad + estimatedBytesForPendingRequests) - m_totalBytesReceived);
if (remainingBytes > 0) // Prevent divide by 0.
@@ -216,7 +216,7 @@ void ProgressTracker::incrementProgress(unsigned long identifier, const char*, i
if (m_progressValue == 1)
m_finalProgressChangedSent = true;
- frame->loader()->client()->postProgressEstimateChangedNotification();
+ frame->loader().client()->postProgressEstimateChangedNotification();
m_lastNotifiedProgressValue = m_progressValue;
m_lastNotifiedProgressTime = now;
« no previous file with comments | « Source/core/loader/Prerenderer.cpp ('k') | Source/core/loader/appcache/ApplicationCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698