From 9dbc70f9ac16580ec099ded13e7d193618486b8b Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Fri, 17 Oct 2014 11:31:00 -0700 Subject: [PATCH] Bug 1084514 - Fix AndroidSourceTexture namespace issues. r=dholbert CLOSED TREE This worked in the unified build because it borrowed includes and namespace references from other files. --- gfx/gl/AndroidSurfaceTexture.cpp | 1 + gfx/gl/GLBlitHelper.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gfx/gl/AndroidSurfaceTexture.cpp b/gfx/gl/AndroidSurfaceTexture.cpp index 130657532ee4..5334e15d490f 100644 --- a/gfx/gl/AndroidSurfaceTexture.cpp +++ b/gfx/gl/AndroidSurfaceTexture.cpp @@ -18,6 +18,7 @@ #include "GLContext.h" using namespace mozilla; +using namespace mozilla::gl; using namespace mozilla::widget::android; // UGH diff --git a/gfx/gl/GLBlitHelper.cpp b/gfx/gl/GLBlitHelper.cpp index ff85b783f197..fe865dccad79 100644 --- a/gfx/gl/GLBlitHelper.cpp +++ b/gfx/gl/GLBlitHelper.cpp @@ -5,6 +5,7 @@ * 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" @@ -738,7 +739,7 @@ GLBlitHelper::BlitSurfaceTextureImage(layers::SurfaceTextureImage* stImage) surfaceTexture->UpdateTexImage(); - Matrix4x4 transform; + gfx::Matrix4x4 transform; surfaceTexture->GetTransformMatrix(transform); mGL->fUniformMatrix4fv(mTextureTransformLoc, 1, false, &transform._11);