android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java | 4 -- android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 15 ---------- 2 files changed, 1 insertion(+), 18 deletions(-)
New commits: commit ae61af836428c3ccb5606e2697ce8eab19ac9860 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Nov 8 15:36:48 2023 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Nov 9 07:54:34 2023 +0100 android: Drop misleading comments wrt methods invoked via JNI These methods are not invoked via JNI for LibreOffice Viewer. It might have been true for Fennec/Gecko, but isn't here, so drop the misleading comments. Change-Id: Ib3187b129f076f42706b3097f9535a7cca7ad55f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159163 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 b1aea3616d6c..b4834d081583 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerRenderer.java @@ -348,7 +348,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { return pageRect; } - /** This function is invoked via JNI; be careful when modifying signature. */ public void beginDrawing() { mFrameStartTime = SystemClock.uptimeMillis(); @@ -425,7 +424,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { return mask; } - /** This function is invoked via JNI; be careful when modifying signature. */ public void drawBackground() { GLES20.glDisable(GLES20.GL_SCISSOR_TEST); @@ -474,7 +472,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { rootLayer.draw(mPageContext); } - /** This function is invoked via JNI; be careful when modifying signature. */ public void drawForeground() { /* Draw any extra layers that were added (likely plugins) */ if (mExtraLayers.size() > 0) { @@ -498,7 +495,6 @@ public class LayerRenderer implements GLSurfaceView.Renderer { mHorizScrollLayer.draw(mPageContext); } - /** This function is invoked via JNI; be careful when modifying signature. */ public void endDrawing() { // If a layer update requires further work, schedule another redraw if (!mUpdated) commit 30a981cc2061b374361bbf8862ec3889b06acf88 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Wed Nov 8 15:31:38 2023 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Thu Nov 9 07:54:24 2023 +0100 android: Drop unused LayerView#registerCxxCompositor The comment saying it's called via JNI is not true for LibreOffice Viewer, is probably from Gecko/Fennec days like the ones for previously dropped methods. Now that the method is gone, `mContext` no longer needs to be static, so make it non-static and drop the corresponding TODO comment. Change-Id: I32db3728234715bc29af1ad757c715003c70ca4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159162 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> 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 5429d09cbb1d..7c2dda766d0a 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -53,8 +53,7 @@ public class LayerView extends FrameLayout { private Listener mListener; private OnInterceptTouchListener mTouchIntercepter; - //TODO static because of registerCxxCompositor() function, should be fixed in the future - private static LibreOfficeMainActivity mContext; + private LibreOfficeMainActivity mContext; public LayerView(Context context, AttributeSet attrs) { super(context, attrs); @@ -267,18 +266,6 @@ public class LayerView extends FrameLayout { return mSurfaceView.getHolder(); } - /** This function is invoked by Gecko (compositor thread) via JNI; be careful when modifying signature. */ - public static GLController registerCxxCompositor() { - try { - LayerView layerView = mContext.getLayerClient().getView(); - layerView.mListener.compositorCreated(); - return layerView.getGLController(); - } catch (Exception e) { - Log.e(LOGTAG, "Error registering compositor!", e); - return null; - } - } - public interface Listener { void compositorCreated(); void renderRequested();