Skip to content

Migrate EventTarget to use EventTargetInterfaceType enum class instead of EventTargetInterface enum#24989

Merged
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
rniwa:fix269960
Feb 23, 2024
Merged

Migrate EventTarget to use EventTargetInterfaceType enum class instead of EventTargetInterface enum#24989
webkit-commit-queue merged 1 commit intoWebKit:mainfrom
rniwa:fix269960

Conversation

@rniwa
Copy link
Member

@rniwa rniwa commented Feb 23, 2024

ffdb8dd

Migrate EventTarget to use EventTargetInterfaceType enum class instead of EventTargetInterface enum
https://bugs.webkit.org/show_bug.cgi?id=269960

Reviewed by Chris Dumez.

Moved EventTarget::eventTargetInterface from EventTargetInterface enum to EventTargetInterfaceType enum class.
For now, we need to explicitly say "enum EventTargetInterfaceType" because there is an enum value of
EventTargetInterfaceType in EventTargetInterface enum.

* Source/WebCore/Modules/WebGPU/GPUDevice.h:
* Source/WebCore/Modules/applepay/ApplePaySession.h:
* Source/WebCore/Modules/async-clipboard/Clipboard.cpp:
(WebCore::Clipboard::eventTargetInterface const):
* Source/WebCore/Modules/async-clipboard/Clipboard.h:
* Source/WebCore/Modules/audiosession/DOMAudioSession.h:
* Source/WebCore/Modules/cookie-store/CookieStore.cpp:
(WebCore::CookieStore::eventTargetInterface const):
* Source/WebCore/Modules/cookie-store/CookieStore.h:
* Source/WebCore/Modules/encryptedmedia/MediaKeySession.h:
* Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:
* Source/WebCore/Modules/indexeddb/IDBDatabase.h:
* Source/WebCore/Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::eventTargetInterface const):
* Source/WebCore/Modules/indexeddb/IDBRequest.h:
* Source/WebCore/Modules/indexeddb/IDBTransaction.h:
* Source/WebCore/Modules/mediarecorder/MediaRecorder.h:
* Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h:
* Source/WebCore/Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::eventTargetInterface const):
* Source/WebCore/Modules/mediasource/MediaSource.h:
* Source/WebCore/Modules/mediasource/SourceBuffer.h:
* Source/WebCore/Modules/mediasource/SourceBufferList.h:
* Source/WebCore/Modules/mediastream/MediaDevices.h:
* Source/WebCore/Modules/mediastream/MediaStream.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/RTCDTMFSender.h:
* Source/WebCore/Modules/mediastream/RTCDataChannel.h:
* Source/WebCore/Modules/mediastream/RTCDtlsTransport.h:
* Source/WebCore/Modules/mediastream/RTCIceTransport.h:
* Source/WebCore/Modules/mediastream/RTCPeerConnection.h:
* Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h:
* Source/WebCore/Modules/mediastream/RTCSctpTransport.h:
* Source/WebCore/Modules/notifications/Notification.h:
* Source/WebCore/Modules/paymentrequest/PaymentRequest.h:
* Source/WebCore/Modules/paymentrequest/PaymentResponse.h:
* Source/WebCore/Modules/permissions/PermissionStatus.h:
* Source/WebCore/Modules/pictureinpicture/PictureInPictureWindow.h:
* Source/WebCore/Modules/remoteplayback/RemotePlayback.h:
* Source/WebCore/Modules/screen-wake-lock/WakeLockSentinel.h:
* Source/WebCore/Modules/speech/SpeechRecognition.h:
* Source/WebCore/Modules/speech/SpeechSynthesis.h:
* Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h:
* Source/WebCore/Modules/webaudio/AudioNode.cpp:
(WebCore::AudioNode::eventTargetInterface const):
* Source/WebCore/Modules/webaudio/AudioNode.h:
* Source/WebCore/Modules/webaudio/BaseAudioContext.cpp:
(WebCore::BaseAudioContext::eventTargetInterface const):
* Source/WebCore/Modules/webaudio/BaseAudioContext.h:
* Source/WebCore/Modules/webcodecs/WebCodecsAudioDecoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsAudioEncoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsVideoDecoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsVideoEncoder.h:
* Source/WebCore/Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::eventTargetInterface const):
* Source/WebCore/Modules/websockets/WebSocket.h:
* Source/WebCore/Modules/webxr/WebXRLayer.h:
* Source/WebCore/Modules/webxr/WebXRSession.h:
* Source/WebCore/Modules/webxr/WebXRSpace.h:
* Source/WebCore/Modules/webxr/WebXRSystem.h:
* Source/WebCore/animation/WebAnimation.h:
* Source/WebCore/bindings/scripts/InFilesCompiler.pm:
(generateInterfacesHeader):
* Source/WebCore/css/FontFaceSet.h:
* Source/WebCore/css/MediaQueryList.h:
* Source/WebCore/dom/AbortSignal.h:
* Source/WebCore/dom/BroadcastChannel.h:
* Source/WebCore/dom/EventTarget.h:
* Source/WebCore/dom/EventTargetConcrete.h:
* Source/WebCore/dom/EventTargetFactory.in:
* Source/WebCore/dom/MessagePort.h:
* Source/WebCore/dom/MouseRelatedEvent.cpp:
* Source/WebCore/dom/MouseRelatedEvent.h:
* Source/WebCore/dom/Node.cpp:
(WebCore::Node::eventTargetInterface const):
* Source/WebCore/dom/Node.h:
* Source/WebCore/dom/make_event_factory.pl:
(generateImplementation):
* Source/WebCore/fileapi/FileReader.h:
* Source/WebCore/html/MediaController.h:
* Source/WebCore/html/OffscreenCanvas.h:
* Source/WebCore/html/track/AudioTrackList.cpp:
(WebCore::AudioTrackList::eventTargetInterface const):
* Source/WebCore/html/track/AudioTrackList.h:
* Source/WebCore/html/track/TextTrack.h:
* Source/WebCore/html/track/TextTrackCue.h:
* Source/WebCore/html/track/TextTrackList.cpp:
(WebCore::TextTrackList::eventTargetInterface const):
* Source/WebCore/html/track/TextTrackList.h:
* Source/WebCore/html/track/TrackListBase.h:
* Source/WebCore/html/track/VideoTrackList.cpp:
(WebCore::VideoTrackList::eventTargetInterface const):
* Source/WebCore/html/track/VideoTrackList.h:
* Source/WebCore/loader/appcache/DOMApplicationCache.h:
* Source/WebCore/page/DOMWindow.h:
* Source/WebCore/page/EventSource.h:
* Source/WebCore/page/LocalDOMWindow.h:
(isType):
* Source/WebCore/page/Navigation.cpp:
(WebCore::Navigation::eventTargetInterface const):
* Source/WebCore/page/Navigation.h:
* Source/WebCore/page/NavigationHistoryEntry.cpp:
(WebCore::NavigationHistoryEntry::eventTargetInterface const):
* Source/WebCore/page/NavigationHistoryEntry.h:
* Source/WebCore/page/Performance.h:
* Source/WebCore/page/ScreenOrientation.h:
* Source/WebCore/page/VisualViewport.cpp:
(WebCore::VisualViewport::eventTargetInterface const):
* Source/WebCore/page/VisualViewport.h:
* Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp:
(WebCore::DedicatedWorkerGlobalScope::eventTargetInterface const):
* Source/WebCore/workers/DedicatedWorkerGlobalScope.h:
* Source/WebCore/workers/Worker.h:
* Source/WebCore/workers/service/ServiceWorker.cpp:
(WebCore::ServiceWorker::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorker.h:
* Source/WebCore/workers/service/ServiceWorkerContainer.h:
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp:
(WebCore::ServiceWorkerGlobalScope::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.h:
* Source/WebCore/workers/service/ServiceWorkerRegistration.cpp:
(WebCore::ServiceWorkerRegistration::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorkerRegistration.h:
* Source/WebCore/workers/service/background-fetch/BackgroundFetchRegistration.h:
* Source/WebCore/workers/shared/SharedWorker.cpp:
(WebCore::SharedWorker::eventTargetInterface const):
* Source/WebCore/workers/shared/SharedWorker.h:
* Source/WebCore/workers/shared/SharedWorkerGlobalScope.h:
* Source/WebCore/worklets/WorkletGlobalScope.h:
* Source/WebCore/xml/XMLHttpRequest.h:
* Source/WebCore/xml/XMLHttpRequestUpload.h:

Canonical link: https://commits.webkit.org/275233@main

1907ee4

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@rniwa rniwa requested a review from graouts as a code owner February 23, 2024 02:09
@rniwa rniwa self-assigned this Feb 23, 2024
@rniwa rniwa added the DOM For bugs specific to XML/HTML DOM elements (including parsing). label Feb 23, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 23, 2024
@rniwa rniwa removed the merging-blocked Applied to prevent a change from being merged label Feb 23, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 23, 2024
@rniwa rniwa removed the merging-blocked Applied to prevent a change from being merged label Feb 23, 2024
@rniwa rniwa added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 23, 2024
…d of EventTargetInterface enum

https://bugs.webkit.org/show_bug.cgi?id=269960

Reviewed by Chris Dumez.

Moved EventTarget::eventTargetInterface from EventTargetInterface enum to EventTargetInterfaceType enum class.
For now, we need to explicitly say "enum EventTargetInterfaceType" because there is an enum value of
EventTargetInterfaceType in EventTargetInterface enum.

* Source/WebCore/Modules/WebGPU/GPUDevice.h:
* Source/WebCore/Modules/applepay/ApplePaySession.h:
* Source/WebCore/Modules/async-clipboard/Clipboard.cpp:
(WebCore::Clipboard::eventTargetInterface const):
* Source/WebCore/Modules/async-clipboard/Clipboard.h:
* Source/WebCore/Modules/audiosession/DOMAudioSession.h:
* Source/WebCore/Modules/cookie-store/CookieStore.cpp:
(WebCore::CookieStore::eventTargetInterface const):
* Source/WebCore/Modules/cookie-store/CookieStore.h:
* Source/WebCore/Modules/encryptedmedia/MediaKeySession.h:
* Source/WebCore/Modules/encryptedmedia/legacy/WebKitMediaKeySession.h:
* Source/WebCore/Modules/indexeddb/IDBDatabase.h:
* Source/WebCore/Modules/indexeddb/IDBRequest.cpp:
(WebCore::IDBRequest::eventTargetInterface const):
* Source/WebCore/Modules/indexeddb/IDBRequest.h:
* Source/WebCore/Modules/indexeddb/IDBTransaction.h:
* Source/WebCore/Modules/mediarecorder/MediaRecorder.h:
* Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h:
* Source/WebCore/Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::eventTargetInterface const):
* Source/WebCore/Modules/mediasource/MediaSource.h:
* Source/WebCore/Modules/mediasource/SourceBuffer.h:
* Source/WebCore/Modules/mediasource/SourceBufferList.h:
* Source/WebCore/Modules/mediastream/MediaDevices.h:
* Source/WebCore/Modules/mediastream/MediaStream.h:
* Source/WebCore/Modules/mediastream/MediaStreamTrack.h:
* Source/WebCore/Modules/mediastream/RTCDTMFSender.h:
* Source/WebCore/Modules/mediastream/RTCDataChannel.h:
* Source/WebCore/Modules/mediastream/RTCDtlsTransport.h:
* Source/WebCore/Modules/mediastream/RTCIceTransport.h:
* Source/WebCore/Modules/mediastream/RTCPeerConnection.h:
* Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h:
* Source/WebCore/Modules/mediastream/RTCSctpTransport.h:
* Source/WebCore/Modules/notifications/Notification.h:
* Source/WebCore/Modules/paymentrequest/PaymentRequest.h:
* Source/WebCore/Modules/paymentrequest/PaymentResponse.h:
* Source/WebCore/Modules/permissions/PermissionStatus.h:
* Source/WebCore/Modules/pictureinpicture/PictureInPictureWindow.h:
* Source/WebCore/Modules/remoteplayback/RemotePlayback.h:
* Source/WebCore/Modules/screen-wake-lock/WakeLockSentinel.h:
* Source/WebCore/Modules/speech/SpeechRecognition.h:
* Source/WebCore/Modules/speech/SpeechSynthesis.h:
* Source/WebCore/Modules/speech/SpeechSynthesisUtterance.h:
* Source/WebCore/Modules/webaudio/AudioNode.cpp:
(WebCore::AudioNode::eventTargetInterface const):
* Source/WebCore/Modules/webaudio/AudioNode.h:
* Source/WebCore/Modules/webaudio/BaseAudioContext.cpp:
(WebCore::BaseAudioContext::eventTargetInterface const):
* Source/WebCore/Modules/webaudio/BaseAudioContext.h:
* Source/WebCore/Modules/webcodecs/WebCodecsAudioDecoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsAudioEncoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsVideoDecoder.h:
* Source/WebCore/Modules/webcodecs/WebCodecsVideoEncoder.h:
* Source/WebCore/Modules/websockets/WebSocket.cpp:
(WebCore::WebSocket::eventTargetInterface const):
* Source/WebCore/Modules/websockets/WebSocket.h:
* Source/WebCore/Modules/webxr/WebXRLayer.h:
* Source/WebCore/Modules/webxr/WebXRSession.h:
* Source/WebCore/Modules/webxr/WebXRSpace.h:
* Source/WebCore/Modules/webxr/WebXRSystem.h:
* Source/WebCore/animation/WebAnimation.h:
* Source/WebCore/bindings/scripts/InFilesCompiler.pm:
(generateInterfacesHeader):
* Source/WebCore/css/FontFaceSet.h:
* Source/WebCore/css/MediaQueryList.h:
* Source/WebCore/dom/AbortSignal.h:
* Source/WebCore/dom/BroadcastChannel.h:
* Source/WebCore/dom/EventTarget.h:
* Source/WebCore/dom/EventTargetConcrete.h:
* Source/WebCore/dom/EventTargetFactory.in:
* Source/WebCore/dom/MessagePort.h:
* Source/WebCore/dom/MouseRelatedEvent.cpp:
* Source/WebCore/dom/MouseRelatedEvent.h:
* Source/WebCore/dom/Node.cpp:
(WebCore::Node::eventTargetInterface const):
* Source/WebCore/dom/Node.h:
* Source/WebCore/dom/make_event_factory.pl:
(generateImplementation):
* Source/WebCore/fileapi/FileReader.h:
* Source/WebCore/html/MediaController.h:
* Source/WebCore/html/OffscreenCanvas.h:
* Source/WebCore/html/track/AudioTrackList.cpp:
(WebCore::AudioTrackList::eventTargetInterface const):
* Source/WebCore/html/track/AudioTrackList.h:
* Source/WebCore/html/track/TextTrack.h:
* Source/WebCore/html/track/TextTrackCue.h:
* Source/WebCore/html/track/TextTrackList.cpp:
(WebCore::TextTrackList::eventTargetInterface const):
* Source/WebCore/html/track/TextTrackList.h:
* Source/WebCore/html/track/TrackListBase.h:
* Source/WebCore/html/track/VideoTrackList.cpp:
(WebCore::VideoTrackList::eventTargetInterface const):
* Source/WebCore/html/track/VideoTrackList.h:
* Source/WebCore/loader/appcache/DOMApplicationCache.h:
* Source/WebCore/page/DOMWindow.h:
* Source/WebCore/page/EventSource.h:
* Source/WebCore/page/LocalDOMWindow.h:
(isType):
* Source/WebCore/page/Navigation.cpp:
(WebCore::Navigation::eventTargetInterface const):
* Source/WebCore/page/Navigation.h:
* Source/WebCore/page/NavigationHistoryEntry.cpp:
(WebCore::NavigationHistoryEntry::eventTargetInterface const):
* Source/WebCore/page/NavigationHistoryEntry.h:
* Source/WebCore/page/Performance.h:
* Source/WebCore/page/ScreenOrientation.h:
* Source/WebCore/page/VisualViewport.cpp:
(WebCore::VisualViewport::eventTargetInterface const):
* Source/WebCore/page/VisualViewport.h:
* Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp:
(WebCore::DedicatedWorkerGlobalScope::eventTargetInterface const):
* Source/WebCore/workers/DedicatedWorkerGlobalScope.h:
* Source/WebCore/workers/Worker.h:
* Source/WebCore/workers/service/ServiceWorker.cpp:
(WebCore::ServiceWorker::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorker.h:
* Source/WebCore/workers/service/ServiceWorkerContainer.h:
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp:
(WebCore::ServiceWorkerGlobalScope::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.h:
* Source/WebCore/workers/service/ServiceWorkerRegistration.cpp:
(WebCore::ServiceWorkerRegistration::eventTargetInterface const):
* Source/WebCore/workers/service/ServiceWorkerRegistration.h:
* Source/WebCore/workers/service/background-fetch/BackgroundFetchRegistration.h:
* Source/WebCore/workers/shared/SharedWorker.cpp:
(WebCore::SharedWorker::eventTargetInterface const):
* Source/WebCore/workers/shared/SharedWorker.h:
* Source/WebCore/workers/shared/SharedWorkerGlobalScope.h:
* Source/WebCore/worklets/WorkletGlobalScope.h:
* Source/WebCore/xml/XMLHttpRequest.h:
* Source/WebCore/xml/XMLHttpRequestUpload.h:

Canonical link: https://commits.webkit.org/275233@main
@webkit-commit-queue
Copy link
Collaborator

Committed 275233@main (ffdb8dd): https://commits.webkit.org/275233@main

Reviewed commits have been landed. Closing PR #24989 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit ffdb8dd into WebKit:main Feb 23, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Feb 23, 2024
@rniwa rniwa deleted the fix269960 branch February 23, 2024 11:36
@rniwa rniwa restored the fix269960 branch February 23, 2024 11:36
@rniwa rniwa deleted the fix269960 branch February 23, 2024 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

DOM For bugs specific to XML/HTML DOM elements (including parsing).

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants