android/source/src/java/org/mozilla/gecko/gfx/GLController.java |
27 ----------
android/source/src/java/org/mozilla/gecko/gfx/LayerView.java |
1
android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java |
5 -
3 files changed, 33 deletions(-)
New commits:
commit 32423989263e17b8fdd1b8952180e025c50ed1bd
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Nov 8 15:10:19 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 9 07:54:01 2023 +0100
android: Drop unused GLController#resumeCompositorIfValid etc.
The comment claiming that this function is invoked
by JNI was true when the method was added upstream
in Fennec/Gecko in commit [1]
commit ae9420729da323d02a3f2f02d5a4b3043a619007
Author: Kartikaya Gupta <kgu...@mozilla.com>
Date: Fri Jul 13 10:19:46 2012 -0400
Bug 769269 - Update the graphics code to be able to deal with
blowing away the layer controller, client, and view and creating them afresh.
r=ajuma
, but it's not true for the copy here in
Android Viewer, so drop the unused method
and `RenderControllerThread#compositionResumeRequested`
that would only have been called from there and wouldn't
have done anything anyway.
[1]
https://github.com/mozilla/gecko-dev/commit/ae9420729da323d02a3f2f02d5a4b3043a619007
Change-Id: I54dd33a2ce30ebdc375a7c1fefacca6e99d2f571
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159159
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 533980979683..76af0e78fc4d 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java
@@ -117,13 +117,6 @@ public class GLController {
return true;
}
- // This function is invoked by JNI
- public synchronized void resumeCompositorIfValid() {
- if (mSurfaceValid) {
- mView.getListener().compositionResumeRequested(mWidth, mHeight);
- }
- }
-
// Wait until we are allowed to use EGL functions on the Surface backing
// this window. This function is invoked by JNI
public synchronized void waitForValidSurface() {
diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
index c3f639ddf7d1..955bcde316f9 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -304,7 +304,6 @@ public class LayerView extends FrameLayout {
void compositorCreated();
void renderRequested();
void compositionPauseRequested();
- void compositionResumeRequested(int width, int height);
void surfaceChanged(int width, int height);
}
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 06f82f158366..a5b2ed79cbd3 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/RenderControllerThread.java
@@ -81,11 +81,6 @@ public class RenderControllerThread extends Thread
implements LayerView.Listener
queue.add(RenderCommand.SURFACE_DESTROYED);
}
- @Override
- public void compositionResumeRequested(int width, int height) {
-
- }
-
@Override
public void surfaceChanged(int width, int height) {
this.width = width;
commit 9032551306bfac623984bed0031cbd6b8bfe54fb
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Nov 8 14:11:54 2023 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Thu Nov 9 07:53:52 2023 +0100
android: Drop unused GLController#provideEGLSurface
It was already unused when added in
commit a6ecd8b2a9f0f3eaa66388861a6dcc6260ec72b9
Date: Thu Jun 26 11:22:21 2014 +0200
LOAndroid3: ant/make for building, Bootstrap project
The method looks similar to the first half of
`GLController#provideEGLSurface` and is unused,
so drop it.
Change-Id: I0cabfddefcdcca97048cb6f494590afdde5c1dc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159158
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 e296f4760f68..533980979683 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/GLController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/GLController.java
@@ -240,26 +240,6 @@ public class GLController {
}
}
- /**
- * Provides an EGLSurface without assuming ownership of this surface.
- * This class does not keep a reference to the provided EGL surface; the
- * caller assumes ownership of the surface once it is returned.
- */
- private EGLSurface provideEGLSurface() {
- if (mEGL == null) {
- initEGL();
- }
-
- Object window = mView.getNativeWindow();
- EGLSurface surface = mEGL.eglCreateWindowSurface(mEGLDisplay,
mEGLConfig, window, null);
- if (surface == null || surface == EGL10.EGL_NO_SURFACE) {
- throw new GLControllerException("EGL window surface could not be
created! " +
- getEGLError());
- }
-
- return surface;
- }
-
private String getEGLError() {
return "Error " + mEGL.eglGetError();
}
