Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1116473 - [3.2] Use RefPtr for AndroidSurfaceTexture references. r=snorp

Browse Source
This commit is contained in:
Eugen Sawin 2016-02-23 20:40:20 +01:00
parent d5f668aef8
commit 9f4a3136f9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/layers/GLImages.h
View File

@ -6,6 +6,7 @@
#ifndef GFX_GLIMAGES_H
#define GFX_GLIMAGES_H
#include "AndroidSurfaceTexture.h"
#include "GLContextTypes.h"
#include "GLTypes.h"
#include "ImageContainer.h" // for Image
@ -14,9 +15,6 @@
#include "mozilla/gfx/Point.h" // for IntSize
namespace mozilla {
namespace gl {
class AndroidSurfaceTexture;
} // namespace gl
namespace layers {
class GLImage : public Image {
@ -79,7 +77,7 @@ public:
}
private:
gl::AndroidSurfaceTexture* mSurfaceTexture;
RefPtr<gl::AndroidSurfaceTexture> mSurfaceTexture;
gfx::IntSize mSize;
gl::OriginPos mOriginPos;
};

4
gfx/layers/opengl/TextureHostOGL.h
View File

@ -374,7 +374,7 @@ public:
protected:
RefPtr<CompositorOGL> mCompositor;
mozilla::gl::AndroidSurfaceTexture* const mSurfTex;
RefPtr<gl::AndroidSurfaceTexture> const mSurfTex;
const gfx::SurfaceFormat mFormat;
const GLenum mTextureTarget;
const GLenum mWrapMode;
@ -419,7 +419,7 @@ public:
virtual const char* Name() { return "SurfaceTextureHost"; }
protected:
mozilla::gl::AndroidSurfaceTexture* const mSurfTex;
RefPtr<gl::AndroidSurfaceTexture> const mSurfTex;
const gfx::IntSize mSize;
RefPtr<CompositorOGL> mCompositor;
RefPtr<SurfaceTextureSource> mTextureSource;