android/source/src/java/org/mozilla/gecko/gfx/GLController.java | 13 ---------- android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java | 4 +-- 2 files changed, 3 insertions(+), 14 deletions(-)
New commits: commit f4358578251e35f92115ece0998c132ca3b402de Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 8 17:56:34 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 9 07:55:53 2023 +0100 android: Drop unused GLController#checkForLostContext Change-Id: Ia9f313a1937d4d491b76e9e5d6e4689eeb20431b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159183 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> 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 d31d84a51da9..45600e9f1e7c 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java @@ -99,17 +99,6 @@ public class GLController { return mEGL.eglSwapBuffers(mEGLDisplay, mEGLSurface); } - public boolean checkForLostContext() { - if (mEGL.eglGetError() != EGL11.EGL_CONTEXT_LOST) { - return false; - } - - mEGLDisplay = null; - mEGLConfig = null; - mEGLContext = null; - mEGLSurface = null; - return true; - } public synchronized int getWidth() { return mWidth; } commit 46c0c489904b2037a3ce381be95998fd7f6cdefb Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 8 17:40:57 2023 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Nov 9 07:55:44 2023 +0100 android: Cast to GL10 in getter, not callers Better have a clear method signature than callers relying on implementation details. Change-Id: I4532f67aee8f8eac723401e43d3b6856ba37b346 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159182 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> 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 57ec2589b857..d31d84a51da9 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java @@ -84,7 +84,7 @@ public class GLController { } } - public GL getGL() { return mEGLContext.getGL(); } + public GL10 getGL() { return (GL10) mEGLContext.getGL(); } public EGLDisplay getEGLDisplay() { return mEGLDisplay; } public EGLConfig getEGLConfig() { return mEGLConfig; } public EGLContext getEGLContext() { return mEGLContext; } diff --git a/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java b/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java index a5b2ed79cbd3..5c74d56a004b 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java @@ -110,7 +110,7 @@ public class RenderControllerThread extends Thread implements LayerView.Listener } GLSurfaceView.Renderer renderer = getRenderer(); if (renderer != null) { - renderer.onDrawFrame((GL10) controller.getGL()); + renderer.onDrawFrame(controller.getGL()); } controller.swapBuffers(); } @@ -118,7 +118,7 @@ public class RenderControllerThread extends Thread implements LayerView.Listener private void doSizeChanged() { GLSurfaceView.Renderer renderer = getRenderer(); if (renderer != null) { - renderer.onSurfaceChanged((GL10) controller.getGL(), width, height); + renderer.onSurfaceChanged(controller.getGL(), width, height); } }
