Diff
Modified: trunk/Source/WebCore/ChangeLog (181168 => 181169)
--- trunk/Source/WebCore/ChangeLog 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/ChangeLog 2015-03-06 18:45:48 UTC (rev 181169)
@@ -1,3 +1,68 @@
+2015-03-06 Darin Adler <da...@apple.com>
+
+ Remove unused C++ DOM event handler attribute functions
+ https://bugs.webkit.org/show_bug.cgi?id=142398
+
+ Reviewed by Anders Carlsson.
+
+ * dom/EventTarget.h: Removed now-unneeded macros: DEFINE_ATTRIBUTE_EVENT_LISTENER,
+ DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER, DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER,
+ DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER, DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER,
+ DECLARE_FORWARDING_ATTRIBUTE_EVENT_LISTENER, DEFINE_FORWARDING_ATTRIBUTE_EVENT_LISTENER.
+
+ * Modules/webaudio/AudioScheduledSourceNode.cpp:
+ (WebCore::AudioScheduledSourceNode::setOnended): Deleted.
+ (WebCore::AudioScheduledSourceNode::finish): Rewrote this to use dispatchEvent
+ instead of one-off event-sending code. Also use a lambda to avoid needing two
+ additional member functions to implement this.
+ (WebCore::AudioScheduledSourceNode::notifyEndedDispatch): Deleted.
+ (WebCore::AudioScheduledSourceNode::notifyEnded): Deleted.
+ * Modules/webaudio/AudioScheduledSourceNode.h: Updated for above.
+
+ * Modules/battery/BatteryManager.h: Removed onxxx and setOnxxx functions,
+ including ones created with macros from EventTarget.h.
+ * Modules/encryptedmedia/MediaKeySession.h: Ditto.
+ * Modules/indexeddb/IDBDatabase.h: Ditto.
+ * Modules/indexeddb/IDBOpenDBRequest.h: Ditto.
+ * Modules/indexeddb/IDBRequest.h: Ditto.
+ * Modules/indexeddb/IDBTransaction.h: Ditto.
+ * Modules/mediastream/MediaStream.h: Ditto.
+ * Modules/mediastream/MediaStreamTrack.h: Ditto.
+ * Modules/mediastream/RTCDTMFSender.h: Ditto.
+ * Modules/mediastream/RTCDataChannel.h: Ditto.
+ * Modules/mediastream/RTCPeerConnection.h: Ditto.
+ * Modules/notifications/Notification.h: Ditto.
+ * Modules/speech/SpeechSynthesisUtterance.h: Ditto.
+ * Modules/webaudio/AudioContext.h: Ditto.
+ * Modules/webaudio/ScriptProcessorNode.cpp: Ditto.
+ * Modules/webaudio/ScriptProcessorNode.h: Ditto.
+ * Modules/websockets/WebSocket.h: Ditto.
+ * css/FontLoader.h: Ditto.
+ * dom/Document.h: Ditto.
+ * dom/Element.cpp: Ditto.
+ * dom/Element.h: Ditto.
+ * dom/MessagePort.h: Ditto.
+ * fileapi/FileReader.h: Ditto.
+ * html/HTMLBodyElement.h: Ditto.
+ * html/HTMLFormElement.h: Ditto.
+ * html/HTMLFrameSetElement.h: Ditto.
+ * html/HTMLInputElement.h: Ditto.
+ * html/HTMLMediaElement.h: Ditto.
+ * html/HTMLVideoElement.h: Ditto.
+ * html/track/TextTrack.h: Ditto.
+ * html/track/TextTrackCue.h: Ditto.
+ * html/track/TrackListBase.h: Ditto.
+ * loader/appcache/DOMApplicationCache.h: Ditto.
+ * page/DOMWindow.h: Ditto.
+ * page/EventSource.h: Ditto.
+ * page/Performance.h: Ditto.
+ * workers/AbstractWorker.h: Ditto.
+ * workers/DedicatedWorkerGlobalScope.h: Ditto.
+ * workers/Worker.h: Ditto.
+ * workers/WorkerGlobalScope.h: Ditto.
+ * xml/XMLHttpRequest.h: Ditto.
+ * xml/XMLHttpRequestUpload.h: Ditto.
+
2015-03-06 Said Abou-Hallawa <sabouhall...@apple.com>
Setting any of the <object> element plugin controlling attributes does not have any affect.
Modified: trunk/Source/WebCore/Modules/battery/BatteryManager.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/battery/BatteryManager.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/battery/BatteryManager.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -46,11 +46,6 @@
double dischargingTime();
double level();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(chargingtimechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dischargingtimechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(levelchange);
-
void didChangeBatteryStatus(PassRefPtr<Event>, PassRefPtr<BatteryStatus>);
void updateBatteryStatus(PassRefPtr<BatteryStatus>);
void batteryControllerDestroyed() { m_batteryController = nullptr; }
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -73,10 +73,6 @@
void enqueueEvent(PassRefPtr<Event>);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
-
virtual EventTargetInterface eventTargetInterface() const override { return MediaKeySessionEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -71,10 +71,6 @@
void deleteObjectStore(const String& name, ExceptionCode&);
void close();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(versionchange);
-
// IDBDatabaseCallbacks
virtual void onVersionChange(uint64_t oldVersion, uint64_t newVersion, IndexedDB::VersionNullness newVersionNullness);
virtual void onAbort(int64_t, PassRefPtr<IDBDatabaseError>);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -50,9 +50,6 @@
virtual EventTargetInterface eventTargetInterface() const;
virtual bool dispatchEvent(PassRefPtr<Event>) override;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(blocked);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(upgradeneeded);
-
protected:
virtual bool shouldEnqueueEvent() const override;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -73,9 +73,6 @@
const String& readyState() const;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(success);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
-
void markEarlyDeath();
void setCursorDetails(IndexedDB::CursorType, IndexedDB::CursorDirection);
void setPendingCursor(PassRefPtr<IDBCursor>);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -96,10 +96,6 @@
void setActive(bool);
void setError(PassRefPtr<DOMError>, const String& errorMessage);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
-
void onAbort(PassRefPtr<IDBDatabaseError>);
void onComplete();
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -71,15 +71,9 @@
PassRefPtr<MediaStream> clone();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
-
bool active() const;
void setActive(bool);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(active);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);
-
MediaStreamPrivate* privateStream() const { return m_private.get(); }
// EventTarget
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -84,12 +84,6 @@
RefPtr<MediaStreamTrack> clone();
void stopProducingData();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(started);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(overconstrained);
-
RealtimeMediaSource* source() const { return m_privateTrack->source(); }
MediaStreamTrackPrivate& privateTrack() { return m_privateTrack.get(); }
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -56,8 +56,6 @@
void insertDTMF(const String& tones, long duration, ExceptionCode&);
void insertDTMF(const String& tones, long duration, long interToneGap, ExceptionCode&);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(tonechange);
-
// EventTarget
virtual EventTargetInterface eventTargetInterface() const override { return RTCDTMFSenderEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -71,11 +71,6 @@
void close();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(open);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
-
void stop();
// EventTarget
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -103,14 +103,6 @@
void close(ExceptionCode&);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(negotiationneeded);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(signalingstatechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(iceconnectionstatechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(datachannel);
-
// RTCPeerConnectionHandlerClient
virtual void negotiationNeeded() override;
virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) override;
Modified: trunk/Source/WebCore/Modules/notifications/Notification.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/notifications/Notification.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/notifications/Notification.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -102,15 +102,6 @@
TextDirection direction() const { return dir() == "rtl" ? RTL : LTR; }
-#if ENABLE(LEGACY_NOTIFICATIONS)
- EventListener* ondisplay() { return getAttributeEventListener(eventNames().showEvent); }
- void setOndisplay(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().showEvent, listener); }
-#endif
- DEFINE_ATTRIBUTE_EVENT_LISTENER(show);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
-
WEBCORE_EXPORT void dispatchClickEvent();
WEBCORE_EXPORT void dispatchCloseEvent();
WEBCORE_EXPORT void dispatchErrorEvent();
Modified: trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -64,14 +64,6 @@
double startTime() const { return m_platformUtterance->startTime(); }
void setStartTime(double startTime) { m_platformUtterance->setStartTime(startTime); }
- DEFINE_ATTRIBUTE_EVENT_LISTENER(start);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(end);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(resume);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mark);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(boundary);
-
using RefCounted<SpeechSynthesisUtterance>::ref;
using RefCounted<SpeechSynthesisUtterance>::deref;
Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -227,8 +227,6 @@
virtual EventTargetInterface eventTargetInterface() const override final { return AudioContextEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override final;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
-
// Reconcile ref/deref which are defined both in ThreadSafeRefCounted and EventTarget.
using ThreadSafeRefCounted<AudioContext>::ref;
using ThreadSafeRefCounted<AudioContext>::deref;
Modified: trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (181168 => 181169)
--- trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2015-03-06 18:45:48 UTC (rev 181169)
@@ -196,11 +196,6 @@
}
#endif
-void AudioScheduledSourceNode::setOnended(PassRefPtr<EventListener> listener)
-{
- setAttributeEventListener(eventNames().endedEvent, listener);
-}
-
void AudioScheduledSourceNode::finish()
{
if (m_playbackState != FINISHED_STATE) {
@@ -210,26 +205,13 @@
context()->decrementActiveSourceCount();
}
- if (m_hasEndedListener)
- callOnMainThread(&AudioScheduledSourceNode::notifyEndedDispatch, this);
+ if (m_hasEndedListener) {
+ callOnMainThread([this] {
+ dispatchEvent(Event::create(eventNames().endedEvent, false, false));
+ });
+ }
}
-void AudioScheduledSourceNode::notifyEndedDispatch(void* userData)
-{
- static_cast<AudioScheduledSourceNode*>(userData)->notifyEnded();
-}
-
-void AudioScheduledSourceNode::notifyEnded()
-{
- EventListener* listener = onended();
- if (!listener)
- return;
-
- RefPtr<Event> event = Event::create(eventNames().endedEvent, FALSE, FALSE);
- event->setTarget(this);
- listener->handleEvent(context()->scriptExecutionContext(), event.get());
-}
-
bool AudioScheduledSourceNode::addEventListener(const AtomicString& eventType, PassRefPtr<EventListener> listener, bool useCapture)
{
bool success = AudioNode::addEventListener(eventType, listener, useCapture);
Modified: trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -72,9 +72,6 @@
bool isPlayingOrScheduled() const { return m_playbackState == PLAYING_STATE || m_playbackState == SCHEDULED_STATE; }
bool hasFinished() const { return m_playbackState == FINISHED_STATE; }
- EventListener* onended() { return getAttributeEventListener(eventNames().endedEvent); }
- void setOnended(PassRefPtr<EventListener> listener);
-
protected:
// Get frame information for the current time quantum.
// We handle the transition into PLAYING_STATE and FINISHED_STATE here,
@@ -91,9 +88,6 @@
// Called when we have no more sound to play or the noteOff() time has been reached.
virtual void finish();
- static void notifyEndedDispatch(void*);
- void notifyEnded();
-
PlaybackState m_playbackState;
// m_startTime is the time to start playing based on the context's timeline (0 or a time less than the context's current time means "now").
Modified: trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp (181168 => 181169)
--- trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.cpp 2015-03-06 18:45:48 UTC (rev 181169)
@@ -217,11 +217,6 @@
}
}
-void ScriptProcessorNode::setOnaudioprocess(PassRefPtr<EventListener> listener)
-{
- setAttributeEventListener(eventNames().audioprocessEvent, listener);
-}
-
void ScriptProcessorNode::fireProcessEventDispatch(void* userData)
{
ScriptProcessorNode* jsAudioNode = static_cast<ScriptProcessorNode*>(userData);
Modified: trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/webaudio/ScriptProcessorNode.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -65,9 +65,6 @@
size_t bufferSize() const { return m_bufferSize; }
- EventListener* onaudioprocess() { return getAttributeEventListener(eventNames().audioprocessEvent); }
- void setOnaudioprocess(PassRefPtr<EventListener>);
-
private:
virtual double tailTime() const override;
virtual double latencyTime() const override;
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (181168 => 181169)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -89,11 +89,6 @@
String binaryType() const;
void setBinaryType(const String&);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(open);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(close);
-
// EventTarget functions.
virtual EventTargetInterface eventTargetInterface() const override;
virtual ScriptExecutionContext* scriptExecutionContext() const override;
Modified: trunk/Source/WebCore/css/FontLoader.h (181168 => 181169)
--- trunk/Source/WebCore/css/FontLoader.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/css/FontLoader.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -57,12 +57,6 @@
}
virtual ~FontLoader();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loading);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
-
bool checkFont(const String&, const String&);
void loadFont(const Dictionary&);
void loadFontDone(const LoadFontCallback&);
Modified: trunk/Source/WebCore/dom/Document.h (181168 => 181169)
--- trunk/Source/WebCore/dom/Document.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/dom/Document.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -324,82 +324,6 @@
// DOM methods & attributes for Document
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(contextmenu);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dblclick);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drop);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drag);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(input);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keydown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keypress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keyup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousedown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousemove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseout);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousewheel);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(scroll);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(select);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(submit);
-#if ENABLE(WILL_REVEAL_EDGE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealbottom);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealleft);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealright);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealtop);
-#endif
- DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(blur);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(focus);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(readystatechange);
-
- // WebKit extensions
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecut);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(cut);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecopy);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(copy);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforepaste);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(paste);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(reset);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(selectstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(selectionchange);
-#if ENABLE(TOUCH_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
-#endif
-#if ENABLE(IOS_GESTURE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturestart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gestureend);
-#endif
-#if ENABLE(FULLSCREEN_API)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenerror);
-#endif
-#if ENABLE(POINTER_LOCK)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pointerlockchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pointerlockerror);
-#endif
-#if ENABLE(CSP_NEXT)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(securitypolicyviolation);
-#endif
-
void setViewportArguments(const ViewportArguments& viewportArguments) { m_viewportArguments = viewportArguments; }
ViewportArguments viewportArguments() const { return m_viewportArguments; }
#ifndef NDEBUG
Modified: trunk/Source/WebCore/dom/Element.cpp (181168 => 181169)
--- trunk/Source/WebCore/dom/Element.cpp 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-03-06 18:45:48 UTC (rev 181169)
@@ -297,11 +297,6 @@
EventDispatcher::dispatchSimulatedClick(this, underlyingEvent, eventOptions, visualOptions);
}
-DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, blur);
-DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, error);
-DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, focus);
-DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(Element, load);
-
RefPtr<Node> Element::cloneNodeInternal(Document& targetDocument, CloningOperation type)
{
switch (type) {
Modified: trunk/Source/WebCore/dom/Element.h (181168 => 181169)
--- trunk/Source/WebCore/dom/Element.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/dom/Element.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -62,75 +62,6 @@
static Ref<Element> create(const QualifiedName&, Document&);
virtual ~Element();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(contextmenu);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dblclick);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drop);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drag);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(input);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keydown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keypress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keyup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousedown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousemove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseout);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousewheel);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(scroll);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(select);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(submit);
-#if ENABLE(WILL_REVEAL_EDGE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealbottom);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealleft);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealright);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealtop);
-#endif
- DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
-
- // These four attribute event handler attributes are overridden by HTMLBodyElement
- // and HTMLFrameSetElement to forward to the DOMWindow.
- DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(blur);
- DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(error);
- DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(focus);
- DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(load);
-
- // WebKit extensions
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecut);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(cut);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforecopy);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(copy);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforepaste);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(paste);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(reset);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(selectstart);
-#if ENABLE(TOUCH_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
-#endif
-#if ENABLE(IOS_GESTURE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturestart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gestureend);
-#endif
-#if ENABLE(FULLSCREEN_API)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitfullscreenerror);
-#endif
-
WEBCORE_EXPORT bool hasAttribute(const QualifiedName&) const;
WEBCORE_EXPORT const AtomicString& getAttribute(const QualifiedName&) const;
WEBCORE_EXPORT void setAttribute(const QualifiedName&, const AtomicString& value);
Modified: trunk/Source/WebCore/dom/EventTarget.h (181168 => 181169)
--- trunk/Source/WebCore/dom/EventTarget.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/dom/EventTarget.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -167,36 +167,6 @@
EventTargetData m_eventTargetData;
};
- // FIXME: These macros should be split into separate DEFINE and DECLARE
- // macros to avoid causing so many header includes.
- #define DEFINE_ATTRIBUTE_EVENT_LISTENER(attribute) \
- EventListener* on##attribute() { return getAttributeEventListener(eventNames().attribute##Event); } \
- void setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().attribute##Event, listener); } \
-
- #define DECLARE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(attribute) \
- virtual EventListener* on##attribute(); \
- virtual void setOn##attribute(PassRefPtr<EventListener> listener); \
-
- #define DEFINE_VIRTUAL_ATTRIBUTE_EVENT_LISTENER(type, attribute) \
- EventListener* type::on##attribute() { return getAttributeEventListener(eventNames().attribute##Event); } \
- void type::setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().attribute##Event, listener); } \
-
- #define DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(attribute) \
- EventListener* on##attribute() { return document().getWindowAttributeEventListener(eventNames().attribute##Event); } \
- void setOn##attribute(PassRefPtr<EventListener> listener) { document().setWindowAttributeEventListener(eventNames().attribute##Event, listener); } \
-
- #define DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(attribute, eventName) \
- EventListener* on##attribute() { return getAttributeEventListener(eventNames().eventName##Event); } \
- void setOn##attribute(PassRefPtr<EventListener> listener) { setAttributeEventListener(eventNames().eventName##Event, listener); } \
-
- #define DECLARE_FORWARDING_ATTRIBUTE_EVENT_LISTENER(recipient, attribute) \
- EventListener* on##attribute(); \
- void setOn##attribute(PassRefPtr<EventListener> listener);
-
- #define DEFINE_FORWARDING_ATTRIBUTE_EVENT_LISTENER(type, recipient, attribute) \
- EventListener* type::on##attribute() { return recipient ? recipient->getAttributeEventListener(eventNames().attribute##Event) : 0; } \
- void type::setOn##attribute(PassRefPtr<EventListener> listener) { if (recipient) recipient->setAttributeEventListener(eventNames().attribute##Event, listener); }
-
inline void EventTarget::visitJSEventListeners(JSC::SlotVisitor& visitor)
{
EventListenerIterator iterator(this);
Modified: trunk/Source/WebCore/dom/MessagePort.h (181168 => 181169)
--- trunk/Source/WebCore/dom/MessagePort.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/dom/MessagePort.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -82,12 +82,6 @@
bool hasPendingActivity();
- void setOnmessage(PassRefPtr<EventListener> listener)
- {
- setAttributeEventListener(eventNames().messageEvent, listener);
- }
- EventListener* onmessage() { return getAttributeEventListener(eventNames().messageEvent); }
-
// Returns null if there is no entangled port, or if the entangled port is run by a different thread.
// This is used solely to enable a GC optimization. Some platforms may not be able to determine ownership
// of the remote port (since it may live cross-process) - those platforms may always return null.
Modified: trunk/Source/WebCore/fileapi/FileReader.h (181168 => 181169)
--- trunk/Source/WebCore/fileapi/FileReader.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/fileapi/FileReader.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -92,13 +92,6 @@
using RefCounted<FileReader>::ref;
using RefCounted<FileReader>::deref;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
-
private:
explicit FileReader(ScriptExecutionContext&);
Modified: trunk/Source/WebCore/html/HTMLBodyElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLBodyElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLBodyElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -36,26 +36,6 @@
static Ref<HTMLBodyElement> create(const QualifiedName&, Document&);
virtual ~HTMLBodyElement();
- // Declared virtual in Element
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(blur);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(focus);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(load);
-
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(beforeunload);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(hashchange);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(message);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(offline);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(online);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(popstate);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(resize);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(storage);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(unload);
-
-#if ENABLE(ORIENTATION_EVENTS)
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(orientationchange);
-#endif
-
private:
HTMLBodyElement(const QualifiedName&, Document&);
Modified: trunk/Source/WebCore/html/HTMLFormElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLFormElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -125,9 +125,6 @@
void requestAutocomplete();
void finishRequestAutocomplete(AutocompleteResult);
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(autocomplete);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(autocompleteerror);
#endif
CheckedRadioButtons& checkedRadioButtons() { return m_checkedRadioButtons; }
Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLFrameSetElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -47,25 +47,6 @@
static HTMLFrameSetElement* findContaining(Element* descendant);
- // Declared virtual in Element
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(blur);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(focus);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(load);
-
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(beforeunload);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(hashchange);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(message);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(offline);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(online);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(popstate);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(resize);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(storage);
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(unload);
-#if ENABLE(ORIENTATION_EVENTS)
- DEFINE_WINDOW_ATTRIBUTE_EVENT_LISTENER(orientationchange);
-#endif
-
private:
HTMLFrameSetElement(const QualifiedName&, Document&);
Modified: trunk/Source/WebCore/html/HTMLInputElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLInputElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -66,8 +66,6 @@
static Ref<HTMLInputElement> create(const QualifiedName&, Document&, HTMLFormElement*, bool createdByParser);
virtual ~HTMLInputElement();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitspeechchange);
-
virtual HTMLInputElement* toInputElement() override final { return this; }
WEBCORE_EXPORT virtual bool shouldAutocomplete() const override final;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -232,14 +232,7 @@
void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionCode&);
void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, ExceptionCode&);
void webkitCancelKeyRequest(const String& keySystem, const String& sessionId, ExceptionCode&);
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
#endif
-#if ENABLE(ENCRYPTED_MEDIA) || ENABLE(ENCRYPTED_MEDIA_V2)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey);
-#endif
#if ENABLE(ENCRYPTED_MEDIA_V2)
MediaKeys* keys() const { return m_mediaKeys.get(); }
@@ -268,21 +261,6 @@
double percentLoaded() const;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(emptied);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadedmetadata);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadeddata);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(canplay);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(canplaythrough);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(playing);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(waiting);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(durationchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(timeupdate);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(play);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(ratechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(volumechange);
-
#if ENABLE(VIDEO_TRACK)
PassRefPtr<TextTrack> addTextTrack(const String& kind, const String& label, const String& language, ExceptionCode&);
PassRefPtr<TextTrack> addTextTrack(const String& kind, const String& label, ExceptionCode& ec) { return addTextTrack(kind, label, emptyString(), ec); }
@@ -380,9 +358,6 @@
virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture) override;
virtual bool removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture) override;
virtual void wirelessRoutesAvailableDidChange() override;
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitcurrentplaybacktargetiswirelesschanged);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitplaybacktargetavailabilitychanged);
#endif
// EventTarget function.
Modified: trunk/Source/WebCore/html/HTMLVideoElement.h (181168 => 181169)
--- trunk/Source/WebCore/html/HTMLVideoElement.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/HTMLVideoElement.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -83,8 +83,6 @@
void webkitSetPresentationMode(const String&);
String webkitPresentationMode() const;
virtual void fullscreenModeChanged(VideoFullscreenMode) override;
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitpresentationmodechanged);
#endif
private:
Modified: trunk/Source/WebCore/html/track/TextTrack.h (181168 => 181169)
--- trunk/Source/WebCore/html/track/TextTrack.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/track/TextTrack.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -123,8 +123,6 @@
void cueWillChange(TextTrackCue*);
void cueDidChange(TextTrackCue*);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(cuechange);
-
enum TextTrackType { TrackElement, AddTrack, InBand };
TextTrackType trackType() const { return m_trackType; }
Modified: trunk/Source/WebCore/html/track/TextTrackCue.h (181168 => 181169)
--- trunk/Source/WebCore/html/track/TextTrackCue.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/track/TextTrackCue.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -111,9 +111,6 @@
void willChange();
virtual void didChange();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(enter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(exit);
-
using RefCounted<TextTrackCue>::ref;
using RefCounted<TextTrackCue>::deref;
Modified: trunk/Source/WebCore/html/track/TrackListBase.h (181168 => 181169)
--- trunk/Source/WebCore/html/track/TrackListBase.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/html/track/TrackListBase.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -56,10 +56,6 @@
using RefCounted<TrackListBase>::deref;
virtual ScriptExecutionContext* scriptExecutionContext() const override final { return m_context; }
- DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
-
void clearElement() { m_element = 0; }
Element* element() const;
HTMLMediaElement* mediaElement() const { return m_element; }
Modified: trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h (181168 => 181169)
--- trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/loader/appcache/DOMApplicationCache.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -58,17 +58,6 @@
using RefCounted<DOMApplicationCache>::ref;
using RefCounted<DOMApplicationCache>::deref;
- // Explicitly named attribute event listener helpers
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(checking);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(noupdate);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(downloading);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(updateready);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(cached);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(obsolete);
-
virtual EventTargetInterface eventTargetInterface() const override { return DOMApplicationCacheEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override;
Modified: trunk/Source/WebCore/page/DOMWindow.h (181168 => 181169)
--- trunk/Source/WebCore/page/DOMWindow.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/page/DOMWindow.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -282,90 +282,6 @@
void dispatchLoadEvent();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(beforeunload);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(blur);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(canplay);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(canplaythrough);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(click);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(contextmenu);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dblclick);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drag);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(dragstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(drop);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(durationchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(emptied);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(focus);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(hashchange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(input);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(invalid);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keydown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keypress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(keyup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadeddata);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadedmetadata);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousedown);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseenter);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseleave);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousemove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseout);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseover);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mouseup);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(mousewheel);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(offline);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(online);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pagehide);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pageshow);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(pause);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(play);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(playing);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(popstate);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(ratechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(reset);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(resize);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(scroll);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(search);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(seeked);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(seeking);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(select);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(stalled);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(storage);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(submit);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(suspend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(timeupdate);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(unload);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(volumechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(waiting);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitbeginfullscreen);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitendfullscreen);
-#if ENABLE(WILL_REVEAL_EDGE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealbottom);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealleft);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealright);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitwillrevealtop);
-#endif
- DEFINE_ATTRIBUTE_EVENT_LISTENER(wheel);
-
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationstart, webkitAnimationStart);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationiteration, webkitAnimationIteration);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkitanimationend, webkitAnimationEnd);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(animationstart, animationstart);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(animationiteration, animationiteration);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(animationend, animationend);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd);
- DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(transitionend, transitionend);
-
void captureEvents();
void releaseEvents();
@@ -374,15 +290,6 @@
using RefCounted<DOMWindow>::ref;
using RefCounted<DOMWindow>::deref;
-#if ENABLE(DEVICE_ORIENTATION)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(devicemotion);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(deviceorientation);
-#endif
-
-#if ENABLE(PROXIMITY_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitdeviceproximity);
-#endif
-
// HTML 5 key/value storage
Storage* sessionStorage(ExceptionCode&) const;
Storage* localStorage(ExceptionCode&) const;
@@ -397,23 +304,8 @@
// 0 is straight up; -90 is when the device is rotated 90 clockwise;
// 90 is when rotated counter clockwise.
int orientation() const;
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(orientationchange);
#endif
-#if ENABLE(TOUCH_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel);
-#endif
-
-#if ENABLE(IOS_GESTURE_EVENTS)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturestart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gesturechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(gestureend);
-#endif
-
#if ENABLE(WEB_TIMING)
Performance* performance() const;
#endif
Modified: trunk/Source/WebCore/page/EventSource.h (181168 => 181169)
--- trunk/Source/WebCore/page/EventSource.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/page/EventSource.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -66,10 +66,6 @@
State readyState() const;
- DEFINE_ATTRIBUTE_EVENT_LISTENER(open);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
-
void close();
using RefCounted<EventSource>::ref;
Modified: trunk/Source/WebCore/page/Performance.h (181168 => 181169)
--- trunk/Source/WebCore/page/Performance.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/page/Performance.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -74,8 +74,6 @@
void webkitClearResourceTimings();
void webkitSetResourceTimingBufferSize(unsigned int);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitresourcetimingbufferfull);
-
void addResourceTiming(const String& initiatorName, Document*, const ResourceRequest&, const ResourceResponse&, double initiationTime, double finishTime);
#endif
Modified: trunk/Source/WebCore/workers/AbstractWorker.h (181168 => 181169)
--- trunk/Source/WebCore/workers/AbstractWorker.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/workers/AbstractWorker.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -45,8 +45,6 @@
class AbstractWorker : public RefCounted<AbstractWorker>, public EventTargetWithInlineData {
public:
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
-
using RefCounted<AbstractWorker>::ref;
using RefCounted<AbstractWorker>::deref;
Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h (181168 => 181169)
--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -57,8 +57,6 @@
// Needed for Objective-C bindings (see bug 28774).
void postMessage(PassRefPtr<SerializedScriptValue>, MessagePort*, ExceptionCode&);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
-
DedicatedWorkerThread& thread();
private:
Modified: trunk/Source/WebCore/workers/Worker.h (181168 => 181169)
--- trunk/Source/WebCore/workers/Worker.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/workers/Worker.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -58,8 +58,6 @@
void postMessage(PassRefPtr<SerializedScriptValue> message, MessagePort*, ExceptionCode&);
void terminate();
-
- DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
// EventTarget API.
virtual ScriptExecutionContext* scriptExecutionContext() const override final { return ActiveDOMObject::scriptExecutionContext(); }
Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (181168 => 181169)
--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -82,10 +82,6 @@
WorkerLocation* location() const;
void close();
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(offline);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(online);
-
// WorkerUtils
virtual void importScripts(const Vector<String>& urls, ExceptionCode&);
WorkerNavigator* navigator() const;
Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (181168 => 181169)
--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -144,17 +144,6 @@
const ResourceResponse& resourceResponse() const { return m_response; }
- DEFINE_ATTRIBUTE_EVENT_LISTENER(readystatechange);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
-#if ENABLE(XHR_TIMEOUT)
- DEFINE_ATTRIBUTE_EVENT_LISTENER(timeout);
-#endif
-
using RefCounted<XMLHttpRequest>::ref;
using RefCounted<XMLHttpRequest>::deref;
Modified: trunk/Source/WebCore/xml/XMLHttpRequestUpload.h (181168 => 181169)
--- trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2015-03-06 18:44:33 UTC (rev 181168)
+++ trunk/Source/WebCore/xml/XMLHttpRequestUpload.h 2015-03-06 18:45:48 UTC (rev 181169)
@@ -48,13 +48,6 @@
virtual EventTargetInterface eventTargetInterface() const override { return XMLHttpRequestUploadEventTargetInterfaceType; }
virtual ScriptExecutionContext* scriptExecutionContext() const override { return m_xmlHttpRequest->scriptExecutionContext(); }
- DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(load);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
-
void dispatchThrottledProgressEvent(bool lengthComputable, unsigned long long loaded, unsigned long long total);
void dispatchProgressEvent(const AtomicString &type);
