Changeset 424 for trunk/WebCore/bindings/js/JSEventTargetBase.cpp

Timestamp:

07/30/08 15:12:45 (5 months ago)

Author:

odole

Message:

merge with webkit revision 35445

Files:

• trunk/WebCore/bindings/js/JSEventTargetBase.cpp (modified) (2 diffs)

trunk/WebCore/bindings/js/JSEventTargetBase.cpp

@@ -31 +31 @@
-#include "JSEventListener.h"
-#include "JSEventTargetNode.h"
+#include "JSXMLHttpRequestUpload.h"
-#include <kjs/Error.h>
-
@@ -273 +274 @@
-        return ScriptInterpreter::getDOMObject(xhr);
-
+    if (XMLHttpRequestUpload* upload = target->toXMLHttpRequestUpload())
+        return toJS(exec, upload);
+
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    if (DOMApplicationCache* cache = target->toDOMApplicationCache())