diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/xml/XMLHttpRequestProgressEventThrottle.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/xml/XMLHttpRequestProgressEventThrottle.h')
| -rw-r--r-- | WebCore/xml/XMLHttpRequestProgressEventThrottle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/xml/XMLHttpRequestProgressEventThrottle.h b/WebCore/xml/XMLHttpRequestProgressEventThrottle.h index f51aea1..036905e 100644 --- a/WebCore/xml/XMLHttpRequestProgressEventThrottle.h +++ b/WebCore/xml/XMLHttpRequestProgressEventThrottle.h @@ -48,7 +48,7 @@ public: XMLHttpRequestProgressEventThrottle(EventTarget*); virtual ~XMLHttpRequestProgressEventThrottle(); - void dispatchProgressEvent(bool lengthComputable, unsigned loaded, unsigned total); + void dispatchProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total); void dispatchEvent(PassRefPtr<Event>, ProgressEventAction = DoNotFlushProgressEvent); void suspend(); @@ -69,8 +69,8 @@ private: EventTarget* m_target; bool m_lengthComputable; - unsigned m_loaded; - unsigned m_total; + unsigned long long m_loaded; + unsigned long long m_total; bool m_suspended; RefPtr<Event> m_pausedEvent; |