diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebCore/dom/ProgressEvent.cpp | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebCore/dom/ProgressEvent.cpp')
| -rw-r--r-- | WebCore/dom/ProgressEvent.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/dom/ProgressEvent.cpp b/WebCore/dom/ProgressEvent.cpp index c85eeff..99de500 100644 --- a/WebCore/dom/ProgressEvent.cpp +++ b/WebCore/dom/ProgressEvent.cpp @@ -35,7 +35,7 @@ ProgressEvent::ProgressEvent() { } -ProgressEvent::ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total) +ProgressEvent::ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned loaded, unsigned total) : Event(type, false, true) , m_lengthComputable(lengthComputable) , m_loaded(loaded) @@ -43,8 +43,12 @@ ProgressEvent::ProgressEvent(const AtomicString& type, bool lengthComputable, un { } -void ProgressEvent::initProgressEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, - bool lengthComputableArg, unsigned long long loadedArg, unsigned long long totalArg) +void ProgressEvent::initProgressEvent(const AtomicString& typeArg, + bool canBubbleArg, + bool cancelableArg, + bool lengthComputableArg, + unsigned loadedArg, + unsigned totalArg) { if (dispatched()) return; |