android/source/src/java/org/mozilla/gecko/gfx/GLController.java | 18 +++------- android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 9 ++--- 2 files changed, 10 insertions(+), 17 deletions(-)
New commits: commit b6e5a8d60b8c63983000b41711941dc1c5b38102 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Nov 8 17:37:06 2023 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Nov 9 07:55:32 2023 +0100 android: Use local var instead of 'mGL' member It's never used except where it's also previously assigned, so use a local variable instead. Even the getter `GLController#getGL` gets it from the EGLContext instead of using the member. Change-Id: Icec909f6e3e508a16fb455e81474bb336dc09362 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159181 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java index 2c503ab8b302..57ec2589b857 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java @@ -28,8 +28,6 @@ public class GLController { private EGLContext mEGLContext; private EGLSurface mEGLSurface; - private GL mGL; - private static final int LOCAL_EGL_OPENGL_ES2_BIT = 4; private static final int[] CONFIG_SPEC = { @@ -82,7 +80,6 @@ public class GLController { getEGLError()); } - mGL = null; mEGLContext = null; } } @@ -111,7 +108,6 @@ public class GLController { mEGLConfig = null; mEGLContext = null; mEGLSurface = null; - mGL = null; return true; } public synchronized int getWidth() { @@ -159,11 +155,10 @@ public class GLController { getEGLError()); } - mGL = mEGLContext.getGL(); - if (mView.getRenderer() != null) { - mView.getRenderer().onSurfaceCreated((GL10)mGL, mEGLConfig); - mView.getRenderer().onSurfaceChanged((GL10)mGL, mWidth, mHeight); + GL10 gl = (GL10) mEGLContext.getGL(); + mView.getRenderer().onSurfaceCreated(gl, mEGLConfig); + mView.getRenderer().onSurfaceChanged(gl, mWidth, mHeight); } } @@ -208,11 +203,10 @@ public class GLController { "surface! " + getEGLError()); } - mGL = mEGLContext.getGL(); - if (mView.getRenderer() != null) { - mView.getRenderer().onSurfaceCreated((GL10)mGL, mEGLConfig); - mView.getRenderer().onSurfaceChanged((GL10)mGL, mView.getWidth(), mView.getHeight()); + GL10 gl = (GL10) mEGLContext.getGL(); + mView.getRenderer().onSurfaceCreated(gl, mEGLConfig); + mView.getRenderer().onSurfaceChanged(gl, mView.getWidth(), mView.getHeight()); } } commit e4a56c1996aeba2b7a8b022833198f2a6086eb17 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Nov 8 17:24:38 2023 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Nov 9 07:55:18 2023 +0100 android: Use local var instead of class member It's only used in this one place. Change-Id: Ia11ebc2ea60c4015698ac00bbec6711a20c0a22e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159168 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java index 875b3fddd756..792cb0422eb2 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -48,7 +48,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { private FloatBuffer mCoordBuffer; private RenderContext mLastPageContext; private int mMaxTextureSize; - private int mBackgroundColor; private CopyOnWriteArrayList<Layer> mExtraLayers = new CopyOnWriteArrayList<Layer>(); @@ -384,14 +383,14 @@ public class LayerRenderer implements GLSurfaceView.Renderer { GLES20.glDisable(GLES20.GL_SCISSOR_TEST); /* Update background color. */ - mBackgroundColor = Color.WHITE; + final int backgroundColor = Color.WHITE; /* Clear to the page background colour. The bits set here need to * match up with those used in gfx/layers/opengl/LayerManagerOGL.cpp. */ - GLES20.glClearColor(((mBackgroundColor>>16)&0xFF) / 255.0f, - ((mBackgroundColor>>8)&0xFF) / 255.0f, - (mBackgroundColor&0xFF) / 255.0f, + GLES20.glClearColor(((backgroundColor >> 16) & 0xFF) / 255.0f, + ((backgroundColor >> 8) & 0xFF) / 255.0f, + (backgroundColor & 0xFF) / 255.0f, 0.0f); GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT | GLES20.GL_DEPTH_BUFFER_BIT);