android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 1 - android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 4 ---- android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 3 --- android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 3 --- android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 2 -- 5 files changed, 13 deletions(-)
New commits: commit 3f6b4cf48d9647194b760c30e909b7c74f3dee3d Author: Michael Weghorn <[email protected]> AuthorDate: Thu Nov 13 10:55:24 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:56:25 2025 +0100 android: Drop GeckoLayerClient.destroy It doesn't do anything by now. Change-Id: I498eaff6921c1dabd30889d623d67ec5207a9f95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193952 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java index 8e8cf3208cba..65f2ff62f2b6 100644 --- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -541,7 +541,6 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Shared .unregisterOnSharedPreferenceChangeListener(this); LOKitShell.sendCloseEvent(); - mLayerClient.destroy(); super.onDestroy(); if (isFinishing()) { // Not an orientation change diff --git a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java index 3333ef4cbfc6..8a00ed5053e9 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -82,9 +82,6 @@ public class GeckoLayerClient implements PanZoomTarget { mView.requestRender(); } - public void destroy() { - } - Layer getRoot() { return mIsReady ? mRootLayer : null; } 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 a2fa61bf0f91..4de92ce95e66 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -87,9 +87,6 @@ public class LayerView extends FrameLayout { } public void destroy() { - if (mLayerClient != null) { - mLayerClient.destroy(); - } if (mRenderer != null) { mRenderer.destroy(); } commit cec548ce3c82f597a1702886a33850c8a49aa7be Author: Michael Weghorn <[email protected]> AuthorDate: Thu Nov 13 10:54:18 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:56:10 2025 +0100 android: Drop PanZoomController.destroy It doesn't do anything anyway. Change-Id: Ie9deab61c206a07f84d079e8c58b7d4bb0bf5c14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193951 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java index 746e758780ef..3333ef4cbfc6 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -83,7 +83,6 @@ public class GeckoLayerClient implements PanZoomTarget { } public void destroy() { - mPanZoomController.destroy(); } Layer getRoot() { diff --git a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java index 0782f2e11d2b..a9236f5a7504 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -105,9 +105,6 @@ class JavaPanZoomController setState(PanZoomState.NOTHING); } - public void destroy() { - } - private static float easeOut(float t) { // ease-out approx. // -(t-1)^2+1 diff --git a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java index 51e60a231a98..9cf95a82df37 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java @@ -18,8 +18,6 @@ interface PanZoomController { } } - void destroy(); - boolean onTouchEvent(MotionEvent event); boolean onMotionEvent(MotionEvent event);
