[webkit-changes] [275611] trunk/Source/WebCore

Wed, 07 Apr 2021 10:09:16 -0700

Title: [275611] trunk/Source/WebCore
Revision
275611
Author
[email protected]
Date
2021-04-07 10:08:35 -0700 (Wed, 07 Apr 2021)

Log Message

Drop unnecessary NDEBUG checks in ServiceWorkerContainer
https://bugs.webkit.org/show_bug.cgi?id=224285

Reviewed by Youenn Fablet.

* workers/service/ServiceWorkerContainer.cpp:
(WebCore::ServiceWorkerContainer::~ServiceWorkerContainer):
(WebCore::ServiceWorkerContainer::scheduleJob):
(WebCore::ServiceWorkerContainer::jobFailedWithException):
(WebCore::ServiceWorkerContainer::queueTaskToFireUpdateFoundEvent):
(WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
(WebCore::ServiceWorkerContainer::jobResolvedWithUnregistrationResult):
(WebCore::ServiceWorkerContainer::startScriptFetchForJob):
(WebCore::ServiceWorkerContainer::jobFinishedLoadingScript):
(WebCore::ServiceWorkerContainer::jobFailedLoadingScript):
(WebCore::ServiceWorkerContainer::destroyJob):
(WebCore::ServiceWorkerContainer::addRegistration):
(WebCore::ServiceWorkerContainer::removeRegistration):
(WebCore::ServiceWorkerContainer::queueTaskToDispatchControllerChangeEvent):
(WebCore::ServiceWorkerContainer::contextIdentifier):
* workers/service/ServiceWorkerContainer.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (275610 => 275611)


--- trunk/Source/WebCore/ChangeLog	2021-04-07 17:06:09 UTC (rev 275610)
+++ trunk/Source/WebCore/ChangeLog	2021-04-07 17:08:35 UTC (rev 275611)
@@ -1,3 +1,27 @@
+2021-04-07  Chris Dumez  <[email protected]>
+
+        Drop unnecessary NDEBUG checks in ServiceWorkerContainer
+        https://bugs.webkit.org/show_bug.cgi?id=224285
+
+        Reviewed by Youenn Fablet.
+
+        * workers/service/ServiceWorkerContainer.cpp:
+        (WebCore::ServiceWorkerContainer::~ServiceWorkerContainer):
+        (WebCore::ServiceWorkerContainer::scheduleJob):
+        (WebCore::ServiceWorkerContainer::jobFailedWithException):
+        (WebCore::ServiceWorkerContainer::queueTaskToFireUpdateFoundEvent):
+        (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
+        (WebCore::ServiceWorkerContainer::jobResolvedWithUnregistrationResult):
+        (WebCore::ServiceWorkerContainer::startScriptFetchForJob):
+        (WebCore::ServiceWorkerContainer::jobFinishedLoadingScript):
+        (WebCore::ServiceWorkerContainer::jobFailedLoadingScript):
+        (WebCore::ServiceWorkerContainer::destroyJob):
+        (WebCore::ServiceWorkerContainer::addRegistration):
+        (WebCore::ServiceWorkerContainer::removeRegistration):
+        (WebCore::ServiceWorkerContainer::queueTaskToDispatchControllerChangeEvent):
+        (WebCore::ServiceWorkerContainer::contextIdentifier):
+        * workers/service/ServiceWorkerContainer.h:
+
 2021-04-07  Simon Fraser  <[email protected]>
 
         Wasted vector capacity in StyleRuleKeyframes

Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (275610 => 275611)


--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp	2021-04-07 17:06:09 UTC (rev 275610)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp	2021-04-07 17:08:35 UTC (rev 275611)
@@ -83,9 +83,7 @@
 
 ServiceWorkerContainer::~ServiceWorkerContainer()
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 }
 
 void ServiceWorkerContainer::refEventTarget()
@@ -234,10 +232,7 @@
 
 void ServiceWorkerContainer::scheduleJob(std::unique_ptr<ServiceWorkerJob>&& job)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
-
     ASSERT(m_swConnection);
     ASSERT(!isStopped());
 
@@ -328,10 +323,7 @@
 
 void ServiceWorkerContainer::jobFailedWithException(ServiceWorkerJob& job, const Exception& exception)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
-
     ASSERT_WITH_MESSAGE(job.hasPromise() || job.data().type == ServiceWorkerJobType::Update, "Only soft updates have no promise");
 
     auto guard = WTF::makeScopeExit([this, &job] {
@@ -351,9 +343,7 @@
 
 void ServiceWorkerContainer::queueTaskToFireUpdateFoundEvent(ServiceWorkerRegistrationIdentifier identifier)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     if (auto* registration = m_registrations.get(identifier))
         registration->queueTaskToFireUpdateFoundEvent();
@@ -361,9 +351,7 @@
 
 void ServiceWorkerContainer::jobResolvedWithRegistration(ServiceWorkerJob& job, ServiceWorkerRegistrationData&& data, ShouldNotifyWhenResolved shouldNotifyWhenResolved)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
     ASSERT_WITH_MESSAGE(job.hasPromise() || job.data().type == ServiceWorkerJobType::Update, "Only soft updates have no promise");
 
     if (job.data().type == ServiceWorkerJobType::Register)
@@ -432,10 +420,7 @@
 
 void ServiceWorkerContainer::jobResolvedWithUnregistrationResult(ServiceWorkerJob& job, bool unregistrationResult)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
-
     ASSERT(job.hasPromise());
 
     auto guard = WTF::makeScopeExit([this, &job] {
@@ -457,9 +442,7 @@
 
 void ServiceWorkerContainer::startScriptFetchForJob(ServiceWorkerJob& job, FetchOptions::Cache cachePolicy)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     CONTAINER_RELEASE_LOG_IF_ALLOWED("startScriptFetchForJob: Starting script fetch for job %" PRIu64, job.identifier().toUInt64());
 
@@ -476,9 +459,7 @@
 
 void ServiceWorkerContainer::jobFinishedLoadingScript(ServiceWorkerJob& job, const ScriptBuffer& script, const CertificateInfo& certificateInfo, const ContentSecurityPolicyResponseHeaders& contentSecurityPolicy, const String& referrerPolicy)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     CONTAINER_RELEASE_LOG_IF_ALLOWED("jobFinishedLoadingScript: Successfuly finished fetching script for job %" PRIu64, job.identifier().toUInt64());
 
@@ -487,9 +468,7 @@
 
 void ServiceWorkerContainer::jobFailedLoadingScript(ServiceWorkerJob& job, const ResourceError& error, Exception&& exception)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
     ASSERT_WITH_MESSAGE(job.hasPromise() || job.data().type == ServiceWorkerJobType::Update, "Only soft updates have no promise");
 
     CONTAINER_RELEASE_LOG_ERROR_IF_ALLOWED("jobFinishedLoadingScript: Failed to fetch script for job %" PRIu64 ", error: %s", job.identifier().toUInt64(), error.localizedDescription().utf8().data());
@@ -511,10 +490,7 @@
 
 void ServiceWorkerContainer::destroyJob(ServiceWorkerJob& job)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
-
     ASSERT(m_jobMap.contains(job.identifier()));
     m_jobMap.remove(job.identifier());
 }
@@ -539,9 +515,7 @@
 
 void ServiceWorkerContainer::addRegistration(ServiceWorkerRegistration& registration)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     ensureSWClientConnection().addServiceWorkerRegistrationInServer(registration.identifier());
     m_registrations.add(registration.identifier(), &registration);
@@ -549,9 +523,7 @@
 
 void ServiceWorkerContainer::removeRegistration(ServiceWorkerRegistration& registration)
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     m_swConnection->removeServiceWorkerRegistrationInServer(registration.identifier());
     m_registrations.remove(registration.identifier());
@@ -559,9 +531,7 @@
 
 void ServiceWorkerContainer::queueTaskToDispatchControllerChangeEvent()
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
 
     queueTaskToDispatchEvent(*this, TaskSource::DOMManipulation, Event::create(eventNames().controllerchangeEvent, Event::CanBubble::No, Event::IsCancelable::No));
 }
@@ -584,10 +554,7 @@
 
 DocumentOrWorkerIdentifier ServiceWorkerContainer::contextIdentifier()
 {
-#ifndef NDEBUG
     ASSERT(m_creationThread.ptr() == &Thread::current());
-#endif
-
     ASSERT(scriptExecutionContext());
     if (is<ServiceWorkerGlobalScope>(*scriptExecutionContext()))
         return downcast<ServiceWorkerGlobalScope>(*scriptExecutionContext()).thread().identifier();

Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h (275610 => 275611)


--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h	2021-04-07 17:06:09 UTC (rev 275610)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.h	2021-04-07 17:08:35 UTC (rev 275611)
@@ -138,7 +138,7 @@
     bool m_isStopped { false };
     HashMap<ServiceWorkerRegistrationIdentifier, ServiceWorkerRegistration*> m_registrations;
 
-#ifndef NDEBUG
+#if ASSERT_ENABLED
     Ref<Thread> m_creationThread { Thread::current() };
 #endif
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to