Bug 1768189 - Part 43: Apply modernize-concat-nested-namespaces to dom/workers/JSExecutionManager.cpp ... r=andi

Depends on D145778

Differential Revision: https://phabricator.services.mozilla.com/D145779
This commit is contained in:
Kagami Sascha Rosylight
2022-05-09 20:41:20 +00:00
parent 50f0e30a17
commit 8ead14a411
25 changed files with 50 additions and 108 deletions

View File

@@ -13,8 +13,7 @@
#include "mozilla/StaticPrefs_dom.h"
#include "mozilla/StaticPtr.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
JSExecutionManager* JSExecutionManager::mCurrentMTManager;
@@ -249,5 +248,4 @@ AutoYieldJSThreadExecution::AutoYieldJSThreadExecution() {
}
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -16,9 +16,7 @@
#include "nsString.h"
#include "nsTArray.h"
namespace mozilla {
namespace dom {
namespace workerinternals {
namespace mozilla::dom::workerinternals {
// Random unique constant to facilitate JSPrincipal debugging
const uint32_t kJSPrincipalsDebugToken = 0x7e2df9d2;
@@ -59,8 +57,6 @@ struct JSSettings {
}
};
} // namespace workerinternals
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom::workerinternals
#endif // mozilla_dom_workerinternals_JSSettings_h

View File

@@ -14,8 +14,7 @@
#include "nsQueryObject.h"
#include "WorkerScope.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
MessageEventRunnable::MessageEventRunnable(WorkerPrivate* aWorkerPrivate,
TargetAndBusyBehavior aBehavior)
@@ -155,5 +154,4 @@ void MessageEventRunnable::DispatchError(JSContext* aCx,
aTarget->DispatchEvent(*event);
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -12,8 +12,7 @@
#include "mozilla/dom/StructuredCloneTags.h"
#include "mozilla/dom/workerinternals/JSSettings.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
WorkerPrincipal::WorkerPrincipal(bool aIsSystemOrAddonPrincipal)
: JSPrincipals(), mIsSystemOrAddonPrincipal(aIsSystemOrAddonPrincipal) {
@@ -34,5 +33,4 @@ void WorkerPrincipal::Destroy(JSPrincipals* aPrincipals) {
delete static_cast<WorkerPrincipal*>(aPrincipals);
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -9,8 +9,7 @@
#include "js/Principals.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
struct MOZ_HEAP_CLASS WorkerPrincipal final : public JSPrincipals {
explicit WorkerPrincipal(bool aIsSystemOrAddonPrincipal);
@@ -30,7 +29,6 @@ struct MOZ_HEAP_CLASS WorkerPrincipal final : public JSPrincipals {
bool mIsSystemOrAddonPrincipal;
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif /* mozilla_dom_workers_principal_h__ */

View File

@@ -10,9 +10,7 @@
#include "mozilla/Mutex.h"
#include "nsTArray.h"
namespace mozilla {
namespace dom {
namespace workerinternals {
namespace mozilla::dom::workerinternals {
template <typename T, int TCount>
struct StorageWithTArray {
@@ -148,8 +146,6 @@ class Queue : public LockingPolicy {
Queue& operator=(const Queue&);
};
} // namespace workerinternals
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom::workerinternals
#endif /* mozilla_dom_workerinternals_Queue_h*/

View File

@@ -24,8 +24,7 @@
class nsPIDOMWindowInner;
namespace mozilla {
namespace dom {
namespace mozilla::dom {
struct WorkerLoadInfo;
class WorkerThread;
@@ -194,7 +193,6 @@ class RuntimeService final : public nsIObserver {
};
} // namespace workerinternals
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif /* mozilla_dom_workers_runtimeservice_h__ */

View File

@@ -78,10 +78,7 @@
using mozilla::ipc::PrincipalInfo;
namespace mozilla {
namespace dom {
namespace workerinternals {
namespace mozilla::dom::workerinternals {
namespace {
nsresult ConstructURI(const nsAString& aScriptURL, nsIURI* baseURI,
@@ -1288,7 +1285,4 @@ void Load(WorkerPrivate* aWorkerPrivate,
aWorkerScriptType, aRv);
}
} // namespace workerinternals
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom::workerinternals

View File

@@ -21,8 +21,7 @@
# undef PostMessage
#endif
namespace mozilla {
namespace dom {
namespace mozilla::dom {
/* static */
already_AddRefed<Worker> Worker::Constructor(const GlobalObject& aGlobal,
@@ -198,5 +197,4 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
NS_IMPL_ADDREF_INHERITED(Worker, DOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(Worker, DOMEventTargetHelper)
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -17,8 +17,7 @@
# undef PostMessage
#endif
namespace mozilla {
namespace dom {
namespace mozilla::dom {
struct StructuredSerializeOptions;
struct WorkerOptions;
@@ -63,7 +62,6 @@ class Worker : public DOMEventTargetHelper, public SupportsWeakPtr {
RefPtr<WorkerPrivate> mWorkerPrivate;
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif /* mozilla_dom_Worker_h */

View File

@@ -11,8 +11,7 @@
#include "mozilla/Mutex.h"
#include "nsIContentSecurityPolicy.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WeakWorkerRef;
class WorkerRef;
@@ -36,7 +35,6 @@ class WorkerCSPEventListener final : public nsICSPEventListener {
RefPtr<WeakWorkerRef> mWorkerRef GUARDED_BY(mMutex);
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_WorkerCSPEventListener_h

View File

@@ -11,8 +11,7 @@
class nsPIDOMWindowInner;
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerPrivate;
@@ -53,7 +52,6 @@ bool IsWorkerDebuggerGlobal(JSObject* global);
bool IsWorkerDebuggerSandbox(JSObject* object);
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_workers_WorkerCommon_h

View File

@@ -26,8 +26,7 @@
# include <unistd.h> // for getpid()
#endif // defined(XP_WIN)
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -569,5 +568,4 @@ RefPtr<PerformanceInfoPromise> WorkerDebugger::ReportPerformanceInfo() {
});
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -16,8 +16,7 @@ class mozIDOMWindow;
class nsIPrincipal;
class nsPIDOMWindowInner;
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerPrivate;
@@ -62,7 +61,6 @@ class WorkerDebugger : public nsIWorkerDebugger {
nsCOMPtr<nsPIDOMWindowInner> DedicatedWorkerWindow();
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_workers_WorkerDebugger_h

View File

@@ -17,8 +17,7 @@
#include "WorkerPrivate.h"
#include "nsIObserverService.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -328,5 +327,4 @@ WorkerDebuggerManager::CloneListeners() {
return mListeners.Clone();
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -26,8 +26,7 @@
#define WORKERDEBUGGERMANAGER_CONTRACTID \
"@mozilla.org/dom/workers/workerdebuggermanager;1"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerDebugger;
class WorkerPrivate;
@@ -112,7 +111,6 @@ inline nsresult UnregisterWorkerDebugger(WorkerPrivate* aWorkerPrivate) {
return NS_OK;
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_workers_workerdebuggermanager_h

View File

@@ -58,8 +58,7 @@
#include "nscore.h"
#include "xpcpublic.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -475,5 +474,4 @@ void WorkerErrorReport::CreateAndDispatchGenericErrorRunnableToParent(
ReportGenericErrorRunnable::CreateAndDispatch(aWorkerPrivate);
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -10,8 +10,7 @@
#include "mozilla/dom/ReferrerInfo.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -147,5 +146,4 @@ WorkerEventTarget::IsOnCurrentThread(bool* aIsOnCurrentThread) {
return NS_OK;
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -11,8 +11,7 @@
#include "mozilla/Mutex.h"
#include "mozilla/dom/WorkerPrivate.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerEventTarget final : public nsISerialEventTarget {
public:
@@ -44,7 +43,6 @@ class WorkerEventTarget final : public nsISerialEventTarget {
NS_DECL_NSISERIALEVENTTARGET
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_WorkerEventTarget_h

View File

@@ -8,8 +8,7 @@
#include "mozilla/dom/WorkerLocationBinding.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WorkerLocation)
@@ -37,5 +36,4 @@ JSObject* WorkerLocation::WrapObject(JSContext* aCx,
return WorkerLocation_Binding::Wrap(aCx, this, aGivenProto);
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -11,8 +11,7 @@
#include "WorkerPrivate.h"
#include "nsWrapperCache.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerLocation final : public nsWrapperCache {
nsString mHref;
@@ -68,7 +67,6 @@ class WorkerLocation final : public nsWrapperCache {
void GetOrigin(nsString& aOrigin) const { aOrigin = mOrigin; }
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif // mozilla_dom_location_h__

View File

@@ -10,8 +10,7 @@
#include "WorkerRunnable.h"
#include "WorkerPrivate.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -243,5 +242,4 @@ WorkerPrivate* IPCWorkerRef::Private() const {
return mWorkerPrivate;
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -12,8 +12,7 @@
#include "mozilla/RefPtr.h"
#include "nsISupports.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
/*
* If you want to play with a DOM Worker, you must know that it can go away
@@ -233,7 +232,6 @@ class IPCWorkerRefHelper final {
ActorPtr* mActor;
};
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom
#endif /* mozilla_dom_workers_WorkerRef_h */

View File

@@ -31,8 +31,7 @@
#include "nsThreadUtils.h"
#include "nsWrapperCacheInlines.h"
namespace mozilla {
namespace dom {
namespace mozilla::dom {
namespace {
@@ -718,5 +717,4 @@ bool WorkerDebuggeeRunnable::PreDispatch(WorkerPrivate* aWorkerPrivate) {
return WorkerRunnable::PreDispatch(aWorkerPrivate);
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom

View File

@@ -130,8 +130,7 @@ using mozilla::ipc::BackgroundChild;
using mozilla::ipc::PBackgroundChild;
using mozilla::ipc::PrincipalInfo;
namespace mozilla {
namespace dom {
namespace mozilla::dom {
class WorkerScriptTimeoutHandler final : public ScriptTimeoutHandler {
public:
@@ -1347,5 +1346,4 @@ bool IsWorkerDebuggerSandbox(JSObject* object) {
SimpleGlobalObject::GlobalType::WorkerDebuggerSandbox;
}
} // namespace dom
} // namespace mozilla
} // namespace mozilla::dom