Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb

1 files changed, 6 insertions, 9 deletions

diff --git a/WebCore/dom/ProgressEvent.idl b/WebCore/dom/ProgressEvent.idl
index afdf3a2..e832def 100644
--- a/WebCore/dom/ProgressEvent.idl
+++ b/WebCore/dom/ProgressEvent.idl
@@ -26,15 +26,12 @@
 module events {
 
     interface ProgressEvent : Event {
-         readonly attribute boolean         lengthComputable;
-         readonly attribute unsigned long   loaded;
-         readonly attribute unsigned long   total;
-         void               initProgressEvent(in DOMString typeArg,
-                                              in boolean       canBubbleArg,
-                                              in boolean       cancelableArg,
-                                              in boolean       lengthComputableArg,
-                                              in unsigned long loadedArg,
-                                              in unsigned long totalArg);
+        readonly attribute boolean lengthComputable;
+        readonly attribute unsigned long long loaded;
+        readonly attribute unsigned long long total;
+
+        void initProgressEvent(in DOMString typeArg, in boolean canBubbleArg, in boolean cancelableArg,
+            in boolean lengthComputableArg, in unsigned long long loadedArg, in unsigned long long totalArg);
     };
 
 }