diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/loader/ProgressTracker.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/loader/ProgressTracker.cpp')
| -rw-r--r-- | WebCore/loader/ProgressTracker.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/loader/ProgressTracker.cpp b/WebCore/loader/ProgressTracker.cpp index 7f61cd1..561e6bc 100644 --- a/WebCore/loader/ProgressTracker.cpp +++ b/WebCore/loader/ProgressTracker.cpp @@ -59,9 +59,10 @@ struct ProgressItem : Noncopyable { long long estimatedLength; }; +unsigned long ProgressTracker::s_uniqueIdentifier = 0; + ProgressTracker::ProgressTracker() - : m_uniqueIdentifier(0) - , m_totalPageAndResourceBytesToLoad(0) + : m_totalPageAndResourceBytesToLoad(0) , m_totalBytesReceived(0) , m_lastNotifiedProgressValue(0) , m_lastNotifiedProgressTime(0) @@ -255,7 +256,7 @@ void ProgressTracker::completeProgress(unsigned long identifier) unsigned long ProgressTracker::createUniqueIdentifier() { - return ++m_uniqueIdentifier; + return ++s_uniqueIdentifier; } |