| Index: Source/core/page/EventSource.h
|
| diff --git a/Source/core/page/EventSource.h b/Source/core/page/EventSource.h
|
| index 72603254e0c8065b60ae1b05a3d4a156476b6add..5782e676e31d00da6b5377258bdad1de509ad870 100644
|
| --- a/Source/core/page/EventSource.h
|
| +++ b/Source/core/page/EventSource.h
|
| @@ -50,7 +50,7 @@ class ResourceResponse;
|
| class TextResourceDecoder;
|
| class ThreadableLoader;
|
|
|
| -class EventSource : public RefCounted<EventSource>, public ScriptWrappable, public EventTarget, private ThreadableLoaderClient, public ActiveDOMObject {
|
| +class EventSource : public RefCounted<EventSource>, public ScriptWrappable, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject {
|
| WTF_MAKE_FAST_ALLOCATED;
|
| public:
|
| static PassRefPtr<EventSource> create(ScriptExecutionContext*, const String& url, const Dictionary&, ExceptionState&);
|
| @@ -77,18 +77,16 @@ public:
|
| using RefCounted<EventSource>::ref;
|
| using RefCounted<EventSource>::deref;
|
|
|
| - virtual const AtomicString& interfaceName() const;
|
| - virtual ScriptExecutionContext* scriptExecutionContext() const;
|
| + virtual const AtomicString& interfaceName() const OVERRIDE;
|
| + virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
|
|
|
| virtual void stop();
|
|
|
| private:
|
| EventSource(ScriptExecutionContext*, const KURL&, const Dictionary&);
|
|
|
| - virtual void refEventTarget() { ref(); }
|
| - virtual void derefEventTarget() { deref(); }
|
| - virtual EventTargetData* eventTargetData();
|
| - virtual EventTargetData* ensureEventTargetData();
|
| + virtual void refEventTarget() OVERRIDE { ref(); }
|
| + virtual void derefEventTarget() OVERRIDE { deref(); }
|
|
|
| virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
|
| virtual void didReceiveData(const char*, int);
|
| @@ -123,8 +121,6 @@ private:
|
| String m_lastEventId;
|
| unsigned long long m_reconnectDelay;
|
| String m_eventStreamOrigin;
|
| -
|
| - EventTargetData m_eventTargetData;
|
| };
|
|
|
| } // namespace WebCore
|
|
|