commit 32d5db1a7754b291df243c0f118071b27be50f5f
parent dbfb8f0b05b4a21cb1cc522f90a4610156a87879
Author: Markus Stange <mstange.moz@gmail.com>
Date: Tue, 7 Oct 2025 15:49:44 +0000
Bug 1992515 - Remove a few instances of "using namespace" outside of a namespace. r=bradwerth
This avoids a compile error I got when I added an `#include <IOSurface/IOSurface.h>` to PNativeLayerRemote.h:
```
In file included from Unified_mm_gfx_layers0.mm:38:
/Users/mstange/code/mozilla/gfx/layers/NativeLayerRootRemoteMacParent.mm:71:55: error: no member named 'SurfacePort' in 'mozilla::layers::CommandChangedSurface'
71 | std::move(changedSurface.SurfacePort()),
| ~~~~~~~~~~~~~~ ^
In file included from Unified_cpp_gfx_ipc0.cpp:110:
In file included from /Users/mstange/code/mozilla/gfx/ipc/GPUProcessManager.cpp:47:
In file included from /Users/mstange/code/obj-m-opt/dist/include/mozilla/widget/CompositorWidgetChild.h:9:
In file included from /Users/mstange/code/obj-m-opt/dist/include/mozilla/widget/CocoaCompositorWidget.h:11:
In file included from /Users/mstange/code/obj-m-opt/dist/include/mozilla/layers/NativeLayerRemoteChild.h:8:
In file included from /Users/mstange/code/obj-m-opt/ipc/ipdl/_ipdlheaders/mozilla/layers/PNativeLayerRemoteChild.h:9:
In file included from /Users/mstange/code/obj-m-opt/ipc/ipdl/_ipdlheaders/mozilla/layers/PNativeLayerRemote.h:28:
In file included from /Users/mstange/code/obj-m-opt/dist/include/mozilla/layers/IOSurfacePort.h:14:
In file included from /Users/mstange/.mozbuild/MacOSX26.0.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurface.h:12:
In file included from /Users/mstange/.mozbuild/MacOSX26.0.sdk/System/Library/Frameworks/IOSurface.framework/Headers/IOSurfaceBase.h:47:
In file included from /Users/mstange/.mozbuild/MacOSX26.0.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:54:
In file included from /Users/mstange/.mozbuild/MacOSX26.0.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:80:
/Users/mstange/.mozbuild/MacOSX26.0.sdk/usr/include/MacTypes.h:548:16: error: reference to 'Point' is ambiguous
548 | typedef struct Point Point;
| ^
/Users/mstange/.mozbuild/MacOSX26.0.sdk/usr/include/MacTypes.h:544:8: note: candidate found by name lookup is 'Point'
544 | struct Point {
| ^
/Users/mstange/code/obj-m-opt/dist/include/mozilla/gfx/Point.h:179:34: note: candidate found by name lookup is 'mozilla::gfx::Point'
179 | typedef PointTyped<UnknownUnits> Point;
```
Differential Revision: https://phabricator.services.mozilla.com/D267656
Diffstat:
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/gfx/ipc/CanvasManagerChild.cpp b/gfx/ipc/CanvasManagerChild.cpp
@@ -18,11 +18,10 @@
#include "mozilla/layers/CompositorManagerChild.h"
#include "mozilla/webgpu/WebGPUChild.h"
-using namespace mozilla::dom;
-using namespace mozilla::layers;
-
namespace mozilla::gfx {
+using namespace layers;
+
// The IPDL actor holds a strong reference to CanvasManagerChild which we use
// to keep it alive. The owning thread will tell us to close when it is
// shutdown, either via CanvasManagerChild::Shutdown for the main thread, or
@@ -31,7 +30,7 @@ MOZ_THREAD_LOCAL(CanvasManagerChild*) CanvasManagerChild::sLocalManager;
Atomic<uint32_t> CanvasManagerChild::sNextId(1);
-CanvasManagerChild::CanvasManagerChild(ThreadSafeWorkerRef* aWorkerRef,
+CanvasManagerChild::CanvasManagerChild(dom::ThreadSafeWorkerRef* aWorkerRef,
uint32_t aId)
: mWorkerRef(aWorkerRef), mId(aId) {}
@@ -106,7 +105,7 @@ void CanvasManagerChild::Destroy() {
}
// We are only used on the main thread, or on worker threads.
- WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
+ dom::WorkerPrivate* worker = dom::GetCurrentThreadWorkerPrivate();
MOZ_ASSERT_IF(!worker, NS_IsMainThread());
ipc::Endpoint<PCanvasManagerParent> parentEndpoint;
diff --git a/gfx/ipc/CanvasShutdownManager.cpp b/gfx/ipc/CanvasShutdownManager.cpp
@@ -13,10 +13,12 @@
#include "mozilla/gfx/CanvasManagerChild.h"
#include "mozilla/layers/PersistentBufferProvider.h"
-using namespace mozilla::dom;
-
namespace mozilla::gfx {
+using dom::CanvasRenderingContext2D;
+using dom::WorkerPrivate;
+using dom::StrongWorkerRef;
+
StaticMutex CanvasShutdownManager::sManagersMutex;
MOZ_RUNINIT std::set<CanvasShutdownManager*> CanvasShutdownManager::sManagers;
@@ -26,7 +28,7 @@ MOZ_RUNINIT std::set<CanvasShutdownManager*> CanvasShutdownManager::sManagers;
MOZ_THREAD_LOCAL(CanvasShutdownManager*) CanvasShutdownManager::sLocalManager;
CanvasShutdownManager::CanvasShutdownManager(StrongWorkerRef* aWorkerRef)
- : mWorkerRef(new ThreadSafeWorkerRef(aWorkerRef)) {}
+ : mWorkerRef(new dom::ThreadSafeWorkerRef(aWorkerRef)) {}
CanvasShutdownManager::CanvasShutdownManager() = default;
CanvasShutdownManager::~CanvasShutdownManager() = default;
@@ -75,7 +77,7 @@ void CanvasShutdownManager::Destroy() {
return managerWeak;
}
- if (WorkerPrivate* worker = GetCurrentThreadWorkerPrivate()) {
+ if (WorkerPrivate* worker = dom::GetCurrentThreadWorkerPrivate()) {
// The ThreadSafeWorkerRef will let us know when the worker is shutting
// down. This will let us clear our threadlocal reference and close the
// actor. We rely upon an explicit shutdown for the main thread.
@@ -174,7 +176,7 @@ void CanvasShutdownManager::OnRemoteCanvasReset(
/* static */ void CanvasShutdownManager::OnCompositorManagerRestored() {
MOZ_ASSERT(NS_IsMainThread());
- class RestoreRunnable final : public MainThreadWorkerRunnable {
+ class RestoreRunnable final : public dom::MainThreadWorkerRunnable {
public:
RestoreRunnable()
: MainThreadWorkerRunnable("CanvasShutdownManager::RestoreRunnable") {}
diff --git a/gfx/ipc/GPUChild.h b/gfx/ipc/GPUChild.h
@@ -21,7 +21,7 @@ namespace gfx {
class GPUProcessHost;
-class GPUChild final : public ipc::CrashReporterHelper<GPUChild>,
+class GPUChild final : public mozilla::ipc::CrashReporterHelper<GPUChild>,
public PGPUChild,
public gfxVarReceiver {
typedef mozilla::dom::MemoryReportRequestHost MemoryReportRequestHost;
