Commit 456ec210 authored by akling@apple.com's avatar akling@apple.com

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.)


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156719 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a858b32f
2013-10-01 Andreas Kling <akling@apple.com>
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.)
2013-10-01 Szabolcs Dávid <davidsz@inf.u-szeged.hu>
Rename URL type variables in Curl network backend.
......@@ -45,8 +45,7 @@ class MediaKeyError;
class MediaKeys;
class CDMSession;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class MediaKeySession : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver {
class MediaKeySession FINAL : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver {
public:
static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
~MediaKeySession();
......@@ -73,8 +72,8 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaKeySessionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaKeySessionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ContextDestructionObserver::scriptExecutionContext(); }
protected:
MediaKeySession(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
......@@ -100,8 +99,8 @@ protected:
Timer<MediaKeySession> m_addKeyTimer;
private:
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
};
}
......
......@@ -50,8 +50,7 @@ class IDBObjectStore;
class IDBOpenDBRequest;
struct IDBObjectStoreMetadata;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class IDBTransaction : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTargetWithInlineData, public ActiveDOMObject {
class IDBTransaction FINAL : public ScriptWrappable, public RefCounted<IDBTransaction>, public EventTargetWithInlineData, public ActiveDOMObject {
public:
static PassRefPtr<IDBTransaction> create(ScriptExecutionContext*, int64_t, const Vector<String>& objectStoreNames, IndexedDB::TransactionMode, IDBDatabase*);
static PassRefPtr<IDBTransaction> create(ScriptExecutionContext*, int64_t, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata& previousMetadata);
......@@ -102,15 +101,15 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
virtual void onAbort(PassRefPtr<IDBDatabaseError>);
virtual void onComplete();
void onAbort(PassRefPtr<IDBDatabaseError>);
void onComplete();
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return IDBTransactionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return IDBTransactionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
using EventTarget::dispatchEvent;
virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE FINAL;
virtual bool dispatchEvent(PassRefPtr<Event>) OVERRIDE;
// ActiveDOMObject
virtual bool hasPendingActivity() const OVERRIDE;
......@@ -132,8 +131,8 @@ private:
virtual void stop() OVERRIDE;
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
enum State {
Inactive, // Created or started, but not in an event callback
......
......@@ -49,8 +49,7 @@ class MediaSource;
class SourceBufferPrivate;
class TimeRanges;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class SourceBuffer : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable {
class SourceBuffer FINAL : public RefCounted<SourceBuffer>, public ActiveDOMObject, public EventTargetWithInlineData, public ScriptWrappable {
public:
static PassRefPtr<SourceBuffer> create(PassOwnPtr<SourceBufferPrivate>, MediaSource*);
......@@ -73,16 +72,16 @@ public:
virtual void stop() OVERRIDE;
// EventTarget interface
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SourceBufferEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SourceBufferEventTargetInterfaceType; }
using RefCounted<SourceBuffer>::ref;
using RefCounted<SourceBuffer>::deref;
protected:
// EventTarget interface
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
private:
SourceBuffer(PassOwnPtr<SourceBufferPrivate>, MediaSource*);
......
......@@ -43,8 +43,7 @@ namespace WebCore {
class SourceBuffer;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class SourceBufferList : public RefCounted<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
class SourceBufferList FINAL : public RefCounted<SourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
public:
static PassRefPtr<SourceBufferList> create(ScriptExecutionContext* context)
{
......@@ -61,19 +60,19 @@ public:
void clear();
// EventTarget interface
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SourceBufferListEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SourceBufferListEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
using RefCounted<SourceBufferList>::ref;
using RefCounted<SourceBufferList>::deref;
private:
SourceBufferList(ScriptExecutionContext*);
explicit SourceBufferList(ScriptExecutionContext*);
void scheduleEvent(const AtomicString&);
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
ScriptExecutionContext* m_scriptExecutionContext;
GenericEventQueue m_asyncEventQueue;
......
......@@ -44,8 +44,7 @@ namespace WebCore {
class WebKitSourceBuffer;
class GenericEventQueue;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class WebKitSourceBufferList : public RefCounted<WebKitSourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
class WebKitSourceBufferList FINAL : public RefCounted<WebKitSourceBufferList>, public ScriptWrappable, public EventTargetWithInlineData {
public:
static PassRefPtr<WebKitSourceBufferList> create(ScriptExecutionContext* context)
{
......@@ -61,19 +60,19 @@ public:
void clear();
// EventTarget interface
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return WebKitSourceBufferListEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return WebKitSourceBufferListEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
using RefCounted<WebKitSourceBufferList>::ref;
using RefCounted<WebKitSourceBufferList>::deref;
private:
WebKitSourceBufferList(ScriptExecutionContext*);
explicit WebKitSourceBufferList(ScriptExecutionContext*);
void createAndFireEvent(const AtomicString&);
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
ScriptExecutionContext* m_scriptExecutionContext;
GenericEventQueue m_asyncEventQueue;
......
......@@ -44,8 +44,7 @@ namespace WebCore {
class MediaStreamCenter;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class MediaStream : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver {
class MediaStream FINAL : public RefCounted<MediaStream>, public URLRegistrable, public ScriptWrappable, public MediaStreamDescriptorClient, public EventTargetWithInlineData, public ContextDestructionObserver {
public:
static PassRefPtr<MediaStream> create(ScriptExecutionContext*);
static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStream>);
......@@ -73,8 +72,8 @@ public:
MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaStreamEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const FINAL { return MediaStreamEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
using RefCounted<MediaStream>::ref;
using RefCounted<MediaStream>::deref;
......@@ -86,7 +85,7 @@ protected:
MediaStream(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
// ContextDestructionObserver
virtual void contextDestroyed();
virtual void contextDestroyed() OVERRIDE;
private:
// MediaStreamDescriptorClient
......@@ -94,8 +93,8 @@ private:
virtual void streamDidEnd() OVERRIDE;
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
// MediaStreamDescriptorClient
virtual void addRemoteSource(MediaStreamSource*) OVERRIDE;
......
......@@ -44,8 +44,7 @@ class Dictionary;
class MediaConstraints;
class MediaStreamTrackSourcesCallback;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
class MediaStreamTrack FINAL : public RefCounted<MediaStreamTrack>, public ScriptWrappable, public ActiveDOMObject, public EventTargetWithInlineData, public MediaStreamSource::Observer {
public:
virtual ~MediaStreamTrack();
......@@ -70,8 +69,8 @@ public:
bool ended() const;
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MediaStreamTrackEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MediaStreamTrackEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
// ActiveDOMObject
virtual void stop() OVERRIDE;
......@@ -86,8 +85,8 @@ private:
void trackDidEnd();
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
// MediaStreamSourceObserver
virtual void sourceChangedState() OVERRIDE;
......
......@@ -41,8 +41,7 @@ class MediaStreamTrack;
class RTCPeerConnectionHandler;
class RTCDTMFSenderHandler;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class RTCDTMFSender : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject {
class RTCDTMFSender FINAL : public RefCounted<RTCDTMFSender>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDTMFSenderHandlerClient, public ActiveDOMObject {
public:
static PassRefPtr<RTCDTMFSender> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, PassRefPtr<MediaStreamTrack>, ExceptionCode&);
~RTCDTMFSender();
......@@ -60,8 +59,8 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange);
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCDTMFSenderEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCDTMFSenderEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
// ActiveDOMObject
virtual void stop() OVERRIDE;
......@@ -76,8 +75,8 @@ private:
void scheduledEventTimerFired(Timer<RTCDTMFSender>*);
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
// RTCDTMFSenderHandlerClient
virtual void didPlayTone(const String&) OVERRIDE;
......
......@@ -45,8 +45,7 @@ class Dictionary;
class RTCDataChannelHandler;
class RTCPeerConnectionHandler;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class RTCDataChannel : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
class RTCDataChannel FINAL : public RefCounted<RTCDataChannel>, public ScriptWrappable, public EventTargetWithInlineData, public RTCDataChannelHandlerClient {
public:
static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, PassOwnPtr<RTCDataChannelHandler>);
static PassRefPtr<RTCDataChannel> create(ScriptExecutionContext*, RTCPeerConnectionHandler*, const String& , const Dictionary&, ExceptionCode&);
......@@ -80,8 +79,8 @@ public:
void stop();
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCDataChannelEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCDataChannelEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
using RefCounted<RTCDataChannel>::ref;
using RefCounted<RTCDataChannel>::deref;
......@@ -93,8 +92,8 @@ private:
void scheduledEventTimerFired(Timer<RTCDataChannel>*);
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
ScriptExecutionContext* m_scriptExecutionContext;
......
......@@ -58,8 +58,7 @@ class RTCSessionDescriptionCallback;
class RTCStatsCallback;
class VoidCallback;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class RTCPeerConnection : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
class RTCPeerConnection FINAL : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTargetWithInlineData, public ActiveDOMObject {
public:
static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
~RTCPeerConnection();
......@@ -121,8 +120,8 @@ public:
virtual void didAddRemoteDataChannel(PassOwnPtr<RTCDataChannelHandler>) OVERRIDE;
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return RTCPeerConnectionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return RTCPeerConnectionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
// ActiveDOMObject
virtual void stop() OVERRIDE;
......@@ -139,8 +138,8 @@ private:
bool hasLocalStreamWithTrackId(const String& trackId);
// EventTarget implementation.
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
void changeSignalingState(SignalingState);
void changeIceGatheringState(IceGatheringState);
......
......@@ -63,8 +63,7 @@ class ThreadableLoader;
typedef int ExceptionCode;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class Notification : public RefCounted<Notification>, public ActiveDOMObject, public EventTargetWithInlineData {
class Notification FINAL : public RefCounted<Notification>, public ActiveDOMObject, public EventTargetWithInlineData {
WTF_MAKE_FAST_ALLOCATED;
public:
Notification();
......@@ -123,8 +122,8 @@ public:
using RefCounted<Notification>::deref;
// EventTarget interface
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return NotificationEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return NotificationEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
void stopLoadingIcon();
......@@ -153,8 +152,8 @@ private:
virtual void contextDestroyed() OVERRIDE;
// EventTarget interface
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
void startLoadingIcon();
void finishLoadingIcon();
......
......@@ -37,8 +37,7 @@
namespace WebCore {
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class SpeechSynthesisUtterance : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData {
class SpeechSynthesisUtterance FINAL : public PlatformSpeechSynthesisUtteranceClient, public RefCounted<SpeechSynthesisUtterance>, public ContextDestructionObserver, public EventTargetWithInlineData {
public:
static PassRefPtr<SpeechSynthesisUtterance> create(ScriptExecutionContext*, const String&);
......@@ -76,7 +75,7 @@ public:
using RefCounted<SpeechSynthesisUtterance>::ref;
using RefCounted<SpeechSynthesisUtterance>::deref;
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ContextDestructionObserver::scriptExecutionContext(); }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ContextDestructionObserver::scriptExecutionContext(); }
PlatformSpeechSynthesisUtterance* platformUtterance() const { return m_platformUtterance.get(); }
......@@ -85,9 +84,9 @@ private:
RefPtr<PlatformSpeechSynthesisUtterance> m_platformUtterance;
RefPtr<SpeechSynthesisVoice> m_voice;
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return SpeechSynthesisUtteranceEventTargetInterfaceType; }
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return SpeechSynthesisUtteranceEventTargetInterfaceType; }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
};
} // namespace WebCore
......
......@@ -50,8 +50,7 @@ namespace WebCore {
class Blob;
class ThreadableWebSocketChannel;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class WebSocket : public RefCounted<WebSocket>, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
class WebSocket FINAL : public RefCounted<WebSocket>, public EventTargetWithInlineData, public ActiveDOMObject, public WebSocketChannelClient {
public:
static void setIsAvailable(bool);
static bool isAvailable();
......@@ -98,8 +97,8 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
// EventTarget functions.
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL;
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
virtual EventTargetInterface eventTargetInterface() const OVERRIDE;
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
using RefCounted<WebSocket>::ref;
using RefCounted<WebSocket>::deref;
......@@ -123,8 +122,8 @@ private:
virtual void resume() OVERRIDE;
virtual void stop() OVERRIDE;
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
size_t getFramingOverhead(size_t payloadSize);
......
......@@ -47,8 +47,7 @@ namespace WebCore {
// The overwhelmingly common case is sending a single port, so handle that efficiently with an inline buffer of size 1.
typedef Vector<RefPtr<MessagePort>, 1> MessagePortArray;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class MessagePort : public RefCounted<MessagePort>, public EventTargetWithInlineData {
class MessagePort FINAL : public RefCounted<MessagePort>, public EventTargetWithInlineData {
public:
static PassRefPtr<MessagePort> create(ScriptExecutionContext& scriptExecutionContext) { return adoptRef(new MessagePort(scriptExecutionContext)); }
virtual ~MessagePort();
......@@ -74,9 +73,9 @@ namespace WebCore {
void contextDestroyed();
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return MessagePortEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return m_scriptExecutionContext; }
virtual bool isMessagePort() const OVERRIDE FINAL { return true; }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return MessagePortEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return m_scriptExecutionContext; }
virtual bool isMessagePort() const OVERRIDE { return true; }
void dispatchMessages();
......@@ -106,8 +105,8 @@ namespace WebCore {
private:
explicit MessagePort(ScriptExecutionContext&);
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
OwnPtr<MessagePortChannel> m_entangledChannel;
......
......@@ -46,8 +46,7 @@ class NodeList;
class RenderNamedFlowThread;
class ScriptExecutionContext;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class WebKitNamedFlow : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
class WebKitNamedFlow FINAL : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
public:
static PassRefPtr<WebKitNamedFlow> create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName);
......@@ -63,8 +62,8 @@ public:
using RefCounted<WebKitNamedFlow>::ref;
using RefCounted<WebKitNamedFlow>::deref;
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return WebKitNamedFlowEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL;
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return WebKitNamedFlowEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
// This function is called from the JS binding code to determine if the NamedFlow object is reachable or not.
// If the object has listeners, the object should only be discarded if the parent Document is not reachable.
......@@ -86,8 +85,8 @@ private:
WebKitNamedFlow(PassRefPtr<NamedFlowCollection>, const AtomicString&);
// EventTarget implementation.
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
// The name of the flow thread as specified in CSS.
AtomicString m_flowThreadName;
......
......@@ -53,8 +53,7 @@ class ScriptExecutionContext;
typedef int ExceptionCode;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class FileReader : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
class FileReader FINAL : public RefCounted<FileReader>, public ActiveDOMObject, public EventTargetWithInlineData, public FileReaderLoaderClient {
public:
static PassRefPtr<FileReader> create(ScriptExecutionContext*);
......@@ -82,14 +81,14 @@ public:
String stringResult();
// EventTarget
virtual EventTargetInterface eventTargetInterface() const OVERRIDE FINAL { return FileReaderEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE FINAL { return ActiveDOMObject::scriptExecutionContext(); }
virtual EventTargetInterface eventTargetInterface() const OVERRIDE { return FileReaderEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE { return ActiveDOMObject::scriptExecutionContext(); }
// FileReaderLoaderClient
virtual void didStartLoading();
virtual void didReceiveData();
virtual void didFinishLoading();
virtual void didFail(int errorCode);
virtual void didStartLoading() OVERRIDE;
virtual void didReceiveData() OVERRIDE;
virtual void didFinishLoading() OVERRIDE;
virtual void didFail(int errorCode) OVERRIDE;
using RefCounted<FileReader>::ref;
using RefCounted<FileReader>::deref;
......@@ -102,15 +101,15 @@ public:
DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
private:
FileReader(ScriptExecutionContext*);
explicit FileReader(ScriptExecutionContext*);
// ActiveDOMObject
virtual bool canSuspend() const OVERRIDE;
virtual void stop() OVERRIDE;
// EventTarget
virtual void refEventTarget() OVERRIDE FINAL { ref(); }
virtual void derefEventTarget() OVERRIDE FINAL { deref(); }
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
void terminate();
void readInternal(Blob*, FileReaderLoader::ReadType, ExceptionCode&);
......
......@@ -43,8 +43,7 @@ class HTMLMediaElement;
class Event;
class ScriptExecutionContext;
// FIXME: This class should be marked FINAL once <http://webkit.org/b/121747> is fixed.
class MediaController : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
class MediaController FINAL : public RefCounted<MediaController>, public MediaControllerInterface, public EventTargetWithInlineData {
public:
static PassRefPtr<MediaController> create(ScriptExecutionContext*);
virtual ~MediaController();
......@@ -55,58 +54,58 @@ public:
const String& mediaGroup() const { return m_mediaGroup; }
virtual PassRefPtr<TimeRanges> buffered() const;
virtual PassRefPtr<TimeRanges> seekable() const;
virtual PassRefPtr<TimeRanges> played();
virtual PassRefPtr<TimeRanges> buffered() const OVERRIDE;
virtual PassRefPtr<TimeRanges> seekable() const OVERRIDE;
virtual PassRefPtr<TimeRanges> played() OVERRIDE;
virtual double duration() const;
virtual double currentTime() const;
virtual void setCurrentTime(double, ExceptionCode&);
virtual double duration() const OVERRIDE;
virtual double currentTime() const OVERRIDE;
virtual void setCurrentTime(double, ExceptionCode&) OVERRIDE;
virtual bool paused() const { return m_paused; }
virtual void play();
virtual void pause();
virtual bool paused() const OVERRIDE { return m_paused; }
virtual void play() OVERRIDE;
virtual void pause() OVERRIDE;
void unpause();
virtual double defaultPlaybackRate() const { return m_defaultPlaybackRate; }
virtual void setDefaultPlaybackRate(double);
virtual double defaultPlaybackRate() const OVERRIDE { return m_defaultPlaybackRate; }
virtual void setDefaultPlaybackRate(double) OVERRIDE;
virtual double playbackRate() const;
virtual void setPlaybackRate(double);
virtual double playbackRate() const OVERRIDE;
virtual void setPlaybackRate(double) OVERRIDE;
virtual double volume() const { return m_volume; }
virtual void setVolume(double, ExceptionCode&);
virtual double volume() const OVERRIDE { return m_volume; }
virtual void setVolume(double, ExceptionCode&) OVERRIDE;
virtual bool muted() const { return m_muted; }
virtual void setMuted(bool);
virtual bool muted() const OVERRIDE { return m_muted; }
virtual void setMuted(bool) OVERRIDE;
virtual ReadyState readyState() const { return m_readyState; }
virtual ReadyState readyState() const OVERRIDE { return m_readyState; }
enum PlaybackState { WAITING, PLAYING, ENDED };
const AtomicString& playbackState() const;
virtual bool supportsFullscreen() const { return false; }
virtual bool isFullscreen() const { return false; }
virtual void enterFullscreen() { }
virtual bool supportsFullscreen() const OVERRIDE { return false; }
virtual bool isFullscreen() const OVERRIDE { return false; }
virtual void enterFullscreen() OVERRIDE { }
virtual bool hasAudio() const;
virtual bool hasVideo() const;
virtual bool hasClosedCaptions() const;
virtual void setClosedCaptionsVisible(bool);
virtual bool closedCaptionsVisible() const { return m_closedCaptionsVisible; }
virtual bool hasAudio() const OVERRIDE;
virtual bool hasVideo() const OVERRIDE;
virtual bool hasClosedCaptions() const OVERRIDE;