Backed out changeset 869a28961b5c (bug 1084514)

gfx/gl/AndroidSurfaceTexture.cpp

@@ -18,7 +18,6 @@
 #include "GLContext.h"
 
 using namespace mozilla;
-using namespace mozilla::gl;
 using namespace mozilla::widget::android;
 
 // UGH

gfx/gl/GLBlitHelper.cpp

@@ -5,7 +5,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GLBlitHelper.h"
-#include "AndroidSurfaceTexture.h"
 #include "GLContext.h"
 #include "ScopedGLHelpers.h"
 #include "mozilla/Preferences.h"
@@ -739,7 +738,7 @@ GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage)
 
     surfaceTexture->UpdateTexImage();
 
-    gfx::Matrix4x4 transform;
+    Matrix4x4 transform;
     surfaceTexture->GetTransformMatrix(transform);
 
     mGL->fUniformMatrix4fv(mTextureTransformLoc, 1, false, &transform._11);