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.h | |
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.h')
-rw-r--r-- | WebCore/loader/ProgressTracker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/loader/ProgressTracker.h b/WebCore/loader/ProgressTracker.h index 744e101..5d5b6b2 100644 --- a/WebCore/loader/ProgressTracker.h +++ b/WebCore/loader/ProgressTracker.h @@ -41,7 +41,7 @@ public: ProgressTracker(); ~ProgressTracker(); - unsigned long createUniqueIdentifier(); + static unsigned long createUniqueIdentifier(); double estimatedProgress() const; @@ -59,7 +59,7 @@ private: void reset(); void finalProgressComplete(); - unsigned long m_uniqueIdentifier; + static unsigned long s_uniqueIdentifier; long long m_totalPageAndResourceBytesToLoad; long long m_totalBytesReceived; |