| Index: Source/core/loader/FrameLoader.h
|
| diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
|
| index 9bf63cf23e18f86cc0315ee0944c5494bf9ab9a8..fd3d64daf8410c875732a5d87f97cfa4fe7fa358 100644
|
| --- a/Source/core/loader/FrameLoader.h
|
| +++ b/Source/core/loader/FrameLoader.h
|
| @@ -60,6 +60,7 @@
|
| class IconController;
|
| class NavigationAction;
|
| class Page;
|
| +class ProgressTracker;
|
| class ResourceError;
|
| class ResourceResponse;
|
| class SecurityOrigin;
|
| @@ -82,6 +83,7 @@
|
| 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.
|
| @@ -111,8 +113,6 @@
|
|
|
| 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,8 +238,7 @@
|
| mutable FrameLoaderStateMachine m_stateMachine;
|
| mutable MixedContentChecker m_mixedContentChecker;
|
|
|
| - class FrameProgressTracker;
|
| - OwnPtr<FrameProgressTracker> m_progressTracker;
|
| + OwnPtr<ProgressTracker> m_progressTracker;
|
|
|
| FrameState m_state;
|
| FrameLoadType m_loadType;
|
|
|