Changeset 32341 in webkit

Timestamp:

Apr 21, 2008 1:23:20 PM (16 years ago)

Author:

weinig@apple.com

Message:

2008-04-21 Sam Weinig <​sam@webkit.org>

Reviewed by Alexey Proskuryakov.

Fix up XMLHttpRequestProgressEvent.

• bindings/js/JSEventCustom.cpp: (WebCore::toJS):
• xml/XMLHttpRequestProgressEvent.cpp:
• xml/XMLHttpRequestProgressEvent.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSEventCustom.cpp (modified) (1 diff)
• xml/XMLHttpRequestProgressEvent.cpp (modified) (1 diff)
• xml/XMLHttpRequestProgressEvent.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix up XMLHttpRequestProgressEvent.
+
+        * bindings/js/JSEventCustom.cpp:
+        (WebCore::toJS):
+        * xml/XMLHttpRequestProgressEvent.cpp:
+        * xml/XMLHttpRequestProgressEvent.h:
+
 2008-04-21  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/bindings/js/JSEventCustom.cpp

@@ -111 +111 @@
         ret = new JSMessageEvent(JSMessageEventPrototype::self(exec), static_cast<MessageEvent*>(event));
 #endif
-    else if (event->isProgressEvent())
-        ret = new JSProgressEvent(JSProgressEventPrototype::self(exec), static_cast<ProgressEvent*>(event));
+    else if (event->isProgressEvent()) {
+        if (event->isXMLHttpRequestProgressEvent())
+            ret = new JSXMLHttpRequestProgressEvent(JSXMLHttpRequestProgressEventPrototype::self(exec), static_cast<XMLHttpRequestProgressEvent*>(event));
+        else
+            ret = new JSProgressEvent(JSProgressEventPrototype::self(exec), static_cast<ProgressEvent*>(event));
+    }
 #if ENABLE(DOM_STORAGE)
     else if (event->isStorageEvent())
         ret = new JSStorageEvent(JSStorageEventPrototype::self(exec), static_cast<StorageEvent*>(event));
 #endif
-    else if (event->isXMLHttpRequestProgressEvent())
-        ret = new JSXMLHttpRequestProgressEvent(JSXMLHttpRequestProgressEventPrototype::self(exec), static_cast<XMLHttpRequestProgressEvent*>(event));
     else
         ret = new JSEvent(JSEventPrototype::self(exec), event);

trunk/WebCore/xml/XMLHttpRequestProgressEvent.cpp

@@ -50 +50 @@
 }
 
-} // Namespace WebCore
+} // namespace WebCore

trunk/WebCore/xml/XMLHttpRequestProgressEvent.h

@@ -39 +39 @@
         virtual bool isXMLHttpRequestProgressEvent() const { return true; }
 
-        // Avoid matching ProgressEvent.
-        virtual bool isProgressEvent() const { return false; }
-
-        bool lengthComputable() const { return m_lengthComputable; }
-        unsigned loaded() const { return m_loaded; }
-        unsigned total() const { return m_total; }
-
         // Those 2 methods are to be compatible with Firefox and are only a wrapper on top of the real implementation.
-        // FIXME: We should print a warning as they are deprecated.
         unsigned position();
         unsigned totalSize();
+    };
 
-    }; // class XMLHttpRequestProgressEvent
-
-} // Namespace WebCore
+} // namespace WebCore
 
 #endif // XMLHttpRequestProgressEvent_h