diff options
Diffstat (limited to 'Source/WebCore/loader/ProgressTracker.h')
| -rw-r--r-- | Source/WebCore/loader/ProgressTracker.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/Source/WebCore/loader/ProgressTracker.h b/Source/WebCore/loader/ProgressTracker.h index 272de2778..71739aef8 100644 --- a/Source/WebCore/loader/ProgressTracker.h +++ b/Source/WebCore/loader/ProgressTracker.h @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -23,14 +23,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ProgressTracker_h -#define ProgressTracker_h +#pragma once #include "Timer.h" +#include <chrono> #include <wtf/Forward.h> #include <wtf/HashMap.h> #include <wtf/Noncopyable.h> -#include <wtf/OwnPtr.h> #include <wtf/RefPtr.h> namespace WebCore { @@ -48,7 +47,7 @@ public: static unsigned long createUniqueIdentifier(); - double estimatedProgress() const; + WEBCORE_EXPORT double estimatedProgress() const; void progressStarted(Frame&); void progressCompleted(Frame&); @@ -66,7 +65,7 @@ private: void reset(); void finalProgressComplete(); - void progressHeartbeatTimerFired(Timer<ProgressTracker>&); + void progressHeartbeatTimerFired(); static unsigned long s_uniqueIdentifier; @@ -74,9 +73,7 @@ private: long long m_totalPageAndResourceBytesToLoad; long long m_totalBytesReceived; double m_lastNotifiedProgressValue; - double m_lastNotifiedProgressTime; - double m_progressNotificationInterval; - double m_progressNotificationTimeInterval; + std::chrono::steady_clock::time_point m_lastNotifiedProgressTime; bool m_finalProgressChangedSent; double m_progressValue; RefPtr<Frame> m_originatingProgressFrame; @@ -84,13 +81,11 @@ private: int m_numProgressTrackedFrames; HashMap<unsigned long, std::unique_ptr<ProgressItem>> m_progressItems; - Timer<ProgressTracker> m_progressHeartbeatTimer; + Timer m_progressHeartbeatTimer; unsigned m_heartbeatsWithNoProgress; long long m_totalBytesReceivedBeforePreviousHeartbeat; - double m_mainLoadCompletionTimeStamp; + std::chrono::steady_clock::time_point m_mainLoadCompletionTime; bool m_isMainLoad; }; -} - -#endif +} // namespace WebCore |