| Index: Source/core/xml/XMLHttpRequestUpload.h
|
| diff --git a/Source/core/xml/XMLHttpRequestUpload.h b/Source/core/xml/XMLHttpRequestUpload.h
|
| index 3b83aa1d58b524350a9d56415fc9f52316ec62a7..408e3796977c564f48dc9dd1d5bb1821d4974a51 100644
|
| --- a/Source/core/xml/XMLHttpRequestUpload.h
|
| +++ b/Source/core/xml/XMLHttpRequestUpload.h
|
| @@ -29,8 +29,8 @@
|
| #include "bindings/v8/ScriptWrappable.h"
|
| #include "core/dom/EventListener.h"
|
| #include "core/dom/EventNames.h"
|
| -#include "core/dom/EventTarget.h"
|
| #include "core/xml/XMLHttpRequest.h"
|
| +#include "core/xml/XMLHttpRequestEventTarget.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/HashMap.h"
|
| #include "wtf/PassOwnPtr.h"
|
| @@ -44,7 +44,7 @@ namespace WebCore {
|
| class ScriptExecutionContext;
|
| class XMLHttpRequest;
|
|
|
| -class XMLHttpRequestUpload : public ScriptWrappable, public EventTarget {
|
| +class XMLHttpRequestUpload : public ScriptWrappable, public XMLHttpRequestEventTarget {
|
| public:
|
| static PassOwnPtr<XMLHttpRequestUpload> create(XMLHttpRequest* xmlHttpRequest)
|
| {
|
| @@ -55,25 +55,16 @@ public:
|
| void deref() { m_xmlHttpRequest->deref(); }
|
| XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; }
|
|
|
| - virtual const AtomicString& interfaceName() const;
|
| - ScriptExecutionContext* scriptExecutionContext() const;
|
| -
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
|
| + virtual const AtomicString& interfaceName() const OVERRIDE;
|
| + virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
|
|
|
| void dispatchEventAndLoadEnd(PassRefPtr<Event>);
|
|
|
| private:
|
| explicit XMLHttpRequestUpload(XMLHttpRequest*);
|
|
|
| - virtual void refEventTarget() { ref(); }
|
| - virtual void derefEventTarget() { deref(); }
|
| - virtual EventTargetData* eventTargetData();
|
| - virtual EventTargetData* ensureEventTargetData();
|
| + virtual void refEventTarget() OVERRIDE { ref(); }
|
| + virtual void derefEventTarget() OVERRIDE { deref(); }
|
|
|
| XMLHttpRequest* m_xmlHttpRequest;
|
| EventTargetData m_eventTargetData;
|
|
|