Changeset 156719 in webkit
- Timestamp:
- Oct 1, 2013 10:20:06 AM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r156717 r156719 1 2013-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 1 11 2013-10-01 Szabolcs Dávid <davidsz@inf.u-szeged.hu> 2 12 -
trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h
r156413 r156719 46 46 class CDMSession; 47 47 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 { 48 class MediaKeySession FINAL : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver { 50 49 public: 51 50 static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, MediaKeys*, const String& keySystem); … … 74 73 DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); 75 74 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(); } 78 77 79 78 protected: … … 101 100 102 101 private: 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(); } 105 104 }; 106 105 -
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h
r156590 r156719 51 51 struct IDBObjectStoreMetadata; 52 52 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 { 53 class IDBTransaction FINAL : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTargetWithInlineData, public ActiveDOMObject { 55 54 public: 56 55 static PassRefPtr<IDBTransaction> create(ScriptExecutionContext*, int64_t, const Vector<String>& objectStoreNames, IndexedDB::TransactionMode, IDBDatabase*); … … 103 102 DEFINE_ATTRIBUTE_EVENT_LISTENER(error); 104 103 105 v irtual void onAbort(PassRefPtr<IDBDatabaseError>);106 v irtual void onComplete();104 void onAbort(PassRefPtr<IDBDatabaseError>); 105 void onComplete(); 107 106 108 107 // 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(); } 111 110 112 111 using EventTarget::dispatchEvent; 113 virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE FINAL;112 virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE; 114 113 115 114 // ActiveDOMObject … … 133 132 134 133 // 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(); } 137 136 138 137 enum State { -
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h
r156413 r156719 50 50 class TimeRanges; 51 51 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 { 52 class SourceBuffer FINAL : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable { 54 53 public: 55 54 static PassRefPtr<SourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, MediaSource*); … … 74 73 75 74 // 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; } 78 77 79 78 using RefCounted<SourceBuffer>::ref; … … 82 81 protected: 83 82 // 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(); } 86 85 87 86 private: -
trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h
r156413 r156719 44 44 class SourceBuffer; 45 45 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 { 46 class SourceBufferList FINAL : public RefCounted<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData { 48 47 public: 49 48 static PassRefPtr<SourceBufferList> create(ScriptExecutionContext* context) … … 62 61 63 62 // 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; } 66 65 67 66 using RefCounted<SourceBufferList>::ref; … … 69 68 70 69 private: 71 SourceBufferList(ScriptExecutionContext*);70 explicit SourceBufferList(ScriptExecutionContext*); 72 71 73 72 void scheduleEvent(const AtomicString&); 74 73 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(); } 77 76 78 77 ScriptExecutionContext* m_scriptExecutionContext; -
trunk/Source/WebCore/Modules/mediasource/WebKitSourceBufferList.h
r156413 r156719 45 45 class GenericEventQueue; 46 46 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 { 47 class WebKitSourceBufferList FINAL : public RefCounted<WebKitSourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData { 49 48 public: 50 49 static PassRefPtr<WebKitSourceBufferList> create(ScriptExecutionContext* context) … … 62 61 63 62 // 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; } 66 65 67 66 using RefCounted<WebKitSourceBufferList>::ref; … … 69 68 70 69 private: 71 WebKitSourceBufferList(ScriptExecutionContext*);70 explicit WebKitSourceBufferList(ScriptExecutionContext*); 72 71 73 72 void createAndFireEvent(const AtomicString&); 74 73 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(); } 77 76 78 77 ScriptExecutionContext* m_scriptExecutionContext; -
trunk/Source/WebCore/Modules/mediastream/MediaStream.h
r156473 r156719 45 45 class MediaStreamCenter; 46 46 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 { 47 class MediaStream FINAL : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver { 49 48 public: 50 49 static PassRefPtr<MediaStream> create(ScriptExecutionContext*); … … 74 73 75 74 // EventTarget 76 virtual EventTargetInterface eventTargetInterface() const OVERRIDEFINAL { return MediaStreamEventTargetInterfaceType; }77 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDEFINAL { return ContextDestructionObserver::scriptExecutionContext(); }75 virtual EventTargetInterface eventTargetInterface() const FINAL { return MediaStreamEventTargetInterfaceType; } 76 virtual ScriptExecutionContext* scriptExecutionContext() const FINAL { return ContextDestructionObserver::scriptExecutionContext(); } 78 77 79 78 using RefCounted<MediaStream>::ref; … … 87 86 88 87 // ContextDestructionObserver 89 virtual void contextDestroyed() ;88 virtual void contextDestroyed() OVERRIDE; 90 89 91 90 private: … … 95 94 96 95 // 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(); } 99 98 100 99 // MediaStreamDescriptorClient -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
r156488 r156719 45 45 class MediaStreamTrackSourcesCallback; 46 46 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 { 47 class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer { 49 48 public: 50 49 virtual ~MediaStreamTrack(); … … 71 70 72 71 // 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(); } 75 74 76 75 // ActiveDOMObject … … 87 86 88 87 // 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(); } 91 90 92 91 // MediaStreamSourceObserver -
trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h
r156413 r156719 42 42 class RTCDTMFSenderHandler; 43 43 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 { 44 class RTCDTMFSender FINAL : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject { 46 45 public: 47 46 static PassRefPtr<RTCDTMFSender> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, PassRefPtr<MediaStreamTrack>, ExceptionCode&); … … 61 60 62 61 // 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(); } 65 64 66 65 // ActiveDOMObject … … 77 76 78 77 // 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(); } 81 80 82 81 // RTCDTMFSenderHandlerClient -
trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h
r156413 r156719 46 46 class RTCPeerConnectionHandler; 47 47 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 { 48 class RTCDataChannel FINAL : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient { 50 49 public: 51 50 static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>); … … 81 80 82 81 // 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; } 85 84 86 85 using RefCounted<RTCDataChannel>::ref; … … 94 93 95 94 // 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(); } 98 97 99 98 ScriptExecutionContext* m_scriptExecutionContext; -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r156413 r156719 59 59 class VoidCallback; 60 60 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 { 61 class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject { 63 62 public: 64 63 static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&); … … 122 121 123 122 // 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(); } 126 125 127 126 // ActiveDOMObject … … 140 139 141 140 // 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(); } 144 143 145 144 void changeSignalingState(SignalingState); -
trunk/Source/WebCore/Modules/notifications/Notification.h
r156550 r156719 64 64 typedef int ExceptionCode; 65 65 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 { 66 class Notification FINAL : public RefCounted<Notification>, public ActiveDOMObject, public EventTargetWithInlineData { 68 67 WTF_MAKE_FAST_ALLOCATED; 69 68 public: … … 124 123 125 124 // 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(); } 128 127 129 128 void stopLoadingIcon(); … … 154 153 155 154 // 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(); } 158 157 159 158 void startLoadingIcon(); -
trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h
r156413 r156719 38 38 namespace WebCore { 39 39 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 { 40 class SpeechSynthesisUtterance FINAL : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData { 42 41 public: 43 42 static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&); … … 77 76 using RefCounted<SpeechSynthesisUtterance>::deref; 78 77 79 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL{ return ContextDestructionObserver::scriptExecutionContext(); }78 virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ContextDestructionObserver::scriptExecutionContext(); } 80 79 81 80 PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platformUtterance.get(); } … … 86 85 RefPtr<SpeechSynthesisVoice> m_voice; 87 86 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(); } 91 90 }; 92 91 -
trunk/Source/WebCore/Modules/websockets/WebSocket.h
r156550 r156719 51 51 class ThreadableWebSocketChannel; 52 52 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 { 53 class WebSocket FINAL : public RefCounted<WebSocket>, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient { 55 54 public: 56 55 static void setIsAvailable(bool); … … 99 98 100 99 // 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; 103 102 104 103 using RefCounted<WebSocket>::ref; … … 124 123 virtual void stop() OVERRIDE; 125 124 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(); } 128 127 129 128 size_t getFramingOverhead(size_t payloadSize); -
trunk/Source/WebCore/dom/MessagePort.h
r156413 r156719 48 48 typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray; 49 49 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 { 52 51 public: 53 52 static PassRefPtr<MessagePort> create(ScriptExecutionContext& scriptExecutionContext) { return adoptRef(new MessagePort(scriptExecutionContext)); } … … 75 74 void contextDestroyed(); 76 75 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; } 80 79 81 80 void dispatchMessages(); … … 107 106 explicit MessagePort(ScriptExecutionContext&); 108 107 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(); } 111 110 112 111 OwnPtr<MessagePortChannel> m_entangledChannel; -
trunk/Source/WebCore/dom/WebKitNamedFlow.h
r156413 r156719 47 47 class ScriptExecutionContext; 48 48 49 // FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed. 50 class WebKitNamedFlow : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData { 49 class WebKitNamedFlow FINAL : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData { 51 50 public: 52 51 static PassRefPtr<WebKitNamedFlow> create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName); … … 64 63 using RefCounted<WebKitNamedFlow>::deref; 65 64 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; 68 67 69 68 // This function is called from the JS binding code to determine if the NamedFlow object is reachable or not. … … 87 86 88 87 // 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(); } 91 90 92 91 // The name of the flow thread as specified in CSS. -
trunk/Source/WebCore/fileapi/FileReader.h
r156413 r156719 54 54 typedef int ExceptionCode; 55 55 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 { 56 class FileReader FINAL : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient { 58 57 public: 59 58 static PassRefPtr<FileReader> create(ScriptExecutionContext*); … … 83 82 84 83 // 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(); } 87 86 88 87 // 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; 93 92 94 93 using RefCounted<FileReader>::ref; … … 103 102 104 103 private: 105 FileReader(ScriptExecutionContext*);104 explicit FileReader(ScriptExecutionContext*); 106 105 107 106 // ActiveDOMObject … … 110 109 111 110 // 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(); } 114 113 115 114 void terminate(); -
trunk/Source/WebCore/html/MediaController.h
r156413 r156719 44 44 class ScriptExecutionContext; 45 45 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 { 46 class MediaController FINAL : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData { 48 47 public: 49 48 static PassRefPtr<MediaController> create(ScriptExecutionContext*); … … 56 55 const String& mediaGroup() const { return m_mediaGroup; } 57 56 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; 61 60 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; 65 64 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; 69 68 void unpause(); 70 69 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; 73 72 74 virtual double playbackRate() const ;75 virtual void setPlaybackRate(double) ;73 virtual double playbackRate() const OVERRIDE; 74 virtual void setPlaybackRate(double) OVERRIDE; 76 75 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; 79 78 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; 82 81 83 virtual ReadyState readyState() const { return m_readyState; }82 virtual ReadyState readyState() const OVERRIDE { return m_readyState; } 84 83 85 84 enum PlaybackState { WAITING, PLAYING, ENDED }; 86 85 const AtomicString& playbackState() const; 87 86 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 { } 91 90 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; } 97 96 98 virtual bool supportsScanning() const ;97 virtual bool supportsScanning() const OVERRIDE; 99 98 100 virtual void beginScrubbing() ;101 virtual void endScrubbing() ;99 virtual void beginScrubbing() OVERRIDE; 100 virtual void endScrubbing() OVERRIDE; 102 101 103 virtual bool canPlay() const ;102 virtual bool canPlay() const OVERRIDE; 104 103 105 virtual bool isLiveStream() const ;104 virtual bool isLiveStream() const OVERRIDE; 106 105 107 virtual bool hasCurrentSrc() const ;106 virtual bool hasCurrentSrc() const OVERRIDE; 108 107 109 virtual void returnToRealtime() ;108 virtual void returnToRealtime() OVERRIDE; 110 109 111 110 bool isBlocked() const; … … 131 130 132 131 // 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; }; 137 136 138 137 friend class HTMLMediaElement; -
trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h
r156550 r156719 44 44 class URL; 45 45 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 { 46 class DOMApplicationCache FINAL : public ScriptWrappable, public RefCounted<DOMApplicationCache>, public EventTargetWithInlineData, public DOMWindowProperty { 48 47 public: 49 48 static PassRefPtr<DOMApplicationCache> create(Frame* frame) { return adoptRef(new DOMApplicationCache(frame)); } … … 73 72 DEFINE_ATTRIBUTE_EVENT_LISTENER(obsolete); 74 73 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; 77 76 78 77 static const AtomicString& toEventType(ApplicationCacheHost::EventID id); … … 81 80 explicit DOMApplicationCache(Frame*); 82 81 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(); } 85 84 86 85 ApplicationCacheHost* applicationCacheHost() const; -
trunk/Source/WebCore/page/EventSource.h
r156550 r156719 49 49 class ThreadableLoader; 50 50 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 { 51 class EventSource FINAL : public RefCounted<EventSource>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject { 53 52 WTF_MAKE_FAST_ALLOCATED; 54 53 public: … … 77 76 using RefCounted<EventSource>::deref; 78 77 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(); } 81 80 82 81 private: 83 82 EventSource(ScriptExecutionContext*, const URL&, const Dictionary&); 84 83 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(); } 87 86 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; 94 93 95 94 virtual void stop() OVERRIDE; -
trunk/Source/WebCore/page/Performance.h
r156413 r156719 53 53 class UserTiming; 54 54 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 { 55 class Performance FINAL : public ScriptWrappable, public RefCounted<Performance>, public DOMWindowProperty, public EventTargetWithInlineData { 57 56 public: 58 57 static PassRefPtr<Performance> create(Frame* frame) { return adoptRef(new Performance(frame)); } 59 58 ~Performance(); 60 59 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; 63 62 64 63 PerformanceNavigation* navigation() const; … … 95 94 explicit Performance(Frame*); 96 95 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(); } 99 98 bool isResourceTimingBufferFull(); 100 99 -
trunk/Source/WebCore/xml/XMLHttpRequest.h
r156550 r156719 52 52 class ThreadableLoader; 53 53 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 { 54 class XMLHttpRequest FINAL : public ScriptWrappable, public RefCounted<XMLHttpRequest>, public EventTargetWithInlineData, private ThreadableLoaderClient, public ActiveDOMObject { 56 55 WTF_MAKE_FAST_ALLOCATED; 57 56 public: … … 84 83 #endif 85 84 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(); } 88 87 89 88 const URL& url() const { return m_url; } … … 160 159 161 160 private: 162 XMLHttpRequest(ScriptExecutionContext*);161 explicit XMLHttpRequest(ScriptExecutionContext*); 163 162 164 163 // ActiveDOMObject … … 169 168 virtual void stop() OVERRIDE; 170 169 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(); } 173 172 174 173 Document* document() const; … … 179 178 #endif 180 179 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; 187 186 188 187 String responseMIMEType() const; -
trunk/Source/WebCore/xml/XMLHttpRequestUpload.h
r156413 r156719 44 44 class XMLHttpRequest; 45 45 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 { 48 47 public: 49 48 static PassOwnPtr<XMLHttpRequestUpload> create(XMLHttpRequest* xmlHttpRequest) … … 56 55 XMLHttpRequest* xmlHttpRequest() const { return m_xmlHttpRequest; } 57 56 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(); } 60 59 61 60 DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
Note: See TracChangeset
for help on using the changeset viewer.