Diff
Modified: trunk/Source/WebCore/ChangeLog (278456 => 278457)
--- trunk/Source/WebCore/ChangeLog 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/ChangeLog 2021-06-04 14:48:12 UTC (rev 278457)
@@ -1,3 +1,49 @@
+2021-06-04 Chris Dumez <[email protected]>
+
+ Rename MainThreadGenericEventQueue to EventLoopEventQueue
+ https://bugs.webkit.org/show_bug.cgi?id=226618
+
+ Reviewed by Ryosuke Niwa.
+
+ Rename MainThreadGenericEventQueue to EventLoopEventQueue, now that it is based on the HTML
+ event loop (and not a global Timer).
+
+ * Modules/mediasession/MediaSessionCoordinator.cpp:
+ (WebCore::MediaSessionCoordinator::MediaSessionCoordinator):
+ * Modules/mediasession/MediaSessionCoordinator.h:
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::MediaSource):
+ * Modules/mediasource/MediaSource.h:
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::SourceBuffer):
+ * Modules/mediasource/SourceBuffer.h:
+ * Modules/mediasource/SourceBufferList.cpp:
+ (WebCore::SourceBufferList::SourceBufferList):
+ * Modules/mediasource/SourceBufferList.h:
+ * Modules/remoteplayback/RemotePlayback.cpp:
+ (WebCore::RemotePlayback::RemotePlayback):
+ * Modules/remoteplayback/RemotePlayback.h:
+ * Sources.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/EventLoopEventQueue.cpp: Renamed from Source/WebCore/dom/GenericEventQueue.cpp.
+ (WebCore::EventLoopEventQueue::EventLoopEventQueue):
+ (WebCore::EventLoopEventQueue::enqueueEvent):
+ (WebCore::EventLoopEventQueue::dispatchOneEvent):
+ (WebCore::EventLoopEventQueue::close):
+ (WebCore::EventLoopEventQueue::cancelAllEvents):
+ (WebCore::EventLoopEventQueue::hasPendingActivity const):
+ (WebCore::EventLoopEventQueue::hasPendingEventsOfType const):
+ (WebCore::EventLoopEventQueue::stop):
+ (WebCore::EventLoopEventQueue::activeDOMObjectName const):
+ (WebCore::EventLoopEventQueue::create):
+ * dom/EventLoopEventQueue.h: Renamed from Source/WebCore/dom/GenericEventQueue.h.
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ * html/HTMLMediaElement.h:
+ * html/track/TrackListBase.cpp:
+ (WebCore::TrackListBase::TrackListBase):
+ * html/track/TrackListBase.h:
+
2021-06-04 Youenn Fablet <[email protected]>
Reintroduce logging useful for debugging in AudioSampleDataSource
Modified: trunk/Source/WebCore/Headers.cmake (278456 => 278457)
--- trunk/Source/WebCore/Headers.cmake 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Headers.cmake 2021-06-04 14:48:12 UTC (rev 278457)
@@ -462,6 +462,7 @@
dom/EventListenerMap.h
dom/EventListenerOptions.h
dom/EventLoop.h
+ dom/EventLoopEventQueue.h
dom/EventModifierInit.h
dom/EventNames.h
dom/EventQueue.h
@@ -475,7 +476,6 @@
dom/FragmentScriptingPermission.h
dom/FullscreenManager.h
dom/GCReachableRef.h
- dom/GenericEventQueue.h
dom/InlineStyleSheetOwner.h
dom/KeyboardEvent.h
dom/LiveNodeList.h
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.cpp (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -59,7 +59,7 @@
: ActiveDOMObject(context)
, m_logger(makeRef(Document::sharedLogger()))
, m_logIdentifier(nextCoordinatorLogIdentifier())
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
{
ALWAYS_LOG(LOGIDENTIFIER);
}
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionCoordinator.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -28,8 +28,8 @@
#if ENABLE(MEDIA_SESSION_COORDINATOR)
#include "ActiveDOMObject.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
-#include "GenericEventQueue.h"
#include "MediaSession.h"
#include "MediaSessionCoordinatorPrivate.h"
#include "MediaSessionCoordinatorState.h"
@@ -110,7 +110,7 @@
RefPtr<MediaSessionCoordinatorPrivate> m_privateCoordinator;
const Ref<const Logger> m_logger;
const void* m_logIdentifier;
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
MediaSessionCoordinatorState m_state { MediaSessionCoordinatorState::Closed };
bool m_hasCoordinatorsStateChangeEventListener { false };
};
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -104,7 +104,7 @@
: ActiveDOMObject(&context)
, m_duration(MediaTime::invalidTime())
, m_pendingSeekTime(MediaTime::invalidTime())
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
#if !RELEASE_LOG_DISABLED
, m_logger(downcast<Document>(context).logger())
#endif
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.h (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -33,9 +33,9 @@
#if ENABLE(MEDIA_SOURCE)
#include "ActiveDOMObject.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
#include "ExceptionOr.h"
-#include "GenericEventQueue.h"
#include "HTMLMediaElement.h"
#include "MediaSourcePrivateClient.h"
#include "URLRegistry.h"
@@ -174,7 +174,7 @@
MediaTime m_duration;
MediaTime m_pendingSeekTime;
ReadyState m_readyState { ReadyState::Closed };
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
#if !RELEASE_LOG_DISABLED
Ref<const Logger> m_logger;
const void* m_logIdentifier { nullptr };
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -38,7 +38,6 @@
#include "BufferSource.h"
#include "Event.h"
#include "EventNames.h"
-#include "GenericEventQueue.h"
#include "HTMLMediaElement.h"
#include "InbandTextTrack.h"
#include "InbandTextTrackPrivate.h"
@@ -75,7 +74,7 @@
: ActiveDOMObject(source->scriptExecutionContext())
, m_private(WTFMove(sourceBufferPrivate))
, m_source(source)
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
, m_appendBufferTimer(*this, &SourceBuffer::appendBufferTimerFired)
, m_appendWindowStart(MediaTime::zeroTime())
, m_appendWindowEnd(MediaTime::positiveInfiniteTime())
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -35,9 +35,9 @@
#include "ActiveDOMObject.h"
#include "AudioTrack.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
#include "ExceptionOr.h"
-#include "GenericEventQueue.h"
#include "SourceBufferPrivate.h"
#include "SourceBufferPrivateClient.h"
#include "TextTrack.h"
@@ -208,7 +208,7 @@
Ref<SourceBufferPrivate> m_private;
MediaSource* m_source;
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
AppendMode m_mode { AppendMode::Segments };
Vector<unsigned char> m_pendingAppendData;
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -44,7 +44,7 @@
SourceBufferList::SourceBufferList(ScriptExecutionContext* context)
: ActiveDOMObject(context)
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
{
suspendIfNeeded();
}
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h (278456 => 278457)
--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -33,8 +33,8 @@
#if ENABLE(MEDIA_SOURCE)
#include "ActiveDOMObject.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
-#include "GenericEventQueue.h"
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
@@ -80,7 +80,7 @@
const char* activeDOMObjectName() const final;
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
Vector<RefPtr<SourceBuffer>> m_list;
};
Modified: trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.cpp (278456 => 278457)
--- trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -50,7 +50,7 @@
RemotePlayback::RemotePlayback(HTMLMediaElement& element)
: WebCore::ActiveDOMObject(element.scriptExecutionContext())
, m_mediaElement(makeWeakPtr(element))
- , m_eventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_eventQueue(EventLoopEventQueue::create(*this))
, m_taskQueue(element.scriptExecutionContext())
{
suspendIfNeeded();
Modified: trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.h (278456 => 278457)
--- trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Modules/remoteplayback/RemotePlayback.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -28,8 +28,8 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
#include "ActiveDOMObject.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
-#include "GenericEventQueue.h"
#include <wtf/HashMap.h>
#include <wtf/Ref.h>
#include <wtf/RefCounted.h>
@@ -100,7 +100,7 @@
State m_state { State::Disconnected };
bool m_available { false };
- UniqueRef<MainThreadGenericEventQueue> m_eventQueue;
+ UniqueRef<EventLoopEventQueue> m_eventQueue;
EventLoopTaskQueue m_taskQueue;
};
Modified: trunk/Source/WebCore/Sources.txt (278456 => 278457)
--- trunk/Source/WebCore/Sources.txt 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/Sources.txt 2021-06-04 14:48:12 UTC (rev 278457)
@@ -949,6 +949,7 @@
dom/EventDispatcher.cpp
dom/EventListenerMap.cpp
dom/EventLoop.cpp
+dom/EventLoopEventQueue.cpp
dom/EventNames.cpp
dom/EventPath.cpp
dom/EventTarget.cpp
@@ -958,7 +959,6 @@
dom/FocusEvent.cpp
dom/FullscreenManager.cpp
dom/GCReachableRef.cpp
-dom/GenericEventQueue.cpp
dom/HashChangeEvent.cpp
dom/IdTargetObserver.cpp
dom/IdTargetObserverRegistry.cpp
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (278456 => 278457)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2021-06-04 14:48:12 UTC (rev 278457)
@@ -102,7 +102,7 @@
071A9EC3168FBC55002629F9 /* TextTrackCueGeneric.h in Headers */ = {isa = PBXBuildFile; fileRef = 071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */; settings = {ATTRIBUTES = (Private, ); }; };
071E496E1AD5AA0D008A50B4 /* MediaPlaybackTargetCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetCocoa.mm */; };
071E49701AD5AB5E008A50B4 /* MediaPlaybackTargetCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 071E496F1AD5AB5E008A50B4 /* MediaPlaybackTargetCocoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 /* GenericEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0720B0A114D3323500642955 /* EventLoopEventQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 0720B09F14D3323500642955 /* EventLoopEventQueue.h */; settings = {ATTRIBUTES = (Private, ); }; };
0725EFA9239AD79300A538A9 /* MediaPlayerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
07277E4D17D018CC0015534D /* JSMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4117D018CC0015534D /* JSMediaStream.h */; };
07277E4D17D018CC0015534E /* JSCanvasCaptureMediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07277E4117D018CC0015534E /* JSCanvasCaptureMediaStreamTrack.h */; };
@@ -5781,8 +5781,8 @@
071A9EC1168FB56C002629F9 /* TextTrackCueGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextTrackCueGeneric.h; sourceTree = "<group>"; };
071E496D1AD5AA0D008A50B4 /* MediaPlaybackTargetCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaPlaybackTargetCocoa.mm; sourceTree = "<group>"; };
071E496F1AD5AB5E008A50B4 /* MediaPlaybackTargetCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaPlaybackTargetCocoa.h; sourceTree = "<group>"; };
- 0720B09E14D3323500642955 /* GenericEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GenericEventQueue.cpp; sourceTree = "<group>"; };
- 0720B09F14D3323500642955 /* GenericEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GenericEventQueue.h; sourceTree = "<group>"; };
+ 0720B09E14D3323500642955 /* EventLoopEventQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventLoopEventQueue.cpp; sourceTree = "<group>"; };
+ 0720B09F14D3323500642955 /* EventLoopEventQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventLoopEventQueue.h; sourceTree = "<group>"; };
07221B4C17CEC32700848E51 /* MediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStream.cpp; sourceTree = "<group>"; };
07221B4D17CEC32700848E51 /* MediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStream.h; sourceTree = "<group>"; };
07221B4E17CEC32700848E51 /* MediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaStream.idl; sourceTree = "<group>"; };
@@ -30188,8 +30188,6 @@
9307F1D60AF2D59000DBA31A /* HitTestResult.h */,
B51A2F4017D7D5DA0072517A /* ImageQualityController.cpp */,
B51A2F3E17D7D3A40072517A /* ImageQualityController.h */,
- A8CFF5DF0A155A05000A4234 /* LegacyInlineBox.cpp */,
- A8CFF5DE0A155A05000A4234 /* LegacyInlineBox.h */,
B57CB52C182A3EED0079A647 /* InlineElementBox.cpp */,
B57CB52B182A37F60079A647 /* InlineElementBox.h */,
930C90DC19CF965300D6C21A /* InlineIterator.cpp */,
@@ -30205,6 +30203,8 @@
9BD1F6801F0462B8001C9CDD /* LayoutDisallowedScope.h */,
A120ACA113F9984600FE4AC7 /* LayoutRepainter.cpp */,
A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */,
+ A8CFF5DF0A155A05000A4234 /* LegacyInlineBox.cpp */,
+ A8CFF5DE0A155A05000A4234 /* LegacyInlineBox.h */,
A8CFF5DD0A155A05000A4234 /* LegacyInlineFlowBox.cpp */,
A8CFF5DC0A155A05000A4234 /* LegacyInlineFlowBox.h */,
BCEA4813097D93020094C9E4 /* LegacyLineLayout.cpp */,
@@ -30665,6 +30665,8 @@
46BD05C025BB6E4D00225F30 /* EventListenerOptions.idl */,
9B91DCCC2383792D000EEE0F /* EventLoop.cpp */,
9B0ABCA123679AB300B45085 /* EventLoop.h */,
+ 0720B09E14D3323500642955 /* EventLoopEventQueue.cpp */,
+ 0720B09F14D3323500642955 /* EventLoopEventQueue.h */,
83FE7CA31DA9F1650037237C /* EventModifierInit.h */,
83FE7CA61DA9F1660037237C /* EventModifierInit.idl */,
939885C108B7E3D100E707C4 /* EventNames.cpp */,
@@ -30697,8 +30699,6 @@
CD92F5162261038200F87BB3 /* FullscreenManager.h */,
9BAAC4582151E77A003D4A98 /* GCReachableRef.cpp */,
9BAAC4562151E39E003D4A98 /* GCReachableRef.h */,
- 0720B09E14D3323500642955 /* GenericEventQueue.cpp */,
- 0720B09F14D3323500642955 /* GenericEventQueue.h */,
7C2D722E25083A3400539662 /* GlobalEventHandlers+PointerEvents.idl */,
44BD2B36252779780055D95A /* GlobalEventHandlers+Selection.idl */,
7C4189AB1B07C170000FA757 /* GlobalEventHandlers.idl */,
@@ -32041,7 +32041,6 @@
E1FE137518402A6700892F13 /* CommonCryptoUtilities.h in Headers */,
0F60F32B1DFBB10700416D6C /* CommonVM.h in Headers */,
7C93F34A1AA6BA5E00A98BAB /* CompiledContentExtension.h in Headers */,
- E4E94D6122FF158A00DD191F /* LegacyLineLayout.h in Headers */,
C2F4E78C1E45C3EF006D7105 /* ComplexTextController.h in Headers */,
E4BA50901BCFBD9500E34EF7 /* ComposedTreeAncestorIterator.h in Headers */,
E44FA1851BCA6B5A0091B6EF /* ComposedTreeIterator.h in Headers */,
@@ -32201,6 +32200,7 @@
BCF164592662A1E90002F7EF /* CSSCalcNegateNode.h in Headers */,
BCF164612662A28D0002F7EF /* CSSCalcOperationNode.h in Headers */,
BCF164552662A1220002F7EF /* CSSCalcPrimitiveValueNode.h in Headers */,
+ BC709DE0266323CF00B9A21C /* CSSCalcSymbolTable.h in Headers */,
49AE2D8F134EE50C0072920A /* CSSCalcValue.h in Headers */,
BC6049CC0DB560C200204739 /* CSSCanvasValue.h in Headers */,
BCEA4790097CAAC80094C9E4 /* CSSComputedStyleDeclaration.h in Headers */,
@@ -32591,6 +32591,7 @@
AD4495F4141FC08900541EDF /* EventListenerMap.h in Headers */,
46BD05C625BB6E6C00225F30 /* EventListenerOptions.h in Headers */,
46F02A1A23737F8300106A64 /* EventLoop.h in Headers */,
+ 0720B0A114D3323500642955 /* EventLoopEventQueue.h in Headers */,
83FE7CA81DA9F1B60037237C /* EventModifierInit.h in Headers */,
939885C408B7E3D100E707C4 /* EventNames.h in Headers */,
9B714E211C91166900AC0E92 /* EventPath.h in Headers */,
@@ -32789,7 +32790,6 @@
C0C054CC1118C8E400CE2636 /* generate-bindings.pl in Headers */,
BC23F0DB0DAFF4A4009FDC91 /* GeneratedImage.h in Headers */,
830030F61B7D33B500ED3AAC /* GenericCachedHTMLCollection.h in Headers */,
- 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */,
CD62FB961AF018E70012ED7D /* GenericTaskQueue.h in Headers */,
9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */,
9746AF2514F4DDE6003E7A71 /* GeolocationClient.h in Headers */,
@@ -33140,11 +33140,9 @@
51EEAA741BEFFAB100218008 /* IndexValueEntry.h in Headers */,
517138F81BF128BB000D5F01 /* IndexValueStore.h in Headers */,
CD063F831E23FA8900812BE3 /* InitDataRegistry.h in Headers */,
- A8CFF5E50A155A05000A4234 /* LegacyInlineBox.h in Headers */,
E30592641E27A3AD00D57C98 /* InlineClassicScript.h in Headers */,
6FE198172178397C00446F08 /* InlineContentBreaker.h in Headers */,
B57CB52E182A3EFC0079A647 /* InlineElementBox.h in Headers */,
- A8CFF5E30A155A05000A4234 /* LegacyInlineFlowBox.h in Headers */,
6F7CA3CA208C2B2E002F29AB /* InlineFormattingContext.h in Headers */,
47C4D57D26508BCB00C7AB1F /* InlineFormattingGeometry.h in Headers */,
6FE636E82647962900F0951E /* InlineFormattingQuirks.h in Headers */,
@@ -34166,9 +34164,13 @@
CDF4B7121E0087AE00E235A2 /* LegacyCDMSession.h in Headers */,
CDE8B5F11A69778B00B4B66A /* LegacyCDMSessionClearKey.h in Headers */,
2DE70023192FE82A00B0975C /* LegacyDisplayRefreshMonitorMac.h in Headers */,
+ A8CFF5E50A155A05000A4234 /* LegacyInlineBox.h in Headers */,
+ A8CFF5E30A155A05000A4234 /* LegacyInlineFlowBox.h in Headers */,
+ E4E94D6122FF158A00DD191F /* LegacyLineLayout.h in Headers */,
F44A5F591FED38F2007F5944 /* LegacyNSPasteboardTypes.h in Headers */,
A185B42A1E8211A100DC9118 /* LegacyPreviewLoader.h in Headers */,
A10DBF4718F92317000D70C6 /* LegacyPreviewLoaderClient.h in Headers */,
+ A8CFF5E10A155A05000A4234 /* LegacyRootInlineBox.h in Headers */,
5162C7F511F77EFB00612EFE /* LegacySchemeRegistry.h in Headers */,
E4C3B1FA0F0E4161009693F6 /* LegacyTileCache.h in Headers */,
E4B65A58132FA8E70070E7BE /* LegacyTileGrid.h in Headers */,
@@ -34678,7 +34680,6 @@
26601EBF14B3B9AD0012C0FE /* PlatformEventFactoryIOS.h in Headers */,
BCAA487014A052530088FAC4 /* PlatformEventFactoryMac.h in Headers */,
A723F77B1484CA4C008C6DBE /* PlatformExportMacros.h in Headers */,
- BC709DE0266323CF00B9A21C /* CSSCalcSymbolTable.h in Headers */,
515BE1951D54F5FB00DD7C68 /* PlatformGamepad.h in Headers */,
726D56E2253AE28D0002EF90 /* PlatformImage.h in Headers */,
2D7705C7255276CD001D0C94 /* PlatformImageBuffer.h in Headers */,
@@ -35035,7 +35036,6 @@
FD3160A912B026F700C1A359 /* ReverbConvolver.h in Headers */,
FD3160AB12B026F700C1A359 /* ReverbConvolverStage.h in Headers */,
FD3160AD12B026F700C1A359 /* ReverbInputBuffer.h in Headers */,
- A8CFF5E10A155A05000A4234 /* LegacyRootInlineBox.h in Headers */,
49E911C90EF86D47009D0CAF /* RotateTransformOperation.h in Headers */,
A73F95FF12C97BFE0031AAF9 /* RoundedRect.h in Headers */,
57E233631DC7DA2400F28D01 /* RsaOtherPrimesInfo.h in Headers */,
Copied: trunk/Source/WebCore/dom/EventLoopEventQueue.cpp (from rev 278456, trunk/Source/WebCore/dom/GenericEventQueue.cpp) (0 => 278457)
--- trunk/Source/WebCore/dom/EventLoopEventQueue.cpp (rev 0)
+++ trunk/Source/WebCore/dom/EventLoopEventQueue.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2012 Victor Carbune ([email protected])
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "EventLoopEventQueue.h"
+
+#include "Document.h"
+#include "Event.h"
+#include "EventLoop.h"
+#include "EventTarget.h"
+#include "Node.h"
+#include "ScriptExecutionContext.h"
+#include "Timer.h"
+#include <wtf/Algorithms.h>
+#include <wtf/MainThread.h>
+#include <wtf/SetForScope.h>
+
+namespace WebCore {
+
+EventLoopEventQueue::EventLoopEventQueue(EventTarget& owner)
+ : ActiveDOMObject(owner.scriptExecutionContext())
+ , m_owner(owner)
+{
+}
+
+void EventLoopEventQueue::enqueueEvent(RefPtr<Event>&& event)
+{
+ if (m_isClosed || !scriptExecutionContext())
+ return;
+
+ if (event->target() == &m_owner)
+ event->setTarget(nullptr);
+
+ m_pendingEvents.append(WTFMove(event));
+
+ scriptExecutionContext()->eventLoop().queueTask(TaskSource::MediaElement, [weakThis = makeWeakPtr(*this)] {
+ if (weakThis)
+ weakThis->dispatchOneEvent();
+ });
+}
+
+void EventLoopEventQueue::dispatchOneEvent()
+{
+ ASSERT(!m_pendingEvents.isEmpty());
+
+ Ref<EventTarget> protectedOwner(m_owner);
+ SetForScope<bool> eventFiringScope(m_isFiringEvent, true);
+
+ RefPtr<Event> event = m_pendingEvents.takeFirst();
+ Ref<EventTarget> target = event->target() ? *event->target() : m_owner;
+ ASSERT_WITH_MESSAGE(!target->scriptExecutionContext()->activeDOMObjectsAreStopped(),
+ "An attempt to dispatch an event on a stopped target by EventTargetInterface=%d (nodeName=%s target=%p owner=%p)",
+ m_owner.eventTargetInterface(), m_owner.isNode() ? static_cast<Node&>(m_owner).nodeName().ascii().data() : "", target.ptr(), &m_owner);
+ target->dispatchEvent(*event);
+}
+
+void EventLoopEventQueue::close()
+{
+ m_isClosed = true;
+ cancelAllEvents();
+}
+
+void EventLoopEventQueue::cancelAllEvents()
+{
+ weakPtrFactory().revokeAll();
+ m_pendingEvents.clear();
+}
+
+bool EventLoopEventQueue::hasPendingActivity() const
+{
+ return !m_pendingEvents.isEmpty() || m_isFiringEvent;
+}
+
+bool EventLoopEventQueue::hasPendingEventsOfType(const AtomString& type) const
+{
+ return WTF::anyOf(m_pendingEvents, [&](auto& event) { return event->type() == type; });
+}
+
+void EventLoopEventQueue::stop()
+{
+ close();
+}
+
+const char* EventLoopEventQueue::activeDOMObjectName() const
+{
+ return "EventLoopEventQueue";
+}
+
+UniqueRef<EventLoopEventQueue> EventLoopEventQueue::create(EventTarget& eventTarget)
+{
+ auto eventQueue = makeUniqueRef<EventLoopEventQueue>(eventTarget);
+ eventQueue->suspendIfNeeded();
+ return eventQueue;
+}
+
+}
Copied: trunk/Source/WebCore/dom/EventLoopEventQueue.h (from rev 278456, trunk/Source/WebCore/dom/GenericEventQueue.h) (0 => 278457)
--- trunk/Source/WebCore/dom/EventLoopEventQueue.h (rev 0)
+++ trunk/Source/WebCore/dom/EventLoopEventQueue.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2012 Victor Carbune ([email protected])
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "ActiveDOMObject.h"
+#include <wtf/Deque.h>
+#include <wtf/Forward.h>
+#include <wtf/RefPtr.h>
+#include <wtf/UniqueRef.h>
+#include <wtf/WeakPtr.h>
+
+namespace WebCore {
+
+class Event;
+class EventTarget;
+class ScriptExecutionContext;
+
+// FIXME: We should port call sites to the HTML event loop and remove this class.
+class EventLoopEventQueue : public ActiveDOMObject, public CanMakeWeakPtr<EventLoopEventQueue> {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ static UniqueRef<EventLoopEventQueue> create(EventTarget&);
+
+ void enqueueEvent(RefPtr<Event>&&);
+ void close();
+
+ void cancelAllEvents();
+ bool hasPendingEventsOfType(const AtomString&) const;
+
+ bool hasPendingActivity() const;
+
+private:
+ friend UniqueRef<EventLoopEventQueue> WTF::makeUniqueRefWithoutFastMallocCheck<EventLoopEventQueue, WebCore::EventTarget&>(WebCore::EventTarget&);
+ explicit EventLoopEventQueue(EventTarget&);
+
+ void dispatchOneEvent();
+
+ const char* activeDOMObjectName() const final;
+ void stop() final;
+
+ EventTarget& m_owner;
+ Deque<RefPtr<Event>> m_pendingEvents;
+ bool m_isClosed { false };
+ bool m_isFiringEvent { false };
+};
+
+} // namespace WebCore
Deleted: trunk/Source/WebCore/dom/GenericEventQueue.cpp (278456 => 278457)
--- trunk/Source/WebCore/dom/GenericEventQueue.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/dom/GenericEventQueue.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2012 Victor Carbune ([email protected])
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GenericEventQueue.h"
-
-#include "Document.h"
-#include "Event.h"
-#include "EventLoop.h"
-#include "EventTarget.h"
-#include "Node.h"
-#include "ScriptExecutionContext.h"
-#include "Timer.h"
-#include <wtf/Algorithms.h>
-#include <wtf/MainThread.h>
-#include <wtf/SetForScope.h>
-
-namespace WebCore {
-
-MainThreadGenericEventQueue::MainThreadGenericEventQueue(EventTarget& owner)
- : ActiveDOMObject(owner.scriptExecutionContext())
- , m_owner(owner)
-{
-}
-
-void MainThreadGenericEventQueue::enqueueEvent(RefPtr<Event>&& event)
-{
- if (m_isClosed || !scriptExecutionContext())
- return;
-
- if (event->target() == &m_owner)
- event->setTarget(nullptr);
-
- m_pendingEvents.append(WTFMove(event));
-
- scriptExecutionContext()->eventLoop().queueTask(TaskSource::MediaElement, [weakThis = makeWeakPtr(*this)] {
- if (weakThis)
- weakThis->dispatchOneEvent();
- });
-}
-
-void MainThreadGenericEventQueue::dispatchOneEvent()
-{
- ASSERT(!m_pendingEvents.isEmpty());
-
- Ref<EventTarget> protect(m_owner);
- SetForScope<bool> eventFiringScope(m_isFiringEvent, true);
-
- RefPtr<Event> event = m_pendingEvents.takeFirst();
- Ref<EventTarget> target = event->target() ? *event->target() : m_owner;
- ASSERT_WITH_MESSAGE(!target->scriptExecutionContext()->activeDOMObjectsAreStopped(),
- "An attempt to dispatch an event on a stopped target by EventTargetInterface=%d (nodeName=%s target=%p owner=%p)",
- m_owner.eventTargetInterface(), m_owner.isNode() ? static_cast<Node&>(m_owner).nodeName().ascii().data() : "", target.ptr(), &m_owner);
- target->dispatchEvent(*event);
-}
-
-void MainThreadGenericEventQueue::close()
-{
- m_isClosed = true;
- cancelAllEvents();
-}
-
-void MainThreadGenericEventQueue::cancelAllEvents()
-{
- weakPtrFactory().revokeAll();
- m_pendingEvents.clear();
-}
-
-bool MainThreadGenericEventQueue::hasPendingActivity() const
-{
- return !m_pendingEvents.isEmpty() || m_isFiringEvent;
-}
-
-bool MainThreadGenericEventQueue::hasPendingEventsOfType(const AtomString& type) const
-{
- return WTF::anyOf(m_pendingEvents, [&](auto& event) { return event->type() == type; });
-}
-
-void MainThreadGenericEventQueue::stop()
-{
- close();
-}
-
-const char* MainThreadGenericEventQueue::activeDOMObjectName() const
-{
- return "MainThreadGenericEventQueue";
-}
-
-UniqueRef<MainThreadGenericEventQueue> MainThreadGenericEventQueue::create(EventTarget& eventTarget)
-{
- auto eventQueue = makeUniqueRef<MainThreadGenericEventQueue>(eventTarget);
- eventQueue->suspendIfNeeded();
- return eventQueue;
-}
-
-}
Deleted: trunk/Source/WebCore/dom/GenericEventQueue.h (278456 => 278457)
--- trunk/Source/WebCore/dom/GenericEventQueue.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/dom/GenericEventQueue.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 Victor Carbune ([email protected])
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include "ActiveDOMObject.h"
-#include <wtf/Deque.h>
-#include <wtf/Forward.h>
-#include <wtf/RefPtr.h>
-#include <wtf/UniqueRef.h>
-#include <wtf/WeakPtr.h>
-
-namespace WebCore {
-
-class Event;
-class EventTarget;
-class ScriptExecutionContext;
-
-// FIXME: We should port call sites to the HTML event loop and remove this class.
-class MainThreadGenericEventQueue : public ActiveDOMObject, public CanMakeWeakPtr<MainThreadGenericEventQueue> {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- static UniqueRef<MainThreadGenericEventQueue> create(EventTarget&);
-
- void enqueueEvent(RefPtr<Event>&&);
- void close();
-
- void cancelAllEvents();
- bool hasPendingEventsOfType(const AtomString&) const;
-
- bool hasPendingActivity() const;
-
-private:
- friend UniqueRef<MainThreadGenericEventQueue> WTF::makeUniqueRefWithoutFastMallocCheck<MainThreadGenericEventQueue, WebCore::EventTarget&>(WebCore::EventTarget&);
- explicit MainThreadGenericEventQueue(EventTarget&);
-
- void dispatchOneEvent();
-
- const char* activeDOMObjectName() const final;
- void stop() final;
-
- EventTarget& m_owner;
- Deque<RefPtr<Event>> m_pendingEvents;
- bool m_isClosed { false };
- bool m_isFiringEvent { false };
-};
-
-} // namespace WebCore
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (278456 => 278457)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -409,7 +409,7 @@
, m_visibilityChangeTaskQueue(&document)
, m_fullscreenTaskQueue(&document)
, m_playbackTargetIsWirelessQueue(&document)
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
#if PLATFORM(IOS_FAMILY)
, m_volumeRevertTask(&document)
#endif
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (278456 => 278457)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -32,7 +32,7 @@
#include "AutoplayEvent.h"
#include "CaptionUserPreferences.h"
#include "DeferrableTask.h"
-#include "GenericEventQueue.h"
+#include "EventLoopEventQueue.h"
#include "HTMLElement.h"
#include "HTMLMediaElementEnums.h"
#include "MediaCanStartListener.h"
@@ -957,7 +957,7 @@
EventLoopTaskQueue m_fullscreenTaskQueue;
EventLoopTaskQueue m_playbackTargetIsWirelessQueue;
RefPtr<TimeRanges> m_playedTimeRanges;
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
#if PLATFORM(IOS_FAMILY)
EventLoopDeferrableTask m_volumeRevertTask;
#endif
Modified: trunk/Source/WebCore/html/track/TrackListBase.cpp (278456 => 278457)
--- trunk/Source/WebCore/html/track/TrackListBase.cpp 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/html/track/TrackListBase.cpp 2021-06-04 14:48:12 UTC (rev 278457)
@@ -42,7 +42,7 @@
TrackListBase::TrackListBase(WeakPtr<HTMLMediaElement> element, ScriptExecutionContext* context)
: ActiveDOMObject(context)
, m_element(element)
- , m_asyncEventQueue(MainThreadGenericEventQueue::create(*this))
+ , m_asyncEventQueue(EventLoopEventQueue::create(*this))
{
ASSERT(!context || is<Document>(context));
}
Modified: trunk/Source/WebCore/html/track/TrackListBase.h (278456 => 278457)
--- trunk/Source/WebCore/html/track/TrackListBase.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/html/track/TrackListBase.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -28,8 +28,8 @@
#if ENABLE(VIDEO)
#include "ActiveDOMObject.h"
+#include "EventLoopEventQueue.h"
#include "EventTarget.h"
-#include "GenericEventQueue.h"
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
#include <wtf/WeakPtr.h>
@@ -85,7 +85,7 @@
WeakPtr<HTMLMediaElement> m_element;
- UniqueRef<MainThreadGenericEventQueue> m_asyncEventQueue;
+ UniqueRef<EventLoopEventQueue> m_asyncEventQueue;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/MockMediaSessionCoordinator.h (278456 => 278457)
--- trunk/Source/WebCore/testing/MockMediaSessionCoordinator.h 2021-06-04 14:22:43 UTC (rev 278456)
+++ trunk/Source/WebCore/testing/MockMediaSessionCoordinator.h 2021-06-04 14:48:12 UTC (rev 278457)
@@ -27,7 +27,7 @@
#if ENABLE(MEDIA_SESSION_COORDINATOR)
-#include "GenericEventQueue.h"
+#include "EventLoopEventQueue.h"
#include "MediaSessionCoordinatorPrivate.h"
#include <wtf/RefCounted.h>
#include <wtf/WeakPtr.h>
