android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
New commits: commit 120e76b45b3ded439f8be0e6dc4d1e306b231e30 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 8 17:11:49 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 9 07:54:53 2023 +0100 android: Inline LayerRenderer#createFrame No need for an extra method just to call the ctor, and which is only used once. Change-Id: Ide909ad81c78dc822a721771ee068e0240750089 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159165 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> 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 d7c2e7506548..b9d27291f1b3 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -223,7 +223,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer { */ @Override public void onDrawFrame(GL10 gl) { - Frame frame = createFrame(mView.getLayerClient().getViewportMetrics()); + Frame frame = new Frame(mView.getLayerClient().getViewportMetrics()); synchronized (mView.getLayerClient()) { frame.beginDrawing(); frame.drawBackground(); @@ -267,10 +267,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { return shader; } - public Frame createFrame(ImmutableViewportMetrics metrics) { - return new Frame(metrics); - } - class FadeRunnable implements Runnable { private boolean mStarted; private long mRunAt; commit 8b3f0a66b4bf40eedc8c8a601b625c050388a29b Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 8 15:45:46 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 9 07:54:44 2023 +0100 android: Add "@Override" ... to make clear that these are overriden methods from the `GLSurfaceView.Renderer` interface. Change-Id: I7ffc47ee8a7ca4b481f7d28c0a5084c89d9c7ae8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159164 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> 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 b4834d081583..d7c2e7506548 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -146,6 +146,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer { mVertScrollLayer.destroy(); } + @Override public void onSurfaceCreated(GL10 gl, EGLConfig config) { createDefaultProgram(); activateDefaultProgram(); @@ -220,6 +221,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer { /** * Called whenever a new frame is about to be drawn. */ + @Override public void onDrawFrame(GL10 gl) { Frame frame = createFrame(mView.getLayerClient().getViewportMetrics()); synchronized (mView.getLayerClient()) { @@ -249,6 +251,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer { mCoordBuffer); } + @Override public void onSurfaceChanged(GL10 gl, final int width, final int height) { GLES20.glViewport(0, 0, width, height); }
