From 2549497ae7d6e48cfeb26d39ed395f1819c968c6 Mon Sep 17 00:00:00 2001
From: Matt Joras <mjoras@sbcglobal.net>
Date: Thu, 25 Oct 2012 16:12:59 -0400
Subject: [PATCH] Bug 798033 - Removes "using namespace" directive from gfx
 headers - r=jmuizelaar

---
 gfx/2d/DrawTargetSkia.h                    | 3 +--
 gfx/layers/basic/BasicCanvasLayer.cpp      | 1 +
 gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp   | 2 ++
 gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp | 1 +
 gfx/layers/ipc/ShadowLayerUtilsX11.cpp     | 2 ++
 gfx/layers/ipc/ShadowLayers.cpp            | 1 +
 gfx/layers/ipc/ShadowLayers.h              | 5 ++---
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gfx/2d/DrawTargetSkia.h b/gfx/2d/DrawTargetSkia.h
index db28bc2c0c9..c1942e03155 100644
--- a/gfx/2d/DrawTargetSkia.h
+++ b/gfx/2d/DrawTargetSkia.h
@@ -11,7 +11,6 @@
 #include "PathSkia.h"
 #include <sstream>
 #include <vector>
-using namespace std;
 
 namespace mozilla {
 namespace gfx {
@@ -105,7 +104,7 @@ private:
   SkBitmap mBitmap;
   SkRefPtr<SkCanvas> mCanvas;
   SkRefPtr<SkDevice> mDevice;
-  vector<SourceSurfaceSkia*> mSnapshots;
+  std::vector<SourceSurfaceSkia*> mSnapshots;
 };
 
 }
diff --git a/gfx/layers/basic/BasicCanvasLayer.cpp b/gfx/layers/basic/BasicCanvasLayer.cpp
index d07e56807a0..6027f2f7cd7 100644
--- a/gfx/layers/basic/BasicCanvasLayer.cpp
+++ b/gfx/layers/basic/BasicCanvasLayer.cpp
@@ -14,6 +14,7 @@
 #include "nsXULAppAPI.h"
 
 using namespace mozilla::gfx;
+using namespace mozilla::gl;
 
 namespace mozilla {
 namespace layers {
diff --git a/gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp b/gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp
index 44d2919a743..d376a525f96 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsD3D10.cpp
@@ -11,6 +11,8 @@
 #include "mozilla/layers/PLayers.h"
 #include "ShadowLayers.h"
 
+using namespace mozilla::gl;
+
 namespace mozilla {
 namespace layers {
 
diff --git a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
index 8814f437735..94ee0c0dd85 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsGralloc.cpp
@@ -22,6 +22,7 @@
 using namespace android;
 using namespace base;
 using namespace mozilla::layers;
+using namespace mozilla::gl;
 
 namespace IPC {
 
diff --git a/gfx/layers/ipc/ShadowLayerUtilsX11.cpp b/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
index 1a0ca235fff..714627141b2 100644
--- a/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
+++ b/gfx/layers/ipc/ShadowLayerUtilsX11.cpp
@@ -14,6 +14,8 @@
 #include "mozilla/X11Util.h"
 #include "cairo-xlib.h"
 
+using namespace mozilla::gl;
+
 namespace mozilla {
 namespace layers {
 
diff --git a/gfx/layers/ipc/ShadowLayers.cpp b/gfx/layers/ipc/ShadowLayers.cpp
index 07e2ff57161..965c5d817ba 100644
--- a/gfx/layers/ipc/ShadowLayers.cpp
+++ b/gfx/layers/ipc/ShadowLayers.cpp
@@ -24,6 +24,7 @@
 #include "nsXULAppAPI.h"
 
 using namespace mozilla::ipc;
+using namespace mozilla::gl;
 
 namespace mozilla {
 namespace layers {
diff --git a/gfx/layers/ipc/ShadowLayers.h b/gfx/layers/ipc/ShadowLayers.h
index a46576279c7..639db59ed3b 100644
--- a/gfx/layers/ipc/ShadowLayers.h
+++ b/gfx/layers/ipc/ShadowLayers.h
@@ -23,7 +23,6 @@ namespace gl {
 class GLContext;
 class TextureImage;
 }
-using namespace gl;
 
 namespace layers {
 
@@ -416,8 +415,8 @@ public:
    * underlying surface supports direct texturing, a non-null
    * TextureImage is returned.  Otherwise null is returned.
    */
-  static already_AddRefed<TextureImage>
-  OpenDescriptorForDirectTexturing(GLContext* aContext,
+  static already_AddRefed<gl::TextureImage>
+  OpenDescriptorForDirectTexturing(gl::GLContext* aContext,
                                    const SurfaceDescriptor& aDescriptor,
                                    GLenum aWrapMode);