Diff
Modified: trunk/Source/WebCore/ChangeLog (287176 => 287177)
--- trunk/Source/WebCore/ChangeLog 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/ChangeLog 2021-12-17 11:58:26 UTC (rev 287177)
@@ -1,3 +1,86 @@
+2021-12-17 Antoine Quint <[email protected]>
+
+ ActiveDOMObject::suspendIfNeeded() should not be called within constructors
+ https://bugs.webkit.org/show_bug.cgi?id=233945
+
+ Reviewed by Darin Adler.
+
+ Step 3 where we convert almost all remaining calls to suspendIfNeeded() in constructors to be in create() methods.
+ This required adding such a method to ServiceWorkerContainer. The final call left is in the AudioScheduledSourceNode
+ constructor, but an earlier version of this patch failed a lot of webaudio tests on EWS so I suspect my attempted fix
+ was wrong.
+
+ * Modules/entriesapi/FileSystemDirectoryEntry.cpp:
+ (WebCore::FileSystemDirectoryEntry::create):
+ * Modules/entriesapi/FileSystemDirectoryEntry.h:
+ * Modules/entriesapi/FileSystemEntry.cpp:
+ (WebCore::FileSystemEntry::FileSystemEntry):
+ * Modules/entriesapi/FileSystemEntry.h:
+ * Modules/entriesapi/FileSystemFileEntry.cpp:
+ (WebCore::FileSystemFileEntry::create):
+ * Modules/entriesapi/FileSystemFileEntry.h:
+ * Modules/fetch/FetchBodyOwner.cpp:
+ (WebCore::FetchBodyOwner::FetchBodyOwner):
+ * Modules/fetch/FetchBodyOwner.h:
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::FetchRequest::create):
+ (WebCore::FetchRequest::clone):
+ * Modules/fetch/FetchRequest.h:
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::create):
+ (WebCore::FetchResponse::error):
+ (WebCore::FetchResponse::redirect):
+ (WebCore::FetchResponse::fetch):
+ * Modules/filesystemaccess/FileSystemDirectoryHandle.cpp:
+ (WebCore::FileSystemDirectoryHandle::create):
+ * Modules/filesystemaccess/FileSystemFileHandle.cpp:
+ (WebCore::FileSystemFileHandle::create):
+ * Modules/filesystemaccess/FileSystemHandle.cpp:
+ (WebCore::FileSystemHandle::FileSystemHandle):
+ * Modules/filesystemaccess/FileSystemHandle.h:
+ * Modules/mediasource/SourceBufferList.cpp:
+ (WebCore::SourceBufferList::create):
+ (WebCore::SourceBufferList::SourceBufferList):
+ * Modules/mediasource/SourceBufferList.h:
+ * Modules/mediastream/MediaDevices.cpp:
+ (WebCore::MediaDevices::MediaDevices):
+ (WebCore::MediaDevices::create):
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ (WebCore::RTCDTMFSender::create):
+ (WebCore::RTCDTMFSender::RTCDTMFSender):
+ * Modules/mediastream/RTCDTMFSender.h:
+ * Modules/mediastream/RTCDtlsTransport.cpp:
+ (WebCore::RTCDtlsTransport::create):
+ (WebCore::RTCDtlsTransport::RTCDtlsTransport):
+ * Modules/mediastream/RTCDtlsTransport.h:
+ * Modules/mediastream/RTCIceTransport.cpp:
+ (WebCore::RTCIceTransport::create):
+ (WebCore::RTCIceTransport::RTCIceTransport):
+ * Modules/mediastream/RTCIceTransport.h:
+ (WebCore::RTCIceTransport::create): Deleted.
+ * Modules/mediastream/RTCRtpSFrameTransform.cpp:
+ (WebCore::RTCRtpSFrameTransform::create):
+ (WebCore::RTCRtpSFrameTransform::RTCRtpSFrameTransform):
+ * Modules/mediastream/RTCRtpSFrameTransform.h:
+ (WebCore::RTCRtpSFrameTransform::create): Deleted.
+ * Modules/mediastream/RTCSctpTransport.cpp:
+ (WebCore::RTCSctpTransport::create):
+ (WebCore::RTCSctpTransport::RTCSctpTransport):
+ * Modules/mediastream/RTCSctpTransport.h:
+ * Modules/paymentrequest/PaymentResponse.cpp:
+ (WebCore::PaymentResponse::finishConstruction):
+ * Modules/webdatabase/DatabaseContext.cpp:
+ (WebCore::DatabaseContext::DatabaseContext):
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::databaseContext):
+ * html/ImageBitmap.cpp:
+ * page/NavigatorBase.cpp:
+ (WebCore::NavigatorBase::serviceWorker):
+ * workers/service/ServiceWorkerContainer.cpp:
+ (WebCore::ServiceWorkerContainer::create):
+ (WebCore::ServiceWorkerContainer::ServiceWorkerContainer):
+ * workers/service/ServiceWorkerContainer.h:
+
2021-12-16 Carlos Alberto Lopez Perez <[email protected]>
REGRESSION(r287138) [GLIB] Build failure with GCC 8 and 9 in std::array to Span conversion
Modified: trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -38,6 +38,13 @@
namespace WebCore {
+Ref<FileSystemDirectoryEntry> FileSystemDirectoryEntry::create(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
+{
+ auto result = adoptRef(*new FileSystemDirectoryEntry(context, filesystem, virtualPath));
+ result->suspendIfNeeded();
+ return result;
+}
+
FileSystemDirectoryEntry::FileSystemDirectoryEntry(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
: FileSystemEntry(context, filesystem, virtualPath)
{
Modified: trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/entriesapi/FileSystemDirectoryEntry.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -36,10 +36,7 @@
class FileSystemDirectoryEntry final : public FileSystemEntry {
public:
- static Ref<FileSystemDirectoryEntry> create(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
- {
- return adoptRef(*new FileSystemDirectoryEntry(context, filesystem, virtualPath));
- }
+ static Ref<FileSystemDirectoryEntry> create(ScriptExecutionContext&, DOMFileSystem&, const String&);
Ref<FileSystemDirectoryReader> createReader(ScriptExecutionContext&);
Modified: trunk/Source/WebCore/Modules/entriesapi/FileSystemEntry.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/entriesapi/FileSystemEntry.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/entriesapi/FileSystemEntry.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -47,7 +47,6 @@
, m_name(FileSystem::pathFileName(virtualPath))
, m_virtualPath(virtualPath)
{
- suspendIfNeeded();
}
FileSystemEntry::~FileSystemEntry() = default;
Modified: trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -36,6 +36,13 @@
namespace WebCore {
+Ref<FileSystemFileEntry> FileSystemFileEntry::create(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
+{
+ auto result = adoptRef(*new FileSystemFileEntry(context, filesystem, virtualPath));
+ result->suspendIfNeeded();
+ return result;
+}
+
FileSystemFileEntry::FileSystemFileEntry(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
: FileSystemEntry(context, filesystem, virtualPath)
{
Modified: trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/entriesapi/FileSystemFileEntry.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -35,10 +35,7 @@
class FileSystemFileEntry final : public FileSystemEntry {
public:
- static Ref<FileSystemFileEntry> create(ScriptExecutionContext& context, DOMFileSystem& filesystem, const String& virtualPath)
- {
- return adoptRef(*new FileSystemFileEntry(context, filesystem, virtualPath));
- }
+ static Ref<FileSystemFileEntry> create(ScriptExecutionContext&, DOMFileSystem&, const String&);
void file(ScriptExecutionContext&, Ref<FileCallback>&&, RefPtr<ErrorCallback>&& = nullptr);
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -46,7 +46,6 @@
, m_body(WTFMove(body))
, m_headers(WTFMove(headers))
{
- suspendIfNeeded();
}
FetchBodyOwner::~FetchBodyOwner()
Modified: trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/fetch/FetchBodyOwner.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,7 +42,6 @@
class FetchBodyOwner : public RefCounted<FetchBodyOwner>, public ActiveDOMObject, public CanMakeWeakPtr<FetchBodyOwner> {
public:
- FetchBodyOwner(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&);
~FetchBodyOwner();
bool bodyUsed() const { return isDisturbed(); }
@@ -73,6 +72,8 @@
const String& contentType() const { return m_contentType; }
protected:
+ FetchBodyOwner(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&);
+
const FetchBody& body() const { return *m_body; }
FetchBody& body() { return *m_body; }
bool isBodyNull() const { return !m_body; }
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -275,6 +275,7 @@
ExceptionOr<Ref<FetchRequest>> FetchRequest::create(ScriptExecutionContext& context, Info&& input, Init&& init)
{
auto request = adoptRef(*new FetchRequest(context, std::nullopt, FetchHeaders::create(FetchHeaders::Guard::Request), { }, { }, { }));
+ request->suspendIfNeeded();
if (std::holds_alternative<String>(input)) {
auto result = request->initializeWith(std::get<String>(input), WTFMove(init));
@@ -289,6 +290,13 @@
return request;
}
+Ref<FetchRequest> FetchRequest::create(ScriptExecutionContext& context, std::optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, ResourceRequest&& request, FetchOptions&& options, String&& referrer)
+{
+ auto result = adoptRef(*new FetchRequest(context, WTFMove(body), WTFMove(headers), WTFMove(request), WTFMove(options), WTFMove(referrer)));
+ result->suspendIfNeeded();
+ return result;
+}
+
String FetchRequest::referrer() const
{
if (m_referrer == "no-referrer")
@@ -324,6 +332,7 @@
return Exception { TypeError, "Body is disturbed or locked"_s };
auto clone = adoptRef(*new FetchRequest(context, std::nullopt, FetchHeaders::create(m_headers.get()), ResourceRequest { m_request }, FetchOptions { m_options }, String { m_referrer }));
+ clone->suspendIfNeeded();
clone->cloneBody(*this);
clone->setNavigationPreloadIdentifier(m_navigationPreloadIdentifier);
clone->m_signal->signalFollow(m_signal);
Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -54,7 +54,7 @@
using Redirect = FetchOptions::Redirect;
static ExceptionOr<Ref<FetchRequest>> create(ScriptExecutionContext&, Info&&, Init&&);
- static Ref<FetchRequest> create(ScriptExecutionContext& context, std::optional<FetchBody>&& body, Ref<FetchHeaders>&& headers, ResourceRequest&& request, FetchOptions&& options, String&& referrer) { return adoptRef(*new FetchRequest(context, WTFMove(body), WTFMove(headers), WTFMove(request), WTFMove(options), WTFMove(referrer))); }
+ static Ref<FetchRequest> create(ScriptExecutionContext&, std::optional<FetchBody>&&, Ref<FetchHeaders>&&, ResourceRequest&&, FetchOptions&&, String&& referrer);
const String& method() const { return m_request.httpMethod(); }
const String& urlString() const;
Modified: trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/fetch/FetchResponse.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -55,6 +55,7 @@
auto headers = isOpaque ? FetchHeaders::create(guard) : FetchHeaders::create(guard, HTTPHeaderMap { response.httpHeaderFields() });
auto fetchResponse = adoptRef(*new FetchResponse(context, WTFMove(body), WTFMove(headers), WTFMove(response)));
+ fetchResponse->suspendIfNeeded();
fetchResponse->updateContentType();
if (!isSynthetic)
fetchResponse->m_filteredResponse = ResourceResponseBase::filter(fetchResponse->m_internalResponse, ResourceResponse::PerformExposeAllHeadersCheck::Yes);
@@ -127,6 +128,7 @@
// 12. Return r.
auto r = adoptRef(*new FetchResponse(context, WTFMove(extractedBody), WTFMove(headers), { }));
+ r->suspendIfNeeded();
r->m_contentType = contentType;
auto mimeType = extractMIMETypeFromMediaType(contentType);
@@ -142,6 +144,7 @@
Ref<FetchResponse> FetchResponse::error(ScriptExecutionContext& context)
{
auto response = adoptRef(*new FetchResponse(context, { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
+ response->suspendIfNeeded();
response->m_internalResponse.setType(Type::Error);
return response;
}
@@ -157,6 +160,7 @@
if (!ResourceResponse::isRedirectionStatusCode(status))
return Exception { RangeError, makeString("Status code ", status, "is not a redirection status code") };
auto redirectResponse = adoptRef(*new FetchResponse(context, { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
+ redirectResponse->suspendIfNeeded();
redirectResponse->m_internalResponse.setHTTPStatusCode(status);
redirectResponse->m_internalResponse.setHTTPHeaderField(HTTPHeaderName::Location, requestURL.string());
redirectResponse->m_headers->fastSet(HTTPHeaderName::Location, requestURL.string());
@@ -251,6 +255,7 @@
InspectorInstrumentation::willFetch(context, request.url().string());
auto response = adoptRef(*new FetchResponse(context, FetchBody { }, FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
+ response->suspendIfNeeded();
response->body().consumer().setAsLoading();
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemDirectoryHandle.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemDirectoryHandle.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemDirectoryHandle.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -39,7 +39,9 @@
Ref<FileSystemDirectoryHandle> FileSystemDirectoryHandle::create(ScriptExecutionContext& context, String&& name, FileSystemHandleIdentifier identifier, Ref<FileSystemStorageConnection>&& connection)
{
- return adoptRef(*new FileSystemDirectoryHandle(context, WTFMove(name), identifier, WTFMove(connection)));
+ auto result = adoptRef(*new FileSystemDirectoryHandle(context, WTFMove(name), identifier, WTFMove(connection)));
+ result->suspendIfNeeded();
+ return result;
}
FileSystemDirectoryHandle::FileSystemDirectoryHandle(ScriptExecutionContext& context, String&& name, FileSystemHandleIdentifier identifier, Ref<FileSystemStorageConnection>&& connection)
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,7 +42,9 @@
Ref<FileSystemFileHandle> FileSystemFileHandle::create(ScriptExecutionContext& context, String&& name, FileSystemHandleIdentifier identifier, Ref<FileSystemStorageConnection>&& connection)
{
- return adoptRef(*new FileSystemFileHandle(context, WTFMove(name), identifier, WTFMove(connection)));
+ auto result = adoptRef(*new FileSystemFileHandle(context, WTFMove(name), identifier, WTFMove(connection)));
+ result->suspendIfNeeded();
+ return result;
}
FileSystemFileHandle::FileSystemFileHandle(ScriptExecutionContext& context, String&& name, FileSystemHandleIdentifier identifier, Ref<FileSystemStorageConnection>&& connection)
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemHandle.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemHandle.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemHandle.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -41,7 +41,6 @@
, m_identifier(identifier)
, m_connection(WTFMove(connection))
{
- suspendIfNeeded();
}
FileSystemHandle::~FileSystemHandle()
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,10 +42,16 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(SourceBufferList);
+Ref<SourceBufferList> SourceBufferList::create(ScriptExecutionContext* context)
+{
+ auto result = adoptRef(*new SourceBufferList(context));
+ result->suspendIfNeeded();
+ return result;
+}
+
SourceBufferList::SourceBufferList(ScriptExecutionContext* context)
: ActiveDOMObject(context)
{
- suspendIfNeeded();
}
SourceBufferList::~SourceBufferList()
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBufferList.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -44,10 +44,7 @@
class SourceBufferList final : public RefCounted<SourceBufferList>, public EventTargetWithInlineData, public ActiveDOMObject {
WTF_MAKE_ISO_ALLOCATED(SourceBufferList);
public:
- static Ref<SourceBufferList> create(ScriptExecutionContext* context)
- {
- return adoptRef(*new SourceBufferList(context));
- }
+ static Ref<SourceBufferList> create(ScriptExecutionContext*);
virtual ~SourceBufferList();
unsigned long length() const { return m_list.size(); }
Modified: trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDevices.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -59,8 +59,6 @@
, m_eventNames(eventNames())
, m_groupIdHashSalt(createCanonicalUUIDString())
{
- suspendIfNeeded();
-
static_assert(static_cast<size_t>(MediaDevices::DisplayCaptureSurfaceType::Monitor) == static_cast<size_t>(RealtimeMediaSourceSettings::DisplaySurfaceType::Monitor), "MediaDevices::DisplayCaptureSurfaceType::Monitor is not equal to RealtimeMediaSourceSettings::DisplaySurfaceType::Monitor as expected");
static_assert(static_cast<size_t>(MediaDevices::DisplayCaptureSurfaceType::Window) == static_cast<size_t>(RealtimeMediaSourceSettings::DisplaySurfaceType::Window), "MediaDevices::DisplayCaptureSurfaceType::Window is not RealtimeMediaSourceSettings::DisplaySurfaceType::Window as expected");
static_assert(static_cast<size_t>(MediaDevices::DisplayCaptureSurfaceType::Application) == static_cast<size_t>(RealtimeMediaSourceSettings::DisplaySurfaceType::Application), "MediaDevices::DisplayCaptureSurfaceType::Application is not RealtimeMediaSourceSettings::DisplaySurfaceType::Application as expected");
@@ -81,7 +79,9 @@
Ref<MediaDevices> MediaDevices::create(Document& document)
{
- return adoptRef(*new MediaDevices(document));
+ auto result = adoptRef(*new MediaDevices(document));
+ result->suspendIfNeeded();
+ return result;
}
Document* MediaDevices::document() const
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,6 +42,13 @@
static const size_t maxToneDurationMs = 6000;
static const size_t minInterToneGapMs = 30;
+Ref<RTCDTMFSender> RTCDTMFSender::create(ScriptExecutionContext& context, RTCRtpSender& sender, std::unique_ptr<RTCDTMFSenderBackend>&& backend)
+{
+ auto result = adoptRef(*new RTCDTMFSender(context, sender, WTFMove(backend)));
+ result->suspendIfNeeded();
+ return result;
+}
+
RTCDTMFSender::RTCDTMFSender(ScriptExecutionContext& context, RTCRtpSender& sender, std::unique_ptr<RTCDTMFSenderBackend>&& backend)
: ActiveDOMObject(&context)
, m_toneTimer(*this, &RTCDTMFSender::toneTimerFired)
@@ -51,8 +58,6 @@
m_backend->onTonePlayed([this](const String&) {
onTonePlayed();
});
-
- suspendIfNeeded();
}
RTCDTMFSender::~RTCDTMFSender() = default;
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDTMFSender.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,7 +42,7 @@
class RTCDTMFSender final : public RefCounted<RTCDTMFSender>, public EventTargetWithInlineData, public ActiveDOMObject {
WTF_MAKE_ISO_ALLOCATED(RTCDTMFSender);
public:
- static Ref<RTCDTMFSender> create(ScriptExecutionContext& context, RTCRtpSender& sender, std::unique_ptr<RTCDTMFSenderBackend>&& backend) { return adoptRef(* new RTCDTMFSender(context, sender, WTFMove(backend))); }
+ static Ref<RTCDTMFSender> create(ScriptExecutionContext&, RTCRtpSender&, std::unique_ptr<RTCDTMFSenderBackend>&&);
virtual ~RTCDTMFSender();
bool canInsertDTMF() const;
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,12 +42,18 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(RTCDtlsTransport);
+Ref<RTCDtlsTransport> RTCDtlsTransport::create(ScriptExecutionContext& context, UniqueRef<RTCDtlsTransportBackend>&& backend, Ref<RTCIceTransport>&& iceTransport)
+{
+ auto result = adoptRef(*new RTCDtlsTransport(context, WTFMove(backend), WTFMove(iceTransport)));
+ result->suspendIfNeeded();
+ return result;
+}
+
RTCDtlsTransport::RTCDtlsTransport(ScriptExecutionContext& context, UniqueRef<RTCDtlsTransportBackend>&& backend, Ref<RTCIceTransport>&& iceTransport)
: ActiveDOMObject(&context)
, m_backend(WTFMove(backend))
, m_iceTransport(WTFMove(iceTransport))
{
- suspendIfNeeded();
m_backend->registerClient(*this);
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDtlsTransport.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,7 +42,7 @@
class RTCDtlsTransport final : public RefCounted<RTCDtlsTransport>, public ActiveDOMObject, public EventTargetWithInlineData, public RTCDtlsTransportBackend::Client {
WTF_MAKE_ISO_ALLOCATED(RTCDtlsTransport);
public:
- static Ref<RTCDtlsTransport> create(ScriptExecutionContext& context, UniqueRef<RTCDtlsTransportBackend>&& backend, Ref<RTCIceTransport>&& iceTransport) { return adoptRef(*new RTCDtlsTransport(context, WTFMove(backend), WTFMove(iceTransport))); }
+ static Ref<RTCDtlsTransport> create(ScriptExecutionContext&, UniqueRef<RTCDtlsTransportBackend>&&, Ref<RTCIceTransport>&&);
~RTCDtlsTransport();
using RefCounted<RTCDtlsTransport>::ref;
Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -37,12 +37,18 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(RTCIceTransport);
+Ref<RTCIceTransport> RTCIceTransport::create(ScriptExecutionContext& context, UniqueRef<RTCIceTransportBackend>&& backend, RTCPeerConnection& connection)
+{
+ auto result = adoptRef(*new RTCIceTransport(context, WTFMove(backend), connection));
+ result->suspendIfNeeded();
+ return result;
+}
+
RTCIceTransport::RTCIceTransport(ScriptExecutionContext& context, UniqueRef<RTCIceTransportBackend>&& backend, RTCPeerConnection& connection)
: ActiveDOMObject(&context)
, m_backend(WTFMove(backend))
, m_connection(connection)
{
- suspendIfNeeded();
m_backend->registerClient(*this);
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCIceTransport.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -49,10 +49,7 @@
class RTCIceTransport : public RefCounted<RTCIceTransport>, public ActiveDOMObject, public EventTargetWithInlineData, public RTCIceTransportBackend::Client {
WTF_MAKE_ISO_ALLOCATED(RTCIceTransport);
public:
- static Ref<RTCIceTransport> create(ScriptExecutionContext& context, UniqueRef<RTCIceTransportBackend>&& backend, RTCPeerConnection& connection)
- {
- return adoptRef(*new RTCIceTransport(context, WTFMove(backend), connection));
- }
+ static Ref<RTCIceTransport> create(ScriptExecutionContext&, UniqueRef<RTCIceTransportBackend>&&, RTCPeerConnection&);
~RTCIceTransport();
RTCIceTransportState state() const { return m_transportState; }
Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -50,12 +50,17 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(RTCRtpSFrameTransform);
+Ref<RTCRtpSFrameTransform> RTCRtpSFrameTransform::create(ScriptExecutionContext& context, Options options)
+{
+ auto result = adoptRef(*new RTCRtpSFrameTransform(context, options));
+ result->suspendIfNeeded();
+ return result;
+}
+
RTCRtpSFrameTransform::RTCRtpSFrameTransform(ScriptExecutionContext& context, Options options)
: ActiveDOMObject(&context)
, m_transformer(RTCRtpSFrameTransformer::create(options.compatibilityMode))
{
- suspendIfNeeded();
-
m_transformer->setIsEncrypting(options.role == Role::Encrypt);
m_transformer->setAuthenticationSize(options.authenticationSize);
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCRtpSFrameTransform.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -56,7 +56,7 @@
CompatibilityMode compatibilityMode { CompatibilityMode::None };
};
- static Ref<RTCRtpSFrameTransform> create(ScriptExecutionContext& context, Options options) { return adoptRef(*new RTCRtpSFrameTransform(context, options)); }
+ static Ref<RTCRtpSFrameTransform> create(ScriptExecutionContext&, Options);
~RTCRtpSFrameTransform();
void setEncryptionKey(CryptoKey&, std::optional<uint64_t>, DOMPromiseDeferred<void>&&);
Modified: trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -38,12 +38,18 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(RTCSctpTransport);
+Ref<RTCSctpTransport> RTCSctpTransport::create(ScriptExecutionContext& context, UniqueRef<RTCSctpTransportBackend>&& backend, Ref<RTCDtlsTransport>&& transport)
+{
+ auto result = adoptRef(*new RTCSctpTransport(context, WTFMove(backend), WTFMove(transport)));
+ result->suspendIfNeeded();
+ return result;
+}
+
RTCSctpTransport::RTCSctpTransport(ScriptExecutionContext& context, UniqueRef<RTCSctpTransportBackend>&& backend, Ref<RTCDtlsTransport >&& transport)
: ActiveDOMObject(&context)
, m_backend(WTFMove(backend))
, m_transport(WTFMove(transport))
{
- suspendIfNeeded();
m_backend->registerClient(*this);
}
Modified: trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.h (287176 => 287177)
--- trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/mediastream/RTCSctpTransport.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -38,7 +38,7 @@
class RTCSctpTransport final : public RefCounted<RTCSctpTransport>, public ActiveDOMObject, public EventTargetWithInlineData, public RTCSctpTransportBackend::Client {
WTF_MAKE_ISO_ALLOCATED(RTCSctpTransport);
public:
- static Ref<RTCSctpTransport> create(ScriptExecutionContext& context, UniqueRef<RTCSctpTransportBackend>&& backend, Ref<RTCDtlsTransport>&& transport) { return adoptRef(*new RTCSctpTransport(context, WTFMove(backend), WTFMove(transport))); }
+ static Ref<RTCSctpTransport> create(ScriptExecutionContext&, UniqueRef<RTCSctpTransportBackend>&&, Ref<RTCDtlsTransport>&&);
~RTCSctpTransport();
using RefCounted<RTCSctpTransport>::ref;
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentResponse.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -42,7 +42,6 @@
: ActiveDOMObject { context }
, m_request { request }
{
- suspendIfNeeded();
}
void PaymentResponse::finishConstruction()
@@ -49,6 +48,7 @@
{
ASSERT(!hasPendingActivity());
m_pendingActivity = makePendingActivity(*this);
+ suspendIfNeeded();
}
PaymentResponse::~PaymentResponse()
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseContext.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -97,9 +97,6 @@
DatabaseContext::DatabaseContext(Document& document)
: ActiveDOMObject(document)
{
- // ActiveDOMObject expects this to be called to set internal flags.
- suspendIfNeeded();
-
ASSERT(!document.databaseContext());
document.setDatabaseContext(this);
}
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp (287176 => 287177)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -102,7 +102,9 @@
{
if (auto databaseContext = document.databaseContext())
return *databaseContext;
- return adoptRef(*new DatabaseContext(document));
+ auto context = adoptRef(*new DatabaseContext(document));
+ context->suspendIfNeeded();
+ return context;
}
#if LOG_DISABLED
Modified: trunk/Source/WebCore/html/ImageBitmap.cpp (287176 => 287177)
--- trunk/Source/WebCore/html/ImageBitmap.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/html/ImageBitmap.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -655,6 +655,7 @@
if (scriptExecutionContext.activeDOMObjectsAreStopped())
return;
auto pendingImageBitmap = new PendingImageBitmap(scriptExecutionContext, WTFMove(blob), WTFMove(options), WTFMove(rect), WTFMove(promise));
+ pendingImageBitmap->suspendIfNeeded();
pendingImageBitmap->start(scriptExecutionContext);
}
@@ -668,7 +669,6 @@
, m_promise(WTFMove(promise))
, m_createImageBitmapTimer(&scriptExecutionContext, *this, &PendingImageBitmap::createImageBitmapAndResolvePromise)
{
- suspendIfNeeded();
m_createImageBitmapTimer.suspendIfNeeded();
}
Modified: trunk/Source/WebCore/page/NavigatorBase.cpp (287176 => 287177)
--- trunk/Source/WebCore/page/NavigatorBase.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/page/NavigatorBase.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -37,6 +37,7 @@
#include <wtf/Language.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/NumberOfCores.h>
+#include <wtf/UniqueRef.h>
#include <wtf/text/WTFString.h>
#if OS(LINUX)
@@ -163,7 +164,7 @@
{
ASSERT(RuntimeEnabledFeatures::sharedFeatures().serviceWorkerEnabled());
if (!m_serviceWorkerContainer)
- m_serviceWorkerContainer = makeUnique<ServiceWorkerContainer>(scriptExecutionContext(), *this);
+ m_serviceWorkerContainer = ServiceWorkerContainer::create(scriptExecutionContext(), *this).moveToUniquePtr();
return *m_serviceWorkerContainer;
}
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (287176 => 287177)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2021-12-17 11:58:26 UTC (rev 287177)
@@ -75,12 +75,17 @@
WTF_MAKE_ISO_ALLOCATED_IMPL(ServiceWorkerContainer);
+UniqueRef<ServiceWorkerContainer> ServiceWorkerContainer::create(ScriptExecutionContext* context, NavigatorBase& navigator)
+{
+ auto result = UniqueRef(*new ServiceWorkerContainer(context, navigator));
+ result->suspendIfNeeded();
+ return result;
+}
+
ServiceWorkerContainer::ServiceWorkerContainer(ScriptExecutionContext* context, NavigatorBase& navigator)
: ActiveDOMObject(context)
, m_navigator(navigator)
{
- suspendIfNeeded();
-
// We should queue messages until the DOMContentLoaded event has fired or startMessages() has been called.
if (is<Document>(context) && downcast<Document>(*context).parsing())
m_shouldDeferMessageEvents = true;
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h (287176 => 287177)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2021-12-17 10:11:36 UTC (rev 287176)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h 2021-12-17 11:58:26 UTC (rev 287177)
@@ -40,6 +40,7 @@
#include "ServiceWorkerRegistration.h"
#include "ServiceWorkerRegistrationOptions.h"
#include "WorkerType.h"
+#include <wtf/Forward.h>
#include <wtf/Threading.h>
namespace WebCore {
@@ -57,7 +58,8 @@
WTF_MAKE_NONCOPYABLE(ServiceWorkerContainer);
WTF_MAKE_ISO_ALLOCATED(ServiceWorkerContainer);
public:
- ServiceWorkerContainer(ScriptExecutionContext*, NavigatorBase&);
+ static UniqueRef<ServiceWorkerContainer> create(ScriptExecutionContext*, NavigatorBase&);
+
~ServiceWorkerContainer();
ServiceWorker* controller() const;
@@ -106,6 +108,8 @@
void getNavigationPreloadState(ServiceWorkerRegistrationIdentifier, NavigationPreloadStatePromise&&);
private:
+ ServiceWorkerContainer(ScriptExecutionContext*, NavigatorBase&);
+
bool addEventListener(const AtomString& eventType, Ref<EventListener>&&, const AddEventListenerOptions& = { }) final;
void scheduleJob(std::unique_ptr<ServiceWorkerJob>&&);
