Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 27 insertions, 32 deletions

diff --git a/WebCore/dom/ProgressEvent.h b/WebCore/dom/ProgressEvent.h
index e30cb1b..3e295c6 100644
--- a/WebCore/dom/ProgressEvent.h
+++ b/WebCore/dom/ProgressEvent.h
@@ -30,40 +30,35 @@
 
 namespace WebCore {
     
-    class ProgressEvent : public Event {
-    public:
-        static PassRefPtr<ProgressEvent> create()
-        {
-            return adoptRef(new ProgressEvent);
-        }
-        static PassRefPtr<ProgressEvent> create(const AtomicString& type, bool lengthComputable, unsigned loaded, unsigned total)
-        {
-            return adoptRef(new ProgressEvent(type, lengthComputable, loaded, total));
-        }
+class ProgressEvent : public Event {
+public:
+    static PassRefPtr<ProgressEvent> create()
+    {
+        return adoptRef(new ProgressEvent);
+    }
+    static PassRefPtr<ProgressEvent> create(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total)
+    {
+        return adoptRef(new ProgressEvent(type, lengthComputable, loaded, total));
+    }
 
-        void initProgressEvent(const AtomicString& typeArg, 
-                               bool canBubbleArg,
-                               bool cancelableArg,
-                               bool lengthComputableArg,
-                               unsigned loadedArg,
-                               unsigned totalArg);
-        
-        bool lengthComputable() const { return m_lengthComputable; }
-        unsigned loaded() const { return m_loaded; }
-        unsigned total() const { return m_total; }
-        
-        virtual bool isProgressEvent() const { return true; }
-        
-    protected:
-        ProgressEvent();
-        ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned loaded, unsigned total);
+    void initProgressEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg,
+        bool lengthComputableArg, unsigned long long loadedArg, unsigned long long totalArg);
 
-    private:
-        bool m_lengthComputable;
-        unsigned m_loaded;
-        unsigned m_total;
-    };
+    bool lengthComputable() const { return m_lengthComputable; }
+    unsigned long long loaded() const { return m_loaded; }
+    unsigned long long total() const { return m_total; }
+
+protected:
+    ProgressEvent();
+    ProgressEvent(const AtomicString& type, bool lengthComputable, unsigned long long loaded, unsigned long long total);
+
+private:
+    virtual bool isProgressEvent() const { return true; }
+    
+    bool m_lengthComputable;
+    unsigned long long m_loaded;
+    unsigned long long m_total;
+};
 }
 
 #endif // ProgressEvent_h
-