Changeset 156719 in webkit


Ignore:
Timestamp:
Oct 1, 2013 10:20:06 AM (10 years ago)
Author:
akling@apple.com
Message:

Leaf EventTarget subclasses should be FINAL.
<https://webkit.org/b/122141>

Reviewed by Darin Adler.

Clear out a slew of FIXMEs now that HasMemoryCostMemberFunction
works on classes marked FINAL (fixed in bug 121747.)

Location:
trunk/Source/WebCore
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r156717 r156719  
     12013-10-01  Andreas Kling  <akling@apple.com>
     2
     3        Leaf EventTarget subclasses should be FINAL.
     4        <https://webkit.org/b/122141>
     5
     6        Reviewed by Darin Adler.
     7
     8        Clear out a slew of FIXMEs now that HasMemoryCostMemberFunction
     9        works on classes marked FINAL (fixed in bug 121747.)
     10
    1112013-10-01  Szabolcs Dávid  <davidsz@inf.u-szeged.hu>
    212
  • trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h

    r156413 r156719  
    4646class CDMSession;
    4747
    48 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    49 class MediaKeySession : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver {
     48class MediaKeySession FINAL : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver {
    5049public:
    5150    static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
     
    7473    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
    7574
    76     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaKeySessionEventTargetInterfaceType; }
    77     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
     75    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaKeySessionEventTargetInterfaceType; }
     76    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ContextDestructionObserver::scriptExecutionContext(); }
    7877
    7978protected:
     
    101100
    102101private:
    103     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    104     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     102    virtual void refEventTarget() OVERRIDE { ref(); }
     103    virtual void derefEventTarget() OVERRIDE { deref(); }
    105104};
    106105
  • trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h

    r156590 r156719  
    5151struct IDBObjectStoreMetadata;
    5252
    53 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    54 class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTargetWithInlineData, public ActiveDOMObject {
     53class IDBTransaction FINAL : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTargetWithInlineData, public ActiveDOMObject {
    5554public:
    5655    static PassRefPtr<IDBTransaction> create(ScriptExecutionContext*, int64_t, const Vector<String>& objectStoreNames, IndexedDB::TransactionMode, IDBDatabase*);
     
    103102    DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
    104103
    105     virtual void onAbort(PassRefPtr<IDBDatabaseError>);
    106     virtual void onComplete();
     104    void onAbort(PassRefPtr<IDBDatabaseError>);
     105    void onComplete();
    107106
    108107    // EventTarget
    109     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return IDBTransactionEventTargetInterfaceType; }
    110     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     108    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return IDBTransactionEventTargetInterfaceType; }
     109    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    111110
    112111    using EventTarget::dispatchEvent;
    113     virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE FINAL;
     112    virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE;
    114113
    115114    // ActiveDOMObject
     
    133132
    134133    // EventTarget
    135     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    136     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     134    virtual void refEventTarget() OVERRIDE { ref(); }
     135    virtual void derefEventTarget() OVERRIDE { deref(); }
    137136
    138137    enum State {
  • trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h

    r156413 r156719  
    5050class TimeRanges;
    5151
    52 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    53 class SourceBuffer : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable {
     52class SourceBuffer FINAL : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable {
    5453public:
    5554    static PassRefPtr<SourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, MediaSource*);
     
    7473
    7574    // EventTarget interface
    76     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
    77     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SourceBufferEventTargetInterfaceType; }
     75    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
     76    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SourceBufferEventTargetInterfaceType; }
    7877
    7978    using RefCounted<SourceBuffer>::ref;
     
    8281protected:
    8382    // EventTarget interface
    84     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    85     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     83    virtual void refEventTarget() OVERRIDE { ref(); }
     84    virtual void derefEventTarget() OVERRIDE { deref(); }
    8685
    8786private:
  • trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h

    r156413 r156719  
    4444class SourceBuffer;
    4545
    46 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    47 class SourceBufferList : public RefCounted<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
     46class SourceBufferList FINAL : public RefCounted<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
    4847public:
    4948    static PassRefPtr<SourceBufferList> create(ScriptExecutionContext* context)
     
    6261
    6362    // EventTarget interface
    64     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SourceBufferListEventTargetInterfaceType; }
    65     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
     63    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SourceBufferListEventTargetInterfaceType; }
     64    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
    6665
    6766    using RefCounted<SourceBufferList>::ref;
     
    6968
    7069private:
    71     SourceBufferList(ScriptExecutionContext*);
     70    explicit SourceBufferList(ScriptExecutionContext*);
    7271
    7372    void scheduleEvent(const AtomicString&);
    7473
    75     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    76     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     74    virtual void refEventTarget() OVERRIDE { ref(); }
     75    virtual void derefEventTarget() OVERRIDE { deref(); }
    7776
    7877    ScriptExecutionContext* m_scriptExecutionContext;
  • trunk/Source/WebCore/Modules/mediasource/WebKitSourceBufferList.h

    r156413 r156719  
    4545class GenericEventQueue;
    4646
    47 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    48 class WebKitSourceBufferList : public RefCounted<WebKitSourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
     47class WebKitSourceBufferList FINAL : public RefCounted<WebKitSourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
    4948public:
    5049    static PassRefPtr<WebKitSourceBufferList> create(ScriptExecutionContext* context)
     
    6261
    6362    // EventTarget interface
    64     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return WebKitSourceBufferListEventTargetInterfaceType; }
    65     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
     63    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return WebKitSourceBufferListEventTargetInterfaceType; }
     64    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
    6665
    6766    using RefCounted<WebKitSourceBufferList>::ref;
     
    6968
    7069private:
    71     WebKitSourceBufferList(ScriptExecutionContext*);
     70    explicit WebKitSourceBufferList(ScriptExecutionContext*);
    7271
    7372    void createAndFireEvent(const AtomicString&);
    7473
    75     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    76     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     74    virtual void refEventTarget() OVERRIDE { ref(); }
     75    virtual void derefEventTarget() OVERRIDE { deref(); }
    7776
    7877    ScriptExecutionContext* m_scriptExecutionContext;
  • trunk/Source/WebCore/Modules/mediastream/MediaStream.h

    r156473 r156719  
    4545class MediaStreamCenter;
    4646
    47 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    48 class MediaStream : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver {
     47class MediaStream FINAL : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver {
    4948public:
    5049    static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
     
    7473
    7574    // EventTarget
    76     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaStreamEventTargetInterfaceType; }
    77     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
     75    virtual EventTargetInterface eventTargetInterface() const FINAL { return MediaStreamEventTargetInterfaceType; }
     76    virtual ScriptExecutionContext* scriptExecutionContext() const FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
    7877
    7978    using RefCounted<MediaStream>::ref;
     
    8786
    8887    // ContextDestructionObserver
    89     virtual void contextDestroyed();
     88    virtual void contextDestroyed() OVERRIDE;
    9089
    9190private:
     
    9594   
    9695    // EventTarget
    97     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    98     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     96    virtual void refEventTarget() OVERRIDE { ref(); }
     97    virtual void derefEventTarget() OVERRIDE { deref(); }
    9998
    10099    // MediaStreamDescriptorClient
  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

    r156488 r156719  
    4545class MediaStreamTrackSourcesCallback;
    4646
    47 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    48 class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
     47class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
    4948public:
    5049    virtual ~MediaStreamTrack();
     
    7170
    7271    // EventTarget
    73     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaStreamTrackEventTargetInterfaceType; }
    74     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     72    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaStreamTrackEventTargetInterfaceType; }
     73    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    7574
    7675    // ActiveDOMObject
     
    8786
    8887    // EventTarget
    89     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    90     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     88    virtual void refEventTarget() OVERRIDE { ref(); }
     89    virtual void derefEventTarget() OVERRIDE { deref(); }
    9190
    9291    // MediaStreamSourceObserver
  • trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h

    r156413 r156719  
    4242class RTCDTMFSenderHandler;
    4343
    44 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    45 class RTCDTMFSender : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject {
     44class RTCDTMFSender FINAL : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject {
    4645public:
    4746    static PassRefPtr<RTCDTMFSender> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, PassRefPtr<MediaStreamTrack>, ExceptionCode&);
     
    6160
    6261    // EventTarget
    63     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCDTMFSenderEventTargetInterfaceType; }
    64     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     62    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCDTMFSenderEventTargetInterfaceType; }
     63    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    6564
    6665    // ActiveDOMObject
     
    7776
    7877    // EventTarget
    79     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    80     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     78    virtual void refEventTarget() OVERRIDE { ref(); }
     79    virtual void derefEventTarget() OVERRIDE { deref(); }
    8180
    8281    // RTCDTMFSenderHandlerClient
  • trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h

    r156413 r156719  
    4646class RTCPeerConnectionHandler;
    4747
    48 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    49 class RTCDataChannel : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
     48class RTCDataChannel FINAL : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
    5049public:
    5150    static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);
     
    8180
    8281    // EventTarget
    83     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCDataChannelEventTargetInterfaceType; }
    84     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
     82    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCDataChannelEventTargetInterfaceType; }
     83    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
    8584
    8685    using RefCounted<RTCDataChannel>::ref;
     
    9493
    9594    // EventTarget
    96     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    97     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     95    virtual void refEventTarget() OVERRIDE { ref(); }
     96    virtual void derefEventTarget() OVERRIDE { deref(); }
    9897
    9998    ScriptExecutionContext* m_scriptExecutionContext;
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r156413 r156719  
    5959class VoidCallback;
    6060
    61 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    62 class RTCPeerConnection : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
     61class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
    6362public:
    6463    static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
     
    122121
    123122    // EventTarget
    124     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCPeerConnectionEventTargetInterfaceType; }
    125     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     123    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCPeerConnectionEventTargetInterfaceType; }
     124    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    126125
    127126    // ActiveDOMObject
     
    140139
    141140    // EventTarget implementation.
    142     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    143     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     141    virtual void refEventTarget() OVERRIDE { ref(); }
     142    virtual void derefEventTarget() OVERRIDE { deref(); }
    144143
    145144    void changeSignalingState(SignalingState);
  • trunk/Source/WebCore/Modules/notifications/Notification.h

    r156550 r156719  
    6464typedef int ExceptionCode;
    6565
    66 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    67 class Notification : public RefCounted<Notification>, public ActiveDOMObject, public EventTargetWithInlineData {
     66class Notification FINAL : public RefCounted<Notification>, public ActiveDOMObject, public EventTargetWithInlineData {
    6867    WTF_MAKE_FAST_ALLOCATED;
    6968public:
     
    124123
    125124    // EventTarget interface
    126     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return NotificationEventTargetInterfaceType; }
    127     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     125    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return NotificationEventTargetInterfaceType; }
     126    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    128127
    129128    void stopLoadingIcon();
     
    154153
    155154    // EventTarget interface
    156     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    157     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     155    virtual void refEventTarget() OVERRIDE { ref(); }
     156    virtual void derefEventTarget() OVERRIDE { deref(); }
    158157
    159158    void startLoadingIcon();
  • trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h

    r156413 r156719  
    3838namespace WebCore {
    3939
    40 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    41 class SpeechSynthesisUtterance : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData {
     40class SpeechSynthesisUtterance FINAL : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData {
    4241public:
    4342    static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&);
     
    7776    using RefCounted<SpeechSynthesisUtterance>::deref;
    7877
    79     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
     78    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ContextDestructionObserver::scriptExecutionContext(); }
    8079
    8180    PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platformUtterance.get(); }
     
    8685    RefPtr<SpeechSynthesisVoice> m_voice;
    8786
    88     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SpeechSynthesisUtteranceEventTargetInterfaceType; }
    89     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    90     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     87    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SpeechSynthesisUtteranceEventTargetInterfaceType; }
     88    virtual void refEventTarget() OVERRIDE { ref(); }
     89    virtual void derefEventTarget() OVERRIDE { deref(); }
    9190};
    9291   
  • trunk/Source/WebCore/Modules/websockets/WebSocket.h

    r156550 r156719  
    5151class ThreadableWebSocketChannel;
    5252
    53 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    54 class WebSocket : public RefCounted<WebSocket>, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
     53class WebSocket FINAL : public RefCounted<WebSocket>, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
    5554public:
    5655    static void setIsAvailable(bool);
     
    9998
    10099    // EventTarget functions.
    101     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL;
    102     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
     100    virtual EventTargetInterface eventTargetInterface() const OVERRIDE;
     101    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    103102
    104103    using RefCounted<WebSocket>::ref;
     
    124123    virtual void stop() OVERRIDE;
    125124
    126     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    127     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     125    virtual void refEventTarget() OVERRIDE { ref(); }
     126    virtual void derefEventTarget() OVERRIDE { deref(); }
    128127
    129128    size_t getFramingOverhead(size_t payloadSize);
  • trunk/Source/WebCore/dom/MessagePort.h

    r156413 r156719  
    4848    typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray;
    4949
    50     // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    51     class MessagePort : public RefCounted<MessagePort>, public EventTargetWithInlineData {
     50    class MessagePort FINAL : public RefCounted<MessagePort>, public EventTargetWithInlineData {
    5251    public:
    5352        static PassRefPtr<MessagePort> create(ScriptExecutionContext& scriptExecutionContext) { return adoptRef(new MessagePort(scriptExecutionContext)); }
     
    7574        void contextDestroyed();
    7675
    77         virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MessagePortEventTargetInterfaceType; }
    78         virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
    79         virtual bool isMessagePort() const OVERRIDE FINAL { return true; }
     76        virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MessagePortEventTargetInterfaceType; }
     77        virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
     78        virtual bool isMessagePort() const OVERRIDE { return true; }
    8079
    8180        void dispatchMessages();
     
    107106        explicit MessagePort(ScriptExecutionContext&);
    108107
    109         virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    110         virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     108        virtual void refEventTarget() OVERRIDE { ref(); }
     109        virtual void derefEventTarget() OVERRIDE { deref(); }
    111110
    112111        OwnPtr<MessagePortChannel> m_entangledChannel;
  • trunk/Source/WebCore/dom/WebKitNamedFlow.h

    r156413 r156719  
    4747class ScriptExecutionContext;
    4848
    49 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    50 class WebKitNamedFlow : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
     49class WebKitNamedFlow FINAL : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
    5150public:
    5251    static PassRefPtr<WebKitNamedFlow> create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName);
     
    6463    using RefCounted<WebKitNamedFlow>::deref;
    6564
    66     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return WebKitNamedFlowEventTargetInterfaceType; }
    67     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
     65    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return WebKitNamedFlowEventTargetInterfaceType; }
     66    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    6867
    6968    // This function is called from the JS binding code to determine if the NamedFlow object is reachable or not.
     
    8786
    8887    // EventTarget implementation.
    89     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    90     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     88    virtual void refEventTarget() OVERRIDE { ref(); }
     89    virtual void derefEventTarget() OVERRIDE { deref(); }
    9190
    9291    // The name of the flow thread as specified in CSS.
  • trunk/Source/WebCore/fileapi/FileReader.h

    r156413 r156719  
    5454typedef int ExceptionCode;
    5555
    56 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    57 class FileReader : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
     56class FileReader FINAL : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
    5857public:
    5958    static PassRefPtr<FileReader> create(ScriptExecutionContext*);
     
    8382
    8483    // EventTarget
    85     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return FileReaderEventTargetInterfaceType; }
    86     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     84    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return FileReaderEventTargetInterfaceType; }
     85    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    8786
    8887    // FileReaderLoaderClient
    89     virtual void didStartLoading();
    90     virtual void didReceiveData();
    91     virtual void didFinishLoading();
    92     virtual void didFail(int errorCode);
     88    virtual void didStartLoading() OVERRIDE;
     89    virtual void didReceiveData() OVERRIDE;
     90    virtual void didFinishLoading() OVERRIDE;
     91    virtual void didFail(int errorCode) OVERRIDE;
    9392
    9493    using RefCounted<FileReader>::ref;
     
    103102
    104103private:
    105     FileReader(ScriptExecutionContext*);
     104    explicit FileReader(ScriptExecutionContext*);
    106105
    107106    // ActiveDOMObject
     
    110109
    111110    // EventTarget
    112     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    113     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     111    virtual void refEventTarget() OVERRIDE { ref(); }
     112    virtual void derefEventTarget() OVERRIDE { deref(); }
    114113
    115114    void terminate();
  • trunk/Source/WebCore/html/MediaController.h

    r156413 r156719  
    4444class ScriptExecutionContext;
    4545
    46 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    47 class MediaController : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
     46class MediaController FINAL : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
    4847public:
    4948    static PassRefPtr<MediaController> create(ScriptExecutionContext*);
     
    5655    const String& mediaGroup() const { return m_mediaGroup; }
    5756   
    58     virtual PassRefPtr<TimeRanges> buffered() const;
    59     virtual PassRefPtr<TimeRanges> seekable() const;
    60     virtual PassRefPtr<TimeRanges> played();
     57    virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE;
     58    virtual PassRefPtr<TimeRanges> seekable() const OVERRIDE;
     59    virtual PassRefPtr<TimeRanges> played() OVERRIDE;
    6160   
    62     virtual double duration() const;
    63     virtual double currentTime() const;
    64     virtual void setCurrentTime(double, ExceptionCode&);
     61    virtual double duration() const OVERRIDE;
     62    virtual double currentTime() const OVERRIDE;
     63    virtual void setCurrentTime(double, ExceptionCode&) OVERRIDE;
    6564   
    66     virtual bool paused() const { return m_paused; }
    67     virtual void play();
    68     virtual void pause();
     65    virtual bool paused() const OVERRIDE { return m_paused; }
     66    virtual void play() OVERRIDE;
     67    virtual void pause() OVERRIDE;
    6968    void unpause();
    7069   
    71     virtual double defaultPlaybackRate() const { return m_defaultPlaybackRate; }
    72     virtual void setDefaultPlaybackRate(double);
     70    virtual double defaultPlaybackRate() const OVERRIDE { return m_defaultPlaybackRate; }
     71    virtual void setDefaultPlaybackRate(double) OVERRIDE;
    7372   
    74     virtual double playbackRate() const;
    75     virtual void setPlaybackRate(double);
     73    virtual double playbackRate() const OVERRIDE;
     74    virtual void setPlaybackRate(double) OVERRIDE;
    7675   
    77     virtual double volume() const { return m_volume; }
    78     virtual void setVolume(double, ExceptionCode&);
     76    virtual double volume() const OVERRIDE { return m_volume; }
     77    virtual void setVolume(double, ExceptionCode&) OVERRIDE;
    7978   
    80     virtual bool muted() const { return m_muted; }
    81     virtual void setMuted(bool);
     79    virtual bool muted() const OVERRIDE { return m_muted; }
     80    virtual void setMuted(bool) OVERRIDE;
    8281   
    83     virtual ReadyState readyState() const { return m_readyState; }
     82    virtual ReadyState readyState() const OVERRIDE { return m_readyState; }
    8483
    8584    enum PlaybackState { WAITING, PLAYING, ENDED };
    8685    const AtomicString& playbackState() const;
    8786
    88     virtual bool supportsFullscreen() const { return false; }
    89     virtual bool isFullscreen() const { return false; }
    90     virtual void enterFullscreen() { }
     87    virtual bool supportsFullscreen() const OVERRIDE { return false; }
     88    virtual bool isFullscreen() const OVERRIDE { return false; }
     89    virtual void enterFullscreen() OVERRIDE { }
    9190
    92     virtual bool hasAudio() const;
    93     virtual bool hasVideo() const;
    94     virtual bool hasClosedCaptions() const;
    95     virtual void setClosedCaptionsVisible(bool);
    96     virtual bool closedCaptionsVisible() const { return m_closedCaptionsVisible; }
     91    virtual bool hasAudio() const OVERRIDE;
     92    virtual bool hasVideo() const OVERRIDE;
     93    virtual bool hasClosedCaptions() const OVERRIDE;
     94    virtual void setClosedCaptionsVisible(bool) OVERRIDE;
     95    virtual bool closedCaptionsVisible() const OVERRIDE { return m_closedCaptionsVisible; }
    9796   
    98     virtual bool supportsScanning() const;
     97    virtual bool supportsScanning() const OVERRIDE;
    9998   
    100     virtual void beginScrubbing();
    101     virtual void endScrubbing();
     99    virtual void beginScrubbing() OVERRIDE;
     100    virtual void endScrubbing() OVERRIDE;
    102101   
    103     virtual bool canPlay() const;
     102    virtual bool canPlay() const OVERRIDE;
    104103   
    105     virtual bool isLiveStream() const;
     104    virtual bool isLiveStream() const OVERRIDE;
    106105   
    107     virtual bool hasCurrentSrc() const;
     106    virtual bool hasCurrentSrc() const OVERRIDE;
    108107   
    109     virtual void returnToRealtime();
     108    virtual void returnToRealtime() OVERRIDE;
    110109
    111110    bool isBlocked() const;
     
    131130
    132131    // EventTarget
    133     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    134     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
    135     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaControllerEventTargetInterfaceType; }
    136     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; };
     132    virtual void refEventTarget() OVERRIDE { ref(); }
     133    virtual void derefEventTarget() OVERRIDE { deref(); }
     134    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaControllerEventTargetInterfaceType; }
     135    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; };
    137136
    138137    friend class HTMLMediaElement;
  • trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h

    r156550 r156719  
    4444class URL;
    4545
    46 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    47 class DOMApplicationCache : public ScriptWrappable, public RefCounted<DOMApplicationCache>, public EventTargetWithInlineData, public DOMWindowProperty {
     46class DOMApplicationCache FINAL : public ScriptWrappable, public RefCounted<DOMApplicationCache>, public EventTargetWithInlineData, public DOMWindowProperty {
    4847public:
    4948    static PassRefPtr<DOMApplicationCache> create(Frame* frame) { return adoptRef(new DOMApplicationCache(frame)); }
     
    7372    DEFINE_ATTRIBUTE_EVENT_LISTENER(obsolete);
    7473
    75     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return DOMApplicationCacheEventTargetInterfaceType; }
    76     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
     74    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return DOMApplicationCacheEventTargetInterfaceType; }
     75    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    7776
    7877    static const AtomicString& toEventType(ApplicationCacheHost::EventID id);
     
    8180    explicit DOMApplicationCache(Frame*);
    8281
    83     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    84     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     82    virtual void refEventTarget() OVERRIDE { ref(); }
     83    virtual void derefEventTarget() OVERRIDE { deref(); }
    8584
    8685    ApplicationCacheHost* applicationCacheHost() const;
  • trunk/Source/WebCore/page/EventSource.h

    r156550 r156719  
    4949class ThreadableLoader;
    5050
    51 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    52 class EventSource : public RefCounted<EventSource>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject {
     51class EventSource FINAL : public RefCounted<EventSource>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject {
    5352    WTF_MAKE_FAST_ALLOCATED;
    5453public:
     
    7776    using RefCounted<EventSource>::deref;
    7877
    79     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return EventSourceEventTargetInterfaceType; }
    80     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     78    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return EventSourceEventTargetInterfaceType; }
     79    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    8180
    8281private:
    8382    EventSource(ScriptExecutionContext*, const URL&, const Dictionary&);
    8483
    85     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    86     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     84    virtual void refEventTarget() OVERRIDE { ref(); }
     85    virtual void derefEventTarget() OVERRIDE { deref(); }
    8786
    88     virtual void didReceiveResponse(unsigned long, const ResourceResponse&);
    89     virtual void didReceiveData(const char*, int);
    90     virtual void didFinishLoading(unsigned long, double);
    91     virtual void didFail(const ResourceError&);
    92     virtual void didFailAccessControlCheck(const ResourceError&);
    93     virtual void didFailRedirectCheck();
     87    virtual void didReceiveResponse(unsigned long, const ResourceResponse&) OVERRIDE;
     88    virtual void didReceiveData(const char*, int) OVERRIDE;
     89    virtual void didFinishLoading(unsigned long, double) OVERRIDE;
     90    virtual void didFail(const ResourceError&) OVERRIDE;
     91    virtual void didFailAccessControlCheck(const ResourceError&) OVERRIDE;
     92    virtual void didFailRedirectCheck() OVERRIDE;
    9493
    9594    virtual void stop() OVERRIDE;
  • trunk/Source/WebCore/page/Performance.h

    r156413 r156719  
    5353class UserTiming;
    5454
    55 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    56 class Performance : public ScriptWrappable, public RefCounted<Performance>, public DOMWindowProperty, public EventTargetWithInlineData {
     55class Performance FINAL : public ScriptWrappable, public RefCounted<Performance>, public DOMWindowProperty, public EventTargetWithInlineData {
    5756public:
    5857    static PassRefPtr<Performance> create(Frame* frame) { return adoptRef(new Performance(frame)); }
    5958    ~Performance();
    6059
    61     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return PerformanceEventTargetInterfaceType; }
    62     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
     60    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return PerformanceEventTargetInterfaceType; }
     61    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
    6362
    6463    PerformanceNavigation* navigation() const;
     
    9594    explicit Performance(Frame*);
    9695
    97     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    98     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     96    virtual void refEventTarget() OVERRIDE { ref(); }
     97    virtual void derefEventTarget() OVERRIDE { deref(); }
    9998    bool isResourceTimingBufferFull();
    10099
  • trunk/Source/WebCore/xml/XMLHttpRequest.h

    r156550 r156719  
    5252class ThreadableLoader;
    5353
    54 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    55 class XMLHttpRequest : public ScriptWrappable, public RefCounted<XMLHttpRequest>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject {
     54class XMLHttpRequest FINAL : public ScriptWrappable, public RefCounted<XMLHttpRequest>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject {
    5655    WTF_MAKE_FAST_ALLOCATED;
    5756public:
     
    8483#endif
    8584
    86     virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return XMLHttpRequestEventTargetInterfaceType; }
    87     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
     85    virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return XMLHttpRequestEventTargetInterfaceType; }
     86    virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
    8887
    8988    const URL& url() const { return m_url; }
     
    160159
    161160private:
    162     XMLHttpRequest(ScriptExecutionContext*);
     161    explicit XMLHttpRequest(ScriptExecutionContext*);
    163162
    164163    // ActiveDOMObject
     
    169168    virtual void stop() OVERRIDE;
    170169
    171     virtual void refEventTarget() OVERRIDE FINAL { ref(); }
    172     virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
     170    virtual void refEventTarget() OVERRIDE { ref(); }
     171    virtual void derefEventTarget() OVERRIDE { deref(); }
    173172
    174173    Document* document() const;
     
    179178#endif
    180179
    181     virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent);
    182     virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
    183     virtual void didReceiveData(const char* data, int dataLength);
    184     virtual void didFinishLoading(unsigned long identifier, double finishTime);
    185     virtual void didFail(const ResourceError&);
    186     virtual void didFailRedirectCheck();
     180    virtual void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
     181    virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) OVERRIDE;
     182    virtual void didReceiveData(const char* data, int dataLength) OVERRIDE;
     183    virtual void didFinishLoading(unsigned long identifier, double finishTime) OVERRIDE;
     184    virtual void didFail(const ResourceError&) OVERRIDE;
     185    virtual void didFailRedirectCheck() OVERRIDE;
    187186
    188187    String responseMIMEType() const;
  • trunk/Source/WebCore/xml/XMLHttpRequestUpload.h

    r156413 r156719  
    4444    class XMLHttpRequest;
    4545
    46     // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
    47     class XMLHttpRequestUpload : public EventTargetWithInlineData {
     46    class XMLHttpRequestUpload FINAL : public EventTargetWithInlineData {
    4847    public:
    4948        static PassOwnPtr<XMLHttpRequestUpload> create(XMLHttpRequest* xmlHttpRequest)
     
    5655        XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; }
    5756
    58         virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return XMLHttpRequestUploadEventTargetInterfaceType; }
    59         virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_xmlHttpRequest->scriptExecutionContext(); }
     57        virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return XMLHttpRequestUploadEventTargetInterfaceType; }
     58        virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_xmlHttpRequest->scriptExecutionContext(); }
    6059
    6160        DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
Note: See TracChangeset for help on using the changeset viewer.