| Index: Source/core/loader/ProgressTracker.h
|
| diff --git a/Source/core/loader/ProgressTracker.h b/Source/core/loader/ProgressTracker.h
|
| index 60ca22c55662ce84e75a48511287aac867c0d1a9..b92ed0651c18fec9b5756268d68db00c2c6c0513 100644
|
| --- a/Source/core/loader/ProgressTracker.h
|
| +++ b/Source/core/loader/ProgressTracker.h
|
| @@ -47,13 +47,12 @@
|
| public:
|
| ~ProgressTracker();
|
|
|
| - static PassOwnPtr<ProgressTracker> create();
|
| - static unsigned long createUniqueIdentifier();
|
| + static PassOwnPtr<ProgressTracker> create(LocalFrame*);
|
|
|
| double estimatedProgress() const;
|
|
|
| - void progressStarted(LocalFrame*);
|
| - void progressCompleted(LocalFrame*);
|
| + void progressStarted();
|
| + void progressCompleted();
|
|
|
| void incrementProgress(unsigned long identifier, const ResourceResponse&);
|
| void incrementProgress(unsigned long identifier, const char*, int);
|
| @@ -63,11 +62,12 @@
|
| long long totalBytesReceived() const { return m_totalBytesReceived; }
|
|
|
| private:
|
| - ProgressTracker();
|
| + ProgressTracker(LocalFrame*);
|
|
|
| void reset();
|
| - void finalProgressComplete();
|
|
|
| + LocalFrame* m_frame;
|
| + bool m_inProgress;
|
| long long m_totalPageAndResourceBytesToLoad;
|
| long long m_totalBytesReceived;
|
| double m_lastNotifiedProgressValue;
|
| @@ -76,9 +76,7 @@
|
| double m_progressNotificationTimeInterval;
|
| bool m_finalProgressChangedSent;
|
| double m_progressValue;
|
| - RefPtr<LocalFrame> m_originatingProgressFrame;
|
|
|
| - int m_numProgressTrackedFrames;
|
| HashMap<unsigned long, OwnPtr<ProgressItem> > m_progressItems;
|
| };
|
|
|
|
|