corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 730898. Merge LayerView and GLSurfaceView. r=pcwalton

Browse Source 
Once, GLThread is gone we don't have any need to support both styles of GL
rendering. Merging LayerView and FlexibleGLSurfaceView makes it clearer what's
going on, and I expect we'll also be able to take out some dead code from the
resulting LayerView.

This patch is mostly uninteresting. The interesting bits are that
implementations of requestRender and the constructors are merged. Everything
else is mostly copying over methods and renaming FlexibleGLSurfaceView's
mController to mGLController.
This commit is contained in:
Jeff Muizelaar
2012-03-30 14:21:59 -04:00
parent a13fbd2484
commit 966117f7f3
10 changed files with 105 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/gfx/GLController.java
View File

@@ -53,7 +53,7 @@ public class GLController {
private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
private static final String LOGTAG = "GeckoGLController";
private FlexibleGLSurfaceView mView;
private LayerView mView;
private int mGLVersion;
private boolean mSurfaceValid;
private int mWidth, mHeight;
@@ -77,7 +77,7 @@ public class GLController {
EGL10.EGL_NONE
};
public GLController(FlexibleGLSurfaceView view) {
public GLController(LayerView view) {
mView = view;
mGLVersion = 2;
mSurfaceValid = false;
@@ -92,7 +92,7 @@ public class GLController {
public EGLConfig getEGLConfig() { return mEGLConfig; }
public EGLContext getEGLContext() { return mEGLContext; }
public EGLSurface getEGLSurface() { return mEGLSurface; }
public FlexibleGLSurfaceView getView() { return mView; }
public LayerView getView() { return mView; }
public boolean hasSurface() {
return mEGLSurface != null;