Make WTF::Identified work with strongly typed identifiers #25523
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash bc32d14) |
cdumez
force-pushed
the
270560_Identified_strong_identifiers
branch
from
bc32d14
to
332c58f
Compare
|
EWS run on previous version of this PR (hash 332c58f) |
webkit-ews-buildbot
added
the
merging-blocked
cdumez
force-pushed
the
270560_Identified_strong_identifiers
branch
from
332c58f
to
297f2d5
Compare
|
EWS run on current version of this PR (hash 297f2d5) |
cdumez
requested review from
magomez,
zdobersek,
b-weinstein,
xeenon and
rniwa
as code owners
darinadler
approved these changes
Mar 6, 2024
| @@ -583,6 +583,8 @@ class HTMLMediaElement | |||
|
|
|||
| bool supportsSeeking() const override; | |||
|
|
|||
| using Identified<HTMLMediaElementIdentifier>::identifier; | |||
There was a problem hiding this comment.
Surprised this is needed. Do you know why?
There was a problem hiding this comment.
Element::identifier() also exists. It is unclear why HTMLMediaElement needs its own identifier. It is likely worth looking into. But for now, my PR maintains pre-existing behavior.
cdumez
added
the
unsafe-merge-queue
https://bugs.webkit.org/show_bug.cgi?id=270560 Reviewed by Darin Adler. Make WTF::Identified work with strongly typed identifiers instead of uint64_t. Keep existing code that was using the legacy WTF::Identified working by having it subclass WTF::LegacyIdentified instead. We should eventually port those to the new WTF::Identified. Also adopt WTF::Identified more broadly to reduce boilerplate code in the code base. * Source/WTF/wtf/Identified.h: (WTF::IdentifiedBase::identifier const): (WTF::Identified::Identified): (WTF::LegacyIdentified::LegacyIdentified): (WTF::LegacyThreadSafeIdentified::LegacyThreadSafeIdentified): (WTF::UUIDIdentified::UUIDIdentified): (WTF::Identified::generateIdentifier): Deleted. (WTF::ThreadSafeIdentified::ThreadSafeIdentified): Deleted. (WTF::ThreadSafeIdentified::generateIdentifier): Deleted. * Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.cpp: (WebCore::MediaKeySystemRequest::MediaKeySystemRequest): * Source/WebCore/Modules/encryptedmedia/MediaKeySystemRequest.h: (WebCore::MediaKeySystemRequest::setAllowCallback): (WebCore::MediaKeySystemRequest::identifier const): Deleted. * Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabaseConnection.h: * Source/WebCore/Modules/mediastream/UserMediaRequest.cpp: (WebCore::UserMediaRequest::UserMediaRequest): * Source/WebCore/Modules/mediastream/UserMediaRequest.h: (WebCore::UserMediaRequest::identifier const): Deleted. * Source/WebCore/Modules/speech/SpeechRecognitionConnectionClient.h: (WebCore::SpeechRecognitionConnectionClient::SpeechRecognitionConnectionClient): Deleted. (WebCore::SpeechRecognitionConnectionClient::identifier const): Deleted. * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp: (WebCore::ThreadableWebSocketChannel::ThreadableWebSocketChannel): Deleted. * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h: (WebCore::ThreadableWebSocketChannel::identifier const): Deleted. * Source/WebCore/dom/BroadcastChannel.cpp: (WebCore::BroadcastChannel::MainThreadBridge::name const): (WebCore::BroadcastChannel::MainThreadBridge::MainThreadBridge): (WebCore::BroadcastChannel::MainThreadBridge::registerChannel): (WebCore::BroadcastChannel::MainThreadBridge::unregisterChannel): (WebCore::BroadcastChannel::MainThreadBridge::postMessage): (WebCore::BroadcastChannel::MainThreadBridge::identifier const): Deleted. * Source/WebCore/html/HTMLMediaElement.h: (WebCore::HTMLMediaElement::identifier const): Deleted. * Source/WebCore/workers/service/background-fetch/BackgroundFetch.cpp: (WebCore::BackgroundFetch::Record::Record): (WebCore::BackgroundFetch::Record::information const): * Source/WebCore/workers/service/background-fetch/BackgroundFetch.h: * Source/WebCore/workers/service/server/SWServerRegistration.cpp: (WebCore::SWServerRegistration::SWServerRegistration): (WebCore::generateServiceWorkerRegistrationIdentifier): Deleted. * Source/WebCore/workers/service/server/SWServerRegistration.h: (WebCore::SWServerRegistration::key const): (WebCore::SWServerRegistration::identifier const): Deleted. * Source/WebCore/workers/service/server/SWServerToContextConnection.cpp: (WebCore::SWServerToContextConnection::SWServerToContextConnection): (WebCore::generateServerToContextConnectionIdentifier): Deleted. * Source/WebCore/workers/service/server/SWServerToContextConnection.h: * Source/WebCore/workers/shared/SharedWorker.cpp: (WebCore::SharedWorker::SharedWorker): (WebCore::SharedWorker::~SharedWorker): (WebCore::SharedWorker::stop): (WebCore::SharedWorker::suspend): (WebCore::SharedWorker::resume): * Source/WebCore/workers/shared/SharedWorker.h: * Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorker.cpp: (WebKit::WebSharedWorker::WebSharedWorker): (WebKit::WebSharedWorker::~WebSharedWorker): * Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorker.h: (WebKit::WebSharedWorker::identifier const): Deleted. * Source/WebKit/NetworkProcess/storage/CacheStorageCache.cpp: (WebKit::CacheStorageCache::CacheStorageCache): (WebKit::CacheStorageCache::open): * Source/WebKit/NetworkProcess/storage/CacheStorageCache.h: (WebKit::CacheStorageCache::identifier const): Deleted. * Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp: (WebKit::FileSystemStorageHandle::FileSystemStorageHandle): (WebKit::FileSystemStorageHandle::createSyncAccessHandle): (WebKit::FileSystemStorageHandle::closeSyncAccessHandle): * Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.h: (WebKit::FileSystemStorageHandle::identifier const): Deleted. * Source/WebKit/NetworkProcess/storage/StorageAreaBase.cpp: (WebKit::StorageAreaBase::StorageAreaBase): * Source/WebKit/NetworkProcess/storage/StorageAreaBase.h: (WebKit::StorageAreaBase::identifier const): Deleted. * Source/WebKit/NetworkProcess/webtransport/NetworkTransportSession.cpp: (WebKit::NetworkTransportSession::NetworkTransportSession): (WebKit::NetworkTransportSession::messageSenderDestinationID const): * Source/WebKit/NetworkProcess/webtransport/NetworkTransportSession.h: (WebKit::NetworkTransportSession::identifier const): Deleted. * Source/WebKit/Shared/mac/MediaFormatReader/MediaSampleCursor.h: * Source/WebKit/UIProcess/API/APIUserScript.h: * Source/WebKit/UIProcess/API/APIUserStyleSheet.h: * Source/WebKit/UIProcess/DrawingAreaProxy.cpp: (WebKit::DrawingAreaProxy::DrawingAreaProxy): (WebKit::DrawingAreaProxy::startReceivingMessages): (WebKit::DrawingAreaProxy::stopReceivingMessages): * Source/WebKit/UIProcess/DrawingAreaProxy.h: (WebKit::DrawingAreaProxy::type const): (WebKit::DrawingAreaProxy::identifier const): Deleted. * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm: (WebKit::WebExtensionController::load): (WebKit::WebExtensionController::unload): (WebKit::WebExtensionController::addProcessPool): (WebKit::WebExtensionController::removeProcessPool): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm: (WebKit::WebExtensionTab::WebExtensionTab): (WebKit::WebExtensionTab::operator== const): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionWindowCocoa.mm: (WebKit::WebExtensionWindow::WebExtensionWindow): (WebKit::WebExtensionWindow::operator== const): * Source/WebKit/UIProcess/Extensions/WebExtensionContext.cpp: (WebKit::WebExtensionContext::WebExtensionContext): * Source/WebKit/UIProcess/Extensions/WebExtensionContext.h: (WebKit::WebExtensionContext::identifier const): Deleted. * Source/WebKit/UIProcess/Extensions/WebExtensionController.cpp: (WebKit::WebExtensionController::WebExtensionController): * Source/WebKit/UIProcess/Extensions/WebExtensionController.h: (WebKit::WebExtensionController::configuration const): (WebKit::WebExtensionController::identifier const): Deleted. * Source/WebKit/UIProcess/Extensions/WebExtensionTab.h: (WebKit::WebExtensionTab::identifier const): Deleted. * Source/WebKit/UIProcess/Extensions/WebExtensionWindow.h: (WebKit::WebExtensionWindow::identifier const): Deleted. * Source/WebKit/UIProcess/Notifications/WebNotification.cpp: (WebKit::WebNotification::WebNotification): * Source/WebKit/UIProcess/Notifications/WebNotification.h: (WebKit::WebNotification::identifier const): Deleted. * Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm: (WebKit::RemoteLayerTreeDrawingAreaProxy::didRefreshDisplay): (WebKit::RemoteLayerTreeDrawingAreaProxy::waitForDidUpdateActivityState): * Source/WebKit/UIProcess/UserContent/WebScriptMessageHandler.h: * Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.cpp: (WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy): (WebKit::WebUserContentControllerProxy::~WebUserContentControllerProxy): * Source/WebKit/UIProcess/UserContent/WebUserContentControllerProxy.h: (WebKit::WebUserContentControllerProxy::identifier const): Deleted. * Source/WebKit/UIProcess/VisitedLinkStore.cpp: (WebKit::VisitedLinkStore::VisitedLinkStore): * Source/WebKit/UIProcess/VisitedLinkStore.h: * Source/WebKit/UIProcess/WebURLSchemeHandler.cpp: (WebKit::WebURLSchemeHandler::WebURLSchemeHandler): Deleted. * Source/WebKit/UIProcess/WebURLSchemeHandler.h: (WebKit::WebURLSchemeHandler::identifier const): Deleted. * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.cpp: (WebKit::RemoteImageBufferSetProxy::send): (WebKit::RemoteImageBufferSetProxy::sendSync): (WebKit::RemoteImageBufferSetProxy::RemoteImageBufferSetProxy): (WebKit::RemoteImageBufferSetProxy::didPrepareForDisplay): (WebKit::RemoteImageBufferSetProxy::close): (WebKit::RemoteImageBufferSetProxy::flushFrontBufferAsync): (WebKit::RemoteImageBufferSetProxy::willPrepareForDisplay): (WebKit::RemoteImageBufferSetProxy::remoteBufferSetWasDestroyed): * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferSetProxy.h: (WebKit::RemoteImageBufferSetProxy::identifier const): Deleted. * Source/WebKit/WebProcess/GPU/media/RemoteAudioHardwareListener.cpp: (WebKit::RemoteAudioHardwareListener::RemoteAudioHardwareListener): (WebKit::RemoteAudioHardwareListener::~RemoteAudioHardwareListener): * Source/WebKit/WebProcess/GPU/media/RemoteAudioHardwareListener.h: * Source/WebKit/WebProcess/GPU/media/RemoteRemoteCommandListener.cpp: (WebKit::RemoteRemoteCommandListener::RemoteRemoteCommandListener): (WebKit::RemoteRemoteCommandListener::~RemoteRemoteCommandListener): (WebKit::RemoteRemoteCommandListener::ensureGPUProcessConnection): (WebKit::RemoteRemoteCommandListener::updateSupportedCommands): * Source/WebKit/WebProcess/GPU/media/RemoteRemoteCommandListener.h: * Source/WebKit/WebProcess/GPU/webrtc/AudioMediaStreamTrackRendererInternalUnitManager.cpp: (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::Proxy): (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::~Proxy): (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::createRemoteUnit): (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::start): (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::stop): (WebKit::AudioMediaStreamTrackRendererInternalUnitManager::Proxy::setAudioOutputDevice): * Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.cpp: (WebKit::MediaRecorderPrivate::MediaRecorderPrivate): (WebKit::MediaRecorderPrivate::startRecording): (WebKit::MediaRecorderPrivate::~MediaRecorderPrivate): (WebKit::MediaRecorderPrivate::videoFrameAvailable): (WebKit::MediaRecorderPrivate::audioSamplesAvailable): (WebKit::MediaRecorderPrivate::fetchData): (WebKit::MediaRecorderPrivate::stopRecording): (WebKit::MediaRecorderPrivate::pauseRecording): (WebKit::MediaRecorderPrivate::resumeRecording): * Source/WebKit/WebProcess/GPU/webrtc/MediaRecorderPrivate.h: * Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayer.cpp: (WebKit::SampleBufferDisplayLayer::SampleBufferDisplayLayer): (WebKit::SampleBufferDisplayLayer::initialize): (WebKit::SampleBufferDisplayLayer::setLogIdentifier): (WebKit::SampleBufferDisplayLayer::~SampleBufferDisplayLayer): (WebKit::SampleBufferDisplayLayer::updateDisplayMode): (WebKit::SampleBufferDisplayLayer::updateBoundsAndPosition): (WebKit::SampleBufferDisplayLayer::flush): (WebKit::SampleBufferDisplayLayer::flushAndRemoveImage): (WebKit::SampleBufferDisplayLayer::play): (WebKit::SampleBufferDisplayLayer::pause): (WebKit::SampleBufferDisplayLayer::enqueueBlackFrameFrom): (WebKit::SampleBufferDisplayLayer::enqueueVideoFrame): (WebKit::SampleBufferDisplayLayer::clearVideoFrames): (WebKit::SampleBufferDisplayLayer::setShouldMaintainAspectRatio): * Source/WebKit/WebProcess/GPU/webrtc/SampleBufferDisplayLayer.h: * Source/WebKit/WebProcess/Network/WebSocketChannel.cpp: (WebKit::WebSocketChannel::messageSenderDestinationID const): (WebKit::WebSocketChannel::connect): * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCResolver.cpp: (WebKit::LibWebRTCResolver::~LibWebRTCResolver): (WebKit::LibWebRTCResolver::start): * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCResolver.h: * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCSocket.cpp: (WebKit::LibWebRTCSocket::LibWebRTCSocket): (WebKit::LibWebRTCSocket::SendTo): (WebKit::LibWebRTCSocket::Close): (WebKit::LibWebRTCSocket::SetOption): (WebKit::LibWebRTCSocket::suspend): * Source/WebKit/WebProcess/Network/webrtc/LibWebRTCSocket.h: * Source/WebKit/WebProcess/Plugins/PDF/PDFIncrementalLoader.mm: * Source/WebKit/WebProcess/Plugins/PDF/PDFPlugin.mm: (WebKit::PDFPlugin::handleContextMenuEvent): * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.h: (WebKit::PDFPluginBase::identifier const): Deleted. * Source/WebKit/WebProcess/Plugins/PDF/PDFPluginBase.mm: (WebKit::PDFPluginBase::PDFPluginBase): * Source/WebKit/WebProcess/Plugins/PDF/UnifiedPDF/UnifiedPDFPlugin.mm: (WebKit::UnifiedPDFPlugin::handleContextMenuEvent): * Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.cpp: (WebKit::StorageAreaImpl::StorageAreaImpl): * Source/WebKit/WebProcess/WebStorage/StorageAreaImpl.h: * Source/WebKit/WebProcess/WebStorage/StorageAreaMap.cpp: (WebKit::StorageAreaMap::StorageAreaMap): (WebKit::StorageAreaMap::sendConnectMessage): * Source/WebKit/WebProcess/WebStorage/StorageAreaMap.h: * Source/WebKit/webpushd/PushClientConnection.h: Canonical link: https://commits.webkit.org/275739@main
webkit-commit-queue
force-pushed
the
270560_Identified_strong_identifiers
branch
from
297f2d5
to
1b1dcd6
Compare
|
Committed 275739@main (1b1dcd6): https://commits.webkit.org/275739@main Reviewed commits have been landed. Closing PR #25523 and removing active labels. |
webkit-commit-queue
removed
the
unsafe-merge-queue
xeenon
approved these changes
Mar 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
1b1dcd6
297f2d5
🧪 ios-wk2🧪 ios-wk2-wpt🧪 api-ios