Bug 1084514 - Fix AndroidSourceTexture namespace issues. r=dholbert CLOSED TREE
☠☠ backed out by 3f27d263d0f7 ☠ ☠
authorRalph Giles <giles@mozilla.com>
Fri, 17 Oct 2014 11:31:00 -0700
changeset 211080 869a28961b5c2572a18f730fdf4d659cf45d9bf6
parent 211079 db1ee8cf5a8c30c04d7114a784e4c95b5ec3de57
child 211081 5aea4fbbb47d318e23daf4a2e37bd0468a13c3dc
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersdholbert
bugs1084514
milestone36.0a1
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
gfx/gl/GLBlitHelper.cpp
--- a/gfx/gl/AndroidSurfaceTexture.cpp
+++ b/gfx/gl/AndroidSurfaceTexture.cpp
@@ -13,16 +13,17 @@
 #include "gfxImageSurface.h"
 #include "AndroidBridge.h"
 #include "nsThreadUtils.h"
 #include "mozilla/gfx/Matrix.h"
 #include "GeneratedJNIWrappers.h"
 #include "GLContext.h"
 
 using namespace mozilla;
+using namespace mozilla::gl;
 using namespace mozilla::widget::android;
 
 // UGH
 static std::map<int, AndroidSurfaceTexture*> sInstances;
 static int sNextID = 0;
 
 static bool
 IsDetachSupported()
--- a/gfx/gl/GLBlitHelper.cpp
+++ b/gfx/gl/GLBlitHelper.cpp
@@ -1,15 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* vim: set ts=8 sts=4 et sw=4 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * 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"
 #include "ImageContainer.h"
 #include "HeapCopyOfStackArray.h"
 #include "mozilla/gfx/Matrix.h"
 
 #ifdef MOZ_WIDGET_GONK
@@ -733,17 +734,17 @@ GLBlitHelper::BlitSurfaceTextureImage(la
 
     // UpdateTexImage() changes the EXTERNAL binding, so save it here
     // so we can restore it after.
     int oldBinding = 0;
     mGL->fGetIntegerv(LOCAL_GL_TEXTURE_BINDING_EXTERNAL, &oldBinding);
 
     surfaceTexture->UpdateTexImage();
 
-    Matrix4x4 transform;
+    gfx::Matrix4x4 transform;
     surfaceTexture->GetTransformMatrix(transform);
 
     mGL->fUniformMatrix4fv(mTextureTransformLoc, 1, false, &transform._11);
     mGL->fUniform1f(mYFlipLoc, yFlip ? 1.0f : 0.0f);
     mGL->fDrawArrays(LOCAL_GL_TRIANGLE_STRIP, 0, 4);
 
     surfaceTexture->Detach();