From 15decb515e5e74a3ab214ab813e1d5d3507d3b8b Mon Sep 17 00:00:00 2001
From: Benoit Jacob <bjacob@mozilla.com>
Date: Mon, 15 Oct 2012 13:34:42 -0400
Subject: [PATCH] back out 621cfd13ceaf for build failures

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

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