Bug 1597433 - part 2: Rename nsGlobalWindowInner::CallOnChildren -> nsGlobalWindowInner::CallOnInProcessChildren. r=kmag

Differential Revision: https://phabricator.services.mozilla.com/D57750

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tetsuharu OHZEKI 2019-12-20 10:06:08 +00:00
Родитель 31f408450f
Коммит c59f473413
2 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -2328,7 +2328,7 @@ CallState nsGlobalWindowInner::ShouldReportForServiceWorkerScopeInternal(
// The current window doesn't care about this service worker, but maybe
// one of our child frames does.
return CallOnChildren(
return CallOnInProcessChildren(
&nsGlobalWindowInner::ShouldReportForServiceWorkerScopeInternal, aScope,
aResultOut);
}
@ -2465,7 +2465,6 @@ void nsPIDOMWindowInner::TryToCacheTopInnerWindow() {
}
}
void nsPIDOMWindowInner::UpdateActiveIndexedDBDatabaseCount(int32_t aDelta) {
MOZ_ASSERT(NS_IsMainThread());
@ -5114,7 +5113,7 @@ void nsGlobalWindowInner::Suspend() {
// All children are also suspended. This ensure mSuspendDepth is
// set properly and the timers are properly canceled for each child.
CallOnChildren(&nsGlobalWindowInner::Suspend);
CallOnInProcessChildren(&nsGlobalWindowInner::Suspend);
mSuspendDepth += 1;
if (mSuspendDepth != 1) {
@ -5162,7 +5161,7 @@ void nsGlobalWindowInner::Resume() {
// Resume all children. This restores timers recursively canceled
// in Suspend() and ensures all children have the correct mSuspendDepth.
CallOnChildren(&nsGlobalWindowInner::Resume);
CallOnInProcessChildren(&nsGlobalWindowInner::Resume);
MOZ_ASSERT(mSuspendDepth != 0);
mSuspendDepth -= 1;
@ -5219,7 +5218,7 @@ void nsGlobalWindowInner::FreezeInternal() {
MOZ_DIAGNOSTIC_ASSERT(IsCurrentInnerWindow());
MOZ_DIAGNOSTIC_ASSERT(IsSuspended());
CallOnChildren(&nsGlobalWindowInner::FreezeInternal);
CallOnInProcessChildren(&nsGlobalWindowInner::FreezeInternal);
mFreezeDepth += 1;
MOZ_ASSERT(mSuspendDepth >= mFreezeDepth);
@ -5254,7 +5253,7 @@ void nsGlobalWindowInner::ThawInternal() {
MOZ_DIAGNOSTIC_ASSERT(IsCurrentInnerWindow());
MOZ_DIAGNOSTIC_ASSERT(IsSuspended());
CallOnChildren(&nsGlobalWindowInner::ThawInternal);
CallOnInProcessChildren(&nsGlobalWindowInner::ThawInternal);
MOZ_ASSERT(mFreezeDepth != 0);
mFreezeDepth -= 1;
@ -5330,7 +5329,8 @@ void nsGlobalWindowInner::SyncStateFromParentWindow() {
}
template <typename Method, typename... Args>
CallState nsGlobalWindowInner::CallOnChildren(Method aMethod, Args&... aArgs) {
CallState nsGlobalWindowInner::CallOnInProcessChildren(Method aMethod,
Args&... aArgs) {
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(IsCurrentInnerWindow());
@ -7181,7 +7181,7 @@ void nsGlobalWindowInner::ClearActiveStoragePrincipal() {
doc->ClearActiveStoragePrincipal();
}
CallOnChildren(&nsGlobalWindowInner::ClearActiveStoragePrincipal);
CallOnInProcessChildren(&nsGlobalWindowInner::ClearActiveStoragePrincipal);
}
bool nsPIDOMWindowInner::HasStorageAccessGranted(

Просмотреть файл

@ -1038,7 +1038,7 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
// CallState returned by the last child method invocation is returned or
// CallState::Continue if the method returns void.
template <typename Method, typename... Args>
mozilla::CallState CallOnChildren(Method aMethod, Args&... aArgs);
mozilla::CallState CallOnInProcessChildren(Method aMethod, Args&... aArgs);
// Helper to convert a void returning child method into an implicit
// CallState::Continue value.