Reduce repetitive EventTarget subclassing

Source/modules/websockets/WebSocket.h

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 #include "wtf/Forward.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/AtomicStringHash.h"
 
 namespace WebCore {
 
 class Blob;
 class ExceptionState;
 
-class WebSocket : public RefCounted<WebSocket>, public ScriptWrappable, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient {
+class WebSocket : public RefCounted<WebSocket>, public ScriptWrappable, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
 public:
     static const char* subProtocolSeperator();
     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, ExceptionState&);
     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const String& protocol, ExceptionState&);
     static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const Vector<String>& protocols, ExceptionState&);
     virtual ~WebSocket();
 
     enum State {
         CONNECTING = 0,
         OPEN = 1,
@@ skipping 62 matching lines @@
 
     // Handle the JavaScript close method call. close() methods on this class
     // are just for determining if the optional code argument is supplied or
     // not.
     void closeInternal(int, const String&, ExceptionState&);
 
     // Calls unsetPendingActivity(). Used for m_timerForDeferredDropProtection
     // to drop the reference for protection asynchronously.
     void dropProtection(Timer<WebSocket>*);
 
-    virtual void refEventTarget() { ref(); }
-    virtual void derefEventTarget() { deref(); }
-    virtual EventTargetData* eventTargetData();
-    virtual EventTargetData* ensureEventTargetData();
+    virtual void refEventTarget() OVERRIDE { ref(); }
+    virtual void derefEventTarget() OVERRIDE { deref(); }
 
     size_t getFramingOverhead(size_t payloadSize);
 
     // Checks the result of WebSocketChannel::send() method, and shows console
     // message and sets ec appropriately.
     void handleSendResult(WebSocketChannel::SendResult, ExceptionState&);
 
     // Updates m_bufferedAmountAfterClose given the amount of data passed to
     // send() method after the state changed to CLOSING or CLOSED.
     void updateBufferedAmountAfterClose(unsigned long);
 
     enum BinaryType {
         BinaryTypeBlob,
         BinaryTypeArrayBuffer
     };
 
     RefPtr<WebSocketChannel> m_channel;
 
     State m_state;
     KURL m_url;
-    EventTargetData m_eventTargetData;
     unsigned long m_bufferedAmount;
     unsigned long m_bufferedAmountAfterClose;
     BinaryType m_binaryType;
     String m_subprotocol;
     String m_extensions;
 
     // stop() needs to call some methods that may lead to invocation of handlers
     // including a dispatchEvent() call. This flag is set at the beginning of
     // stop() to prevent dispatchEvent() from being called in such handlers.
     bool m_stopped;
 
     Timer<WebSocket> m_timerForDeferredDropProtection;
 };
 
 } // namespace WebCore
 
 #endif // WebSocket_h