Skip to content

Commit 05adafa

Browse files
author
Jean-Yves Avenard
committed
Bug 1637500 - P2. Rename methods as they are not always dealing with "threads". r=froydnj
Before P1, GetCurrentThreadSerialEventTarget would have always returned the same data as NS_GetCurrentThread, making the comment incorrect Now it will properly return the running TaskQueue if any. This change of name more clearly exposes what they are doing, as we aren't always dealing with threads directly; but a nsISerialEventTarget Differential Revision: https://phabricator.services.mozilla.com/D80354
1 parent 1d05f87 commit 05adafa

File tree

144 files changed

+597
-318
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+597
-318
lines changed

docshell/base/nsDocShell.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ nsDocShell::GetHasTrackingContentBlocked(Promise** aPromise) {
14051405
doc->GetContentBlockingEvents();
14061406
if (promise) {
14071407
promise->Then(
1408-
GetCurrentThreadSerialEventTarget(), __func__,
1408+
GetCurrentSerialEventTarget(), __func__,
14091409
[retPromise](const Document::GetContentBlockingEventsPromise::
14101410
ResolveOrRejectValue& aValue) {
14111411
if (aValue.IsResolve()) {

dom/base/ChromeUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ already_AddRefed<Promise> ChromeUtils::CollectPerfStats(GlobalObject& aGlobal,
10581058
PerfStats::CollectPerfStatsJSON();
10591059

10601060
extPromise->Then(
1061-
GetCurrentThreadSerialEventTarget(), __func__,
1061+
GetCurrentSerialEventTarget(), __func__,
10621062
[promise](const nsCString& aResult) {
10631063
promise->MaybeResolve(NS_ConvertUTF8toUTF16(aResult));
10641064
},

dom/base/Document.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ already_AddRefed<mozilla::dom::Promise> Document::AddCertException(
15231523
ContentChild* cc = ContentChild::GetSingleton();
15241524
MOZ_ASSERT(cc);
15251525
cc->SendAddCertException(certSerialized, flags, host, port, aIsTemporary)
1526-
->Then(GetCurrentThreadSerialEventTarget(), __func__,
1526+
->Then(GetCurrentSerialEventTarget(), __func__,
15271527
[promise](const mozilla::MozPromise<
15281528
nsresult, mozilla::ipc::ResponseRejectReason,
15291529
true>::ResolveOrRejectValue& aValue) {
@@ -15769,7 +15769,7 @@ Document::GetContentBlockingEvents() {
1576915769
}
1577015770

1577115771
return wgc->SendGetContentBlockingEvents()->Then(
15772-
GetCurrentThreadSerialEventTarget(), __func__,
15772+
GetCurrentSerialEventTarget(), __func__,
1577315773
[](const WindowGlobalChild::GetContentBlockingEventsPromise::
1577415774
ResolveOrRejectValue& aValue) {
1577515775
if (aValue.IsResolve()) {
@@ -15929,7 +15929,7 @@ already_AddRefed<mozilla::dom::Promise> Document::RequestStorageAccess(
1592915929
}
1593015930

1593115931
self->AutomaticStorageAccessPermissionCanBeGranted()->Then(
15932-
GetCurrentThreadSerialEventTarget(), __func__,
15932+
GetCurrentSerialEventTarget(), __func__,
1593315933
[p, pr, sapr,
1593415934
inner](const AutomaticStorageAccessPermissionGrantPromise::
1593515935
ResolveOrRejectValue& aValue) -> void {
@@ -15964,7 +15964,7 @@ already_AddRefed<mozilla::dom::Promise> Document::RequestStorageAccess(
1596415964
p->Resolve(choice, __func__);
1596515965
} else {
1596615966
sapr->MaybeDelayAutomaticGrants()->Then(
15967-
GetCurrentThreadSerialEventTarget(), __func__,
15967+
GetCurrentSerialEventTarget(), __func__,
1596815968
[p, choice] { p->Resolve(choice, __func__); },
1596915969
[p] { p->Reject(false, __func__); });
1597015970
}
@@ -15985,7 +15985,7 @@ already_AddRefed<mozilla::dom::Promise> Document::RequestStorageAccess(
1598515985
NodePrincipal(), bc, ContentBlockingNotifier::eStorageAccessAPI,
1598615986
performFinalChecks)
1598715987
->Then(
15988-
GetCurrentThreadSerialEventTarget(), __func__,
15988+
GetCurrentSerialEventTarget(), __func__,
1598915989
[outer, promise] {
1599015990
// Step 10. Grant the document access to cookies and store
1599115991
// that fact for
@@ -16020,7 +16020,7 @@ Document::AutomaticStorageAccessPermissionCanBeGranted() {
1602016020
return cc
1602116021
->SendAutomaticStorageAccessPermissionCanBeGranted(
1602216022
IPC::Principal(NodePrincipal()))
16023-
->Then(GetCurrentThreadSerialEventTarget(), __func__,
16023+
->Then(GetCurrentSerialEventTarget(), __func__,
1602416024
[](const ContentChild::
1602516025
AutomaticStorageAccessPermissionCanBeGrantedPromise::
1602616026
ResolveOrRejectValue& aValue) {

dom/base/ImageEncoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class EncodingCompleteEvent : public CancelableRunnable {
8787
mEncodeCompleteCallback(aEncodeCompleteCallback),
8888
mFailed(false) {
8989
if (!NS_IsMainThread() && IsCurrentThreadRunningWorker()) {
90-
mCreationEventTarget = GetCurrentThreadEventTarget();
90+
mCreationEventTarget = GetCurrentEventTarget();
9191
} else {
9292
mCreationEventTarget = GetMainThreadEventTarget();
9393
}

dom/base/Navigator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ already_AddRefed<Promise> Navigator::GetVRDisplays(ErrorResult& aRv) {
15111511
int browserID = browser->ChromeOuterWindowID();
15121512

15131513
browser->SendIsWindowSupportingWebVR(browserID)->Then(
1514-
GetCurrentThreadSerialEventTarget(), __func__,
1514+
GetCurrentSerialEventTarget(), __func__,
15151515
[self, p](bool isSupported) {
15161516
self->FinishGetVRDisplays(isSupported, p);
15171517
},

dom/base/StructuredCloneHolder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ StructuredCloneHolder::StructuredCloneHolder(
300300
mGlobal(nullptr)
301301
#ifdef DEBUG
302302
,
303-
mCreationEventTarget(GetCurrentThreadEventTarget())
303+
mCreationEventTarget(GetCurrentEventTarget())
304304
#endif
305305
{
306306
}

dom/base/nsDOMWindowUtils.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4206,7 +4206,7 @@ nsDOMWindowUtils::StartCompositionRecording(Promise** aOutPromise) {
42064206
} else {
42074207
cbc->SendBeginRecording(TimeStamp::Now())
42084208
->Then(
4209-
GetCurrentThreadSerialEventTarget(), __func__,
4209+
GetCurrentSerialEventTarget(), __func__,
42104210
[promise](const bool& aSuccess) {
42114211
if (aSuccess) {
42124212
promise->MaybeResolve(true);
@@ -4247,7 +4247,7 @@ nsDOMWindowUtils::StopCompositionRecording(bool aWriteToDisk,
42474247
promise->MaybeReject(NS_ERROR_UNEXPECTED);
42484248
} else if (aWriteToDisk) {
42494249
cbc->SendEndRecordingToDisk()->Then(
4250-
GetCurrentThreadSerialEventTarget(), __func__,
4250+
GetCurrentSerialEventTarget(), __func__,
42514251
[promise](const bool& aSuccess) {
42524252
if (aSuccess) {
42534253
promise->MaybeResolveWithUndefined();
@@ -4262,7 +4262,7 @@ nsDOMWindowUtils::StopCompositionRecording(bool aWriteToDisk,
42624262
});
42634263
} else {
42644264
cbc->SendEndRecordingToMemory()->Then(
4265-
GetCurrentThreadSerialEventTarget(), __func__,
4265+
GetCurrentSerialEventTarget(), __func__,
42664266
[promise](Maybe<CollectedFramesParams>&& aFrames) {
42674267
if (!aFrames) {
42684268
promise->MaybeRejectWithUnknownError(

dom/cache/CacheStreamControlChild.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void CacheStreamControlChild::OpenStream(const nsID& aId,
108108
const SafeRefPtr<CacheWorkerRef> holder = GetWorkerRefPtr().clonePtr();
109109

110110
SendOpenStream(aId)->Then(
111-
GetCurrentThreadSerialEventTarget(), __func__,
111+
GetCurrentSerialEventTarget(), __func__,
112112
[aResolver,
113113
holder = holder.clonePtr()](RefPtr<nsIInputStream>&& aOptionalStream) {
114114
aResolver(nsCOMPtr<nsIInputStream>(std::move(aOptionalStream)));

dom/cache/Context.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class Context::QuotaInitRunnable final : public nsIRunnable,
9797
mData(aData),
9898
mTarget(aTarget),
9999
mInitAction(aInitAction),
100-
mInitiatingEventTarget(GetCurrentThreadEventTarget()),
100+
mInitiatingEventTarget(GetCurrentEventTarget()),
101101
mResult(NS_OK),
102102
mState(STATE_INIT),
103103
mCanceled(false) {
@@ -469,7 +469,7 @@ class Context::ActionRunnable final : public nsIRunnable,
469469
mTarget(aTarget),
470470
mAction(aAction),
471471
mQuotaInfo(aQuotaInfo),
472-
mInitiatingThread(GetCurrentThreadEventTarget()),
472+
mInitiatingThread(GetCurrentEventTarget()),
473473
mState(STATE_INIT),
474474
mResult(NS_OK),
475475
mExecutingRunOnTarget(false) {
@@ -700,7 +700,7 @@ void Context::ThreadsafeHandle::InvalidateAndAllowToClose() {
700700
Context::ThreadsafeHandle::ThreadsafeHandle(SafeRefPtr<Context> aContext)
701701
: mStrongRef(std::move(aContext)),
702702
mWeakRef(mStrongRef.unsafeGetRawPtr()),
703-
mOwningEventTarget(GetCurrentThreadSerialEventTarget()) {}
703+
mOwningEventTarget(GetCurrentSerialEventTarget()) {}
704704

705705
Context::ThreadsafeHandle::~ThreadsafeHandle() {
706706
// Normally we only touch mStrongRef on the owning thread. This is safe,

dom/cache/Manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ class Manager::CachePutAllAction final : public DBAction {
717717
MOZ_DIAGNOSTIC_ASSERT(!mConn);
718718

719719
MOZ_DIAGNOSTIC_ASSERT(!mTarget);
720-
mTarget = GetCurrentThreadSerialEventTarget();
720+
mTarget = GetCurrentSerialEventTarget();
721721
MOZ_DIAGNOSTIC_ASSERT(mTarget);
722722

723723
// We should be pre-initialized to expect one async completion. This is

0 commit comments

Comments
 (0)