Bug 1013292 - Fix some using namespace + unified build issues in gfx code. r=kats

gfx/gl/GLContext.cpp

@@ -43,12 +43,12 @@
 #include "nsCocoaFeatures.h"
 #endif
 
-using namespace mozilla::gfx;
-using namespace mozilla::layers;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+using namespace mozilla::layers;
+
 #ifdef DEBUG
 unsigned GLContext::sCurrentGLContextTLS = -1;
 #endif

gfx/gl/GLContextProviderCGL.mm

@@ -16,11 +16,11 @@
 #include "GeckoProfiler.h"
 #include "mozilla/gfx/MacIOSurface.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 static bool gUseDoubleBufferedWindows = true;
 
 class CGLLibrary

gfx/gl/GLContextProviderGLX.cpp

@@ -37,11 +37,11 @@
 #include "gfxPlatformGtk.h"
 #endif
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 GLXLibrary sGLXLibrary;
 
 // Check that we have at least version aMajor.aMinor .

gfx/gl/GLContextProviderWGL.cpp

@@ -17,11 +17,11 @@
 
 #include "mozilla/Preferences.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 WGLLibrary sWGLLib;
 
 HWND

gfx/gl/GLReadTexImageHelper.cpp

@@ -14,11 +14,11 @@
 #include "mozilla/gfx/2D.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 GLReadTexImageHelper::GLReadTexImageHelper(GLContext* gl)
     : mGL(gl)
 {

gfx/gl/GLScreenBuffer.cpp

@@ -22,11 +22,11 @@
 #include "ScopedGLHelpers.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 GLScreenBuffer*
 GLScreenBuffer::Create(GLContext* gl,
                      const gfx::IntSize& size,

gfx/gl/SharedSurfaceANGLE.cpp

@@ -7,11 +7,11 @@
 
 #include "GLContextEGL.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace gl {
 
+using namespace mozilla::gfx;
+
 SurfaceFactory_ANGLEShareHandle*
 SurfaceFactory_ANGLEShareHandle::Create(GLContext* gl,
                                         ID3D10Device1* d3d,

gfx/gl/SharedSurfaceGralloc.cpp

@@ -29,10 +29,11 @@
 #define DEBUG_PRINT(...) do { } while (0)
 #endif
 
-using namespace mozilla;
+namespace mozilla {
+namespace gl {
+
 using namespace mozilla::gfx;
-using namespace gl;
-using namespace layers;
+using namespace mozilla::layers;
 using namespace android;
 
 SurfaceFactory_Gralloc::SurfaceFactory_Gralloc(GLContext* prodGL,
@@ -211,3 +212,6 @@ SharedSurface_Gralloc::WaitForBufferOwnership()
 {
     mTextureClient->WaitReleaseFence();
 }
+
+}
+}

gfx/layers/CopyableCanvasLayer.cpp

@@ -24,12 +24,12 @@
 #include "nsSize.h"                     // for nsIntSize
 #include "gfxUtils.h"
 
-using namespace mozilla::gfx;
-using namespace mozilla::gl;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+using namespace mozilla::gl;
+
 CopyableCanvasLayer::CopyableCanvasLayer(LayerManager* aLayerManager, void *aImplData) :
   CanvasLayer(aLayerManager, aImplData)
   , mStream(nullptr)

gfx/layers/ImageContainer.cpp

@@ -36,14 +36,12 @@
 #include "D3D9SurfaceImage.h"
 #endif
 
-using namespace mozilla::ipc;
-using namespace android;
-using namespace mozilla::gfx;
-
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::ipc;
+using namespace android;
+using namespace mozilla::gfx;
 
 Atomic<int32_t> Image::sSerialCounter(0);
 

gfx/layers/LayerSorter.cpp

@@ -23,11 +23,11 @@
 #include "limits.h"
 #include "mozilla/Assertions.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 enum LayerSortOrder {
   Undefined,
   ABeforeB,

gfx/layers/Layers.cpp

@@ -33,22 +33,21 @@
 #include "nsStyleStruct.h"              // for nsTimingFunction, etc
 #include "gfxPrefs.h"
 
-using namespace mozilla::layers;
-using namespace mozilla::gfx;
-
-typedef FrameMetrics::ViewID ViewID;
-const ViewID FrameMetrics::NULL_SCROLL_ID = 0;
-
 uint8_t gLayerManagerLayerBuilder;
 
+namespace mozilla {
+namespace layers {
+
 FILE*
 FILEOrDefault(FILE* aFile)
 {
   return aFile ? aFile : stderr;
 }
 
-namespace mozilla {
-namespace layers {
+typedef FrameMetrics::ViewID ViewID;
+const ViewID FrameMetrics::NULL_SCROLL_ID = 0;
+
+using namespace mozilla::gfx;
 
 //--------------------------------------------------
 // LayerManager
@@ -1347,7 +1346,7 @@ Layer::PrintInfo(nsACString& aTo, const char* aPrefix)
   aTo += aPrefix;
   aTo += nsPrintfCString("%s%s (0x%p)", mManager->Name(), Name(), this);
 
-  ::PrintInfo(aTo, AsLayerComposite());
+  layers::PrintInfo(aTo, AsLayerComposite());
 
   if (mUseClipRect) {
     AppendToString(aTo, mClipRect, " [clip=", "]");

gfx/layers/apz/src/AsyncPanZoomController.cpp

@@ -126,11 +126,11 @@ WidgetModifiersToDOMModifiers(mozilla::Modifiers aModifiers)
 
 }
 
-using namespace mozilla::css;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::css;
+
 typedef mozilla::layers::AllowedTouchBehavior AllowedTouchBehavior;
 typedef GeckoContentController::APZStateChange APZStateChange;
 

gfx/layers/basic/BasicLayerManager.cpp

@@ -51,12 +51,11 @@
 
 class nsIWidget;
 
-using namespace mozilla::dom;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 /**
  * Clips to the smallest device-pixel-aligned rectangle containing aRect
  * in user space.

gfx/layers/basic/BasicLayersImpl.cpp

@@ -13,11 +13,11 @@
 #include "mozilla/layers/ISurfaceAllocator.h"
 #include "AutoMaskData.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 bool
 GetMaskData(Layer* aMaskLayer,
             const Point& aDeviceOffset,

gfx/layers/basic/BasicThebesLayer.cpp

@@ -28,11 +28,11 @@
 #include "AutoMaskData.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 static nsIntRegion
 IntersectWithClip(const nsIntRegion& aRegion, gfxContext* aContext)
 {

gfx/layers/basic/X11TextureSourceBasic.cpp

@@ -8,8 +8,9 @@
 #include "gfxXlibSurface.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla;
-using namespace mozilla::layers;
+namespace mozilla {
+namespace layers {
+
 using namespace mozilla::gfx;
 
 X11TextureSourceBasic::X11TextureSourceBasic(BasicCompositor* aCompositor, gfxXlibSurface* aSurface)
@@ -67,3 +68,6 @@ X11TextureSourceBasic::ContentTypeToSurfaceFormat(gfxContentType aType)
       return SurfaceFormat::UNKNOWN;
   }
 }
+
+}
+}

gfx/layers/client/ClientColorLayer.cpp

@@ -13,11 +13,11 @@
 #include "nsISupportsImpl.h"            // for Layer::AddRef, etc
 #include "nsRegion.h"                   // for nsIntRegion
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 class ClientColorLayer : public ColorLayer, 
                          public ClientLayer {
 public:

gfx/layers/client/ClientImageLayer.cpp

@@ -18,11 +18,11 @@
 #include "nsISupportsImpl.h"            // for Layer::AddRef, etc
 #include "nsRegion.h"                   // for nsIntRegion
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 class ClientImageLayer : public ImageLayer, 
                          public ClientLayer {
 public:

gfx/layers/client/ClientLayerManager.cpp

@@ -32,12 +32,11 @@
 #include "AndroidBridge.h"
 #endif
 
-using namespace mozilla::dom;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 ClientLayerManager::ClientLayerManager(nsIWidget* aWidget)
   : mPhase(PHASE_NONE)
   , mWidget(aWidget)
@@ -131,8 +130,8 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
   // If the last transaction was incomplete (a failed DoEmptyTransaction),
   // don't signal a new transaction to ShadowLayerForwarder. Carry on adding
   // to the previous transaction.
-  ScreenOrientation orientation;
-  if (TabChild* window = mWidget->GetOwningTabChild()) {
+  dom::ScreenOrientation orientation;
+  if (dom::TabChild* window = mWidget->GetOwningTabChild()) {
     orientation = window->GetOrientation();
   } else {
     hal::ScreenConfiguration currentConfig;
@@ -150,7 +149,7 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
   // a chance to repaint, so we have to ensure that it's all valid
   // and not rotated.
   if (mWidget) {
-    if (TabChild* window = mWidget->GetOwningTabChild()) {
+    if (dom::TabChild* window = mWidget->GetOwningTabChild()) {
       mCompositorMightResample = window->IsAsyncPanZoomEnabled();
     }
   }

gfx/layers/client/ClientThebesLayer.cpp

@@ -25,11 +25,11 @@
 #include "nsRect.h"                     // for nsIntRect
 #include "gfx2DGlue.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 void
 ClientThebesLayer::PaintThebes()
 {

gfx/layers/client/CompositableClient.cpp

@@ -18,11 +18,11 @@
 #include "mozilla/layers/TextureD3D9.h"
 #endif
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 /**
  * IPDL actor used by CompositableClient to match with its corresponding
  * CompositableHost on the compositor side.

gfx/layers/client/ImageClient.cpp

@@ -36,11 +36,11 @@
 #include "GrallocImages.h"
 #endif
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 /**
  * Handle RemoveTextureFromCompositableAsync() transaction.
  */

gfx/layers/client/SimpleTiledContentClient.cpp

@@ -32,11 +32,11 @@
 
 #define ALOG(...)  __android_log_print(ANDROID_LOG_INFO, "SimpleTiles", __VA_ARGS__)
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 void
 SimpleTiledLayerBuffer::PaintThebes(const nsIntRegion& aNewValidRegion,
                                     const nsIntRegion& aPaintRegion,

gfx/layers/client/TextureClient.cpp

@@ -58,12 +58,13 @@
 #define RECYCLE_LOG(...) do { } while (0)
 #endif
 
-using namespace mozilla::gl;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::ipc;
+using namespace mozilla::gl;
+using namespace mozilla::gfx;
+
 /**
  * TextureChild is the content-side incarnation of the PTexture IPDL actor.
  *
@@ -439,7 +440,7 @@ bool
 ShmemTextureClient::Allocate(uint32_t aSize)
 {
   MOZ_ASSERT(mValid);
-  ipc::SharedMemory::SharedMemoryType memType = OptimalShmemType();
+  SharedMemory::SharedMemoryType memType = OptimalShmemType();
   mAllocated = GetAllocator()->AllocUnsafeShmem(aSize, memType, &mShmem);
   return mAllocated;
 }

gfx/layers/composite/AsyncCompositionManager.cpp

@@ -41,19 +41,18 @@
 
 struct nsCSSValueSharedList;
 
-using namespace mozilla::dom;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 enum Op { Resolve, Detach };
 
 static bool
-IsSameDimension(ScreenOrientation o1, ScreenOrientation o2)
+IsSameDimension(dom::ScreenOrientation o1, dom::ScreenOrientation o2)
 {
-  bool isO1portrait = (o1 == eScreenOrientation_PortraitPrimary || o1 == eScreenOrientation_PortraitSecondary);
-  bool isO2portrait = (o2 == eScreenOrientation_PortraitPrimary || o2 == eScreenOrientation_PortraitSecondary);
+  bool isO1portrait = (o1 == dom::eScreenOrientation_PortraitPrimary || o1 == dom::eScreenOrientation_PortraitSecondary);
+  bool isO2portrait = (o2 == dom::eScreenOrientation_PortraitPrimary || o2 == dom::eScreenOrientation_PortraitSecondary);
   return !(isO1portrait ^ isO2portrait);
 }
 
@@ -73,8 +72,8 @@ WalkTheTree(Layer* aLayer,
     if (const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(ref->GetReferentId())) {
       if (Layer* referent = state->mRoot) {
         if (!ref->GetVisibleRegion().IsEmpty()) {
-          ScreenOrientation chromeOrientation = aTargetConfig.orientation();
-          ScreenOrientation contentOrientation = state->mTargetConfig.orientation();
+          dom::ScreenOrientation chromeOrientation = aTargetConfig.orientation();
+          dom::ScreenOrientation contentOrientation = state->mTargetConfig.orientation();
           if (!IsSameDimension(chromeOrientation, contentOrientation) &&
               ContentMightReflowOnOrientationChange(aTargetConfig.clientBounds())) {
             aReady = false;

gfx/layers/composite/CanvasLayerComposite.cpp

@@ -20,8 +20,9 @@
 #include "nsPoint.h"                    // for nsIntPoint
 #include "nsString.h"                   // for nsAutoCString
 
-using namespace mozilla;
-using namespace mozilla::layers;
+namespace mozilla {
+namespace layers {
+
 using namespace mozilla::gfx;
 
 CanvasLayerComposite::CanvasLayerComposite(LayerManagerComposite* aManager)
@@ -144,3 +145,5 @@ CanvasLayerComposite::PrintInfo(nsACString& aTo, const char* aPrefix)
   return aTo;
 }
 
+}
+}

gfx/layers/composite/ImageLayerComposite.cpp

@@ -25,11 +25,11 @@
 #include "nsRect.h"                     // for nsIntRect
 #include "nsString.h"                   // for nsAutoCString
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 ImageLayerComposite::ImageLayerComposite(LayerManagerComposite* aManager)
   : ImageLayer(aManager, nullptr)
   , LayerComposite(aManager)

gfx/layers/composite/X11TextureHost.cpp

@@ -13,8 +13,9 @@
 #include "gfxXlibSurface.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla;
-using namespace mozilla::layers;
+namespace mozilla {
+namespace layers {
+
 using namespace mozilla::gfx;
 
 X11TextureHost::X11TextureHost(TextureFlags aFlags,
@@ -84,3 +85,6 @@ X11TextureHost::GetSize() const
 {
   return ToIntSize(mSurface->GetSize());
 }
+
+}
+}

gfx/layers/d3d10/CanvasLayerD3D10.cpp

@@ -15,12 +15,12 @@
 #include "GLContext.h"
 #include "gfxPrefs.h"
 
-using namespace mozilla::gl;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gl;
+using namespace mozilla::gfx;
+
 CanvasLayerD3D10::CanvasLayerD3D10(LayerManagerD3D10 *aManager)
   : CanvasLayer(aManager, nullptr)
   , LayerD3D10(aManager)

gfx/layers/d3d10/ImageLayerD3D10.cpp

@@ -14,11 +14,11 @@
 
 #include "gfxWindowsPlatform.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 static already_AddRefed<ID3D10Texture2D>
 DataToTexture(ID3D10Device *aDevice,
               unsigned char *data,

gfx/layers/d3d10/LayerManagerD3D10.cpp

@@ -31,13 +31,12 @@
 #include "DXGI1_2.h"
 #endif
 
-using namespace std;
-using namespace mozilla::dom;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace std;
+using namespace mozilla::gfx;
+
 struct Vertex
 {
     float position[2];

gfx/layers/d3d10/ThebesLayerD3D10.cpp

@@ -26,11 +26,11 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/gfx/2D.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 ThebesLayerD3D10::ThebesLayerD3D10(LayerManagerD3D10 *aManager)
   : ThebesLayer(aManager, nullptr)
   , LayerD3D10(aManager)

gfx/layers/d3d9/CompositorD3D9.cpp

@@ -17,11 +17,11 @@
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "gfxPrefs.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 CompositorD3D9::CompositorD3D9(PCompositorParent* aParent, nsIWidget *aWidget)
   : Compositor(aParent)
   , mWidget(aWidget)

gfx/layers/d3d9/DeviceManagerD3D9.cpp

@@ -18,11 +18,11 @@
 #include "TextureD3D9.h"
 #include "mozilla/gfx/Point.h"
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 const LPCWSTR kClassName       = L"D3D9WindowClass";
 
 #define USE_D3D9EX

gfx/layers/ipc/CompositorParent.cpp

@@ -54,15 +54,14 @@
 #include "mozilla/Hal.h"
 #include "mozilla/HalTypes.h"
 
+namespace mozilla {
+namespace layers {
+
 using namespace base;
-using namespace mozilla;
 using namespace mozilla::ipc;
 using namespace mozilla::gfx;
 using namespace std;
 
-namespace mozilla {
-namespace layers {
-
 CompositorParent::LayerTreeState::LayerTreeState()
   : mParent(nullptr)
   , mLayerManager(nullptr)

gfx/layers/ipc/ImageBridgeChild.cpp

@@ -41,11 +41,6 @@
 
 struct nsIntRect;
 
-using base::Thread;
-using base::ProcessHandle;
-using namespace mozilla::ipc;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace ipc {
 class Shmem;
@@ -53,6 +48,11 @@ class Shmem;
 
 namespace layers {
 
+using base::Thread;
+using base::ProcessHandle;
+using namespace mozilla::ipc;
+using namespace mozilla::gfx;
+
 typedef std::vector<CompositableOperation> OpVector;
 
 struct CompositableTransaction

gfx/layers/ipc/ImageBridgeParent.cpp

@@ -35,12 +35,12 @@
 #include "mozilla/layers/TextureHost.h"
 #include "nsThreadUtils.h"
 
-using namespace mozilla::ipc;
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::ipc;
+using namespace mozilla::gfx;
+
 ImageBridgeParent::ImageBridgeParent(MessageLoop* aLoop, Transport* aTransport)
   : mMessageLoop(aLoop)
   , mTransport(aTransport)

gfx/layers/ipc/ShadowLayers.cpp

@@ -36,10 +36,6 @@
 
 struct nsIntPoint;
 
-using namespace mozilla::ipc;
-using namespace mozilla::gl;
-using namespace mozilla::dom;
-
 namespace mozilla {
 namespace ipc {
 class Shmem;
@@ -47,6 +43,9 @@ class Shmem;
 
 namespace layers {
 
+using namespace mozilla::ipc;
+using namespace mozilla::gl;
+
 class ClientTiledLayerBuffer;
 
 typedef nsTArray<SurfaceDescriptor> BufferArray;
@@ -64,7 +63,7 @@ public:
   {}
 
   void Begin(const nsIntRect& aTargetBounds, ScreenRotation aRotation,
-             const nsIntRect& aClientBounds, ScreenOrientation aOrientation)
+             const nsIntRect& aClientBounds, dom::ScreenOrientation aOrientation)
   {
     mOpen = true;
     mTargetBounds = aTargetBounds;
@@ -142,7 +141,7 @@ public:
   nsIntRect mTargetBounds;
   ScreenRotation mTargetRotation;
   nsIntRect mClientBounds;
-  ScreenOrientation mTargetOrientation;
+  dom::ScreenOrientation mTargetOrientation;
   bool mSwapRequired;
 
 private:
@@ -187,7 +186,7 @@ void
 ShadowLayerForwarder::BeginTransaction(const nsIntRect& aTargetBounds,
                                        ScreenRotation aRotation,
                                        const nsIntRect& aClientBounds,
-                                       ScreenOrientation aOrientation)
+                                       dom::ScreenOrientation aOrientation)
 {
   NS_ABORT_IF_FALSE(HasShadowManager(), "no manager to forward to");
   NS_ABORT_IF_FALSE(mTxn->Finished(), "uncommitted txn?");

gfx/layers/ipc/SharedBufferManagerChild.cpp

@@ -22,11 +22,11 @@
 #define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "SBMChild", ## args)
 #endif
 
-using namespace mozilla::gfx;
-
 namespace mozilla {
 namespace layers {
 
+using namespace mozilla::gfx;
+
 // Singleton
 SharedBufferManagerChild* SharedBufferManagerChild::sSharedBufferManagerChildSingleton = nullptr;
 SharedBufferManagerParent* SharedBufferManagerChild::sSharedBufferManagerParentSingleton = nullptr;

gfx/layers/opengl/CompositingRenderTargetOGL.cpp

@@ -8,10 +8,11 @@
 #include "GLReadTexImageHelper.h"
 #include "mozilla/gfx/2D.h"
 
-using namespace mozilla;
+namespace mozilla {
+namespace layers {
+
 using namespace mozilla::gfx;
 using namespace mozilla::gl;
-using namespace mozilla::layers;
 
 CompositingRenderTargetOGL::~CompositingRenderTargetOGL()
 {
@@ -100,3 +101,6 @@ CompositingRenderTargetOGL::InitializeImpl()
 
   mInitParams.mStatus = InitParams::INITIALIZED;
 }
+
+}
+}

gfx/layers/opengl/X11TextureSourceOGL.cpp

@@ -10,8 +10,9 @@
 #include "gfxXlibSurface.h"
 #include "gfx2DGlue.h"
 
-using namespace mozilla;
-using namespace mozilla::layers;
+namespace mozilla {
+namespace layers {
+
 using namespace mozilla::gfx;
 
 X11TextureSourceOGL::X11TextureSourceOGL(CompositorOGL* aCompositor, gfxXlibSurface* aSurface)
@@ -102,3 +103,6 @@ X11TextureSourceOGL::ContentTypeToSurfaceFormat(gfxContentType aType)
 }
 
 #endif
+
+}
+}