Skip to content

Commit 41b7843

Browse files
author
Sandor Molnar
committed
Backed out 6 changesets (bug 1809752, bug 1809753) for causing perma failures in browser/components/firefoxview/tests/browser/browser_feature_callout_position.js
Backed out changeset ea05784d74c4 (bug 1809753) Backed out changeset 7c9b20eebcc8 (bug 1809753) Backed out changeset d0267ac2256d (bug 1809753) Backed out changeset aa9f2971bd6f (bug 1809753) Backed out changeset f0d9fcfaa6f8 (bug 1809752) Backed out changeset 6d58c799cffe (bug 1809752)
1 parent 469df50 commit 41b7843

File tree

126 files changed

+271
-242
lines changed

Some content is hidden

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

126 files changed

+271
-242
lines changed

dom/base/CCGCScheduler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ void CCGCScheduler::EnsureCCRunner(TimeDuration aDelay, TimeDuration aBudget) {
683683
minimumBudget, true, [this] { return mDidShutdown; });
684684
} else {
685685
mCCRunner->SetMinimumUsefulBudget(minimumBudget.ToMilliseconds());
686-
nsIEventTarget* target = mozilla::GetCurrentSerialEventTarget();
686+
nsIEventTarget* target = mozilla::GetCurrentEventTarget();
687687
if (target) {
688688
mCCRunner->SetTimer(aDelay, target);
689689
}

dom/base/ImageEncoder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SurfaceHelper : public Runnable {
5252
}
5353

5454
already_AddRefed<gfx::DataSourceSurface> GetDataSurfaceSafe() {
55-
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
55+
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
5656
MOZ_ASSERT(mainTarget);
5757
SyncRunnable::DispatchToThread(mainTarget, this, false);
5858

@@ -88,9 +88,9 @@ class EncodingCompleteEvent final : public DiscardableRunnable {
8888
mEncodeCompleteCallback(aEncodeCompleteCallback),
8989
mFailed(false) {
9090
if (!NS_IsMainThread() && IsCurrentThreadRunningWorker()) {
91-
mCreationEventTarget = GetCurrentSerialEventTarget();
91+
mCreationEventTarget = GetCurrentEventTarget();
9292
} else {
93-
mCreationEventTarget = GetMainThreadSerialEventTarget();
93+
mCreationEventTarget = GetMainThreadEventTarget();
9494
}
9595
}
9696

dom/base/InProcessBrowserChildMessageManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Nullable<WindowProxyHolder> InProcessBrowserChildMessageManager::GetContent(
183183

184184
already_AddRefed<nsIEventTarget>
185185
InProcessBrowserChildMessageManager::GetTabEventTarget() {
186-
nsCOMPtr<nsIEventTarget> target = GetMainThreadSerialEventTarget();
186+
nsCOMPtr<nsIEventTarget> target = GetMainThreadEventTarget();
187187
return target.forget();
188188
}
189189

dom/base/StructuredCloneHolder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ StructuredCloneHolder::StructuredCloneHolder(
341341
mGlobal(nullptr)
342342
#ifdef DEBUG
343343
,
344-
mCreationEventTarget(GetCurrentSerialEventTarget())
344+
mCreationEventTarget(GetCurrentEventTarget())
345345
#endif
346346
{
347347
}

dom/base/nsJSEnvironment.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,7 @@ static bool DispatchToEventLoop(void* closure,
19771977
// simply NS_DispatchToMainThread. Failure during shutdown is expected and
19781978
// properly handled by the JS engine.
19791979

1980-
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
1980+
nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
19811981
if (!mainTarget) {
19821982
return false;
19831983
}

dom/cache/Context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ class Context::ActionRunnable final : public nsIRunnable,
475475
mTarget(aTarget),
476476
mAction(std::move(aAction)),
477477
mDirectoryMetadata(aDirectoryMetadata),
478-
mInitiatingThread(GetCurrentSerialEventTarget()),
478+
mInitiatingThread(GetCurrentEventTarget()),
479479
mState(STATE_INIT),
480480
mResult(NS_OK),
481481
mExecutingRunOnTarget(false) {

dom/cache/Manager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1959,7 +1959,8 @@ void Manager::Init(Maybe<Manager&> aOldManager) {
19591959
// per Manager now, this lets us cleanly call Factory::Remove() once the
19601960
// Context goes away.
19611961
SafeRefPtr<Context> ref = Context::Create(
1962-
SafeRefPtrFromThis(), mIOThread, MakeSafeRefPtr<SetupAction>(),
1962+
SafeRefPtrFromThis(), mIOThread->SerialEventTarget(),
1963+
MakeSafeRefPtr<SetupAction>(),
19631964
aOldManager ? SomeRef(*aOldManager->mContext) : Nothing());
19641965
mContext = ref.unsafeGetRawPtr();
19651966
}

dom/fetch/FetchService.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
161161

162162
// Create a FetchDriver instance
163163
mFetchDriver = MakeRefPtr<FetchDriver>(
164-
mRequest.clonePtr(), // Fetch Request
165-
mPrincipal, // Principal
166-
mLoadGroup, // LoadGroup
167-
GetMainThreadSerialEventTarget(), // MainThreadEventTarget
168-
mCookieJarSettings, // CookieJarSettings
169-
mPerformanceStorage, // PerformanceStorage
170-
false // IsTrackingFetch
164+
mRequest.clonePtr(), // Fetch Request
165+
mPrincipal, // Principal
166+
mLoadGroup, // LoadGroup
167+
GetMainThreadEventTarget(), // MainThreadEventTarget
168+
mCookieJarSettings, // CookieJarSettings
169+
mPerformanceStorage, // PerformanceStorage
170+
false // IsTrackingFetch
171171
);
172172

173173
// Call FetchDriver::Fetch to start fetching.

dom/file/MutableBlobStorage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ MutableBlobStorage::MutableBlobStorage(MutableBlobStorageType aType,
288288
MOZ_ASSERT(NS_IsMainThread());
289289

290290
if (!mEventTarget) {
291-
mEventTarget = GetMainThreadSerialEventTarget();
291+
mEventTarget = GetMainThreadEventTarget();
292292
}
293293

294294
if (aMaxMemory == 0 && aType == eCouldBeInTemporaryFile) {

dom/file/MutableBlobStreamListener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ MutableBlobStreamListener::MutableBlobStreamListener(
2323
MOZ_ASSERT(aCallback);
2424

2525
if (!mEventTarget) {
26-
mEventTarget = GetMainThreadSerialEventTarget();
26+
mEventTarget = GetMainThreadEventTarget();
2727
}
2828

2929
MOZ_ASSERT(mEventTarget);

0 commit comments

Comments
 (0)