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

Unified Diff: Source/core/loader/FrameLoader.h

Issue 215533004: Revert of Make start/stop loading notifications per-frame (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/FrameFetchContext.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/FrameLoader.h
diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
index fd3d64daf8410c875732a5d87f97cfa4fe7fa358..9bf63cf23e18f86cc0315ee0944c5494bf9ab9a8 100644
--- a/Source/core/loader/FrameLoader.h
+++ b/Source/core/loader/FrameLoader.h
@@ -60,7 +60,6 @@
class IconController;
class NavigationAction;
class Page;
-class ProgressTracker;
class ResourceError;
class ResourceResponse;
class SecurityOrigin;
@@ -83,7 +82,6 @@
LocalFrame* frame() const { return m_frame; }
MixedContentChecker* mixedContentChecker() const { return &m_mixedContentChecker; }
- ProgressTracker& progress() const { return *m_progressTracker; }
// These functions start a load. All eventually call into loadWithNavigationAction() or loadInSameDocument().
void load(const FrameLoadRequest&); // The entry point for non-reload, non-history loads.
@@ -113,6 +111,8 @@
bool isLoading() const;
+ int numPendingOrLoadingRequests(bool recurse) const;
+
DocumentLoader* documentLoader() const { return m_documentLoader.get(); }
DocumentLoader* policyDocumentLoader() const { return m_policyDocumentLoader.get(); }
DocumentLoader* provisionalDocumentLoader() const { return m_provisionalDocumentLoader.get(); }
@@ -238,7 +238,8 @@
mutable FrameLoaderStateMachine m_stateMachine;
mutable MixedContentChecker m_mixedContentChecker;
- OwnPtr<ProgressTracker> m_progressTracker;
+ class FrameProgressTracker;
+ OwnPtr<FrameProgressTracker> m_progressTracker;
FrameState m_state;
FrameLoadType m_loadType;
« no previous file with comments | « Source/core/loader/FrameFetchContext.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698