android/source/src/java/org/mozilla/gecko/gfx/Axis.java | 4 ---- android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 7 ++----- android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 9 --------- android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 3 --- 4 files changed, 2 insertions(+), 21 deletions(-)
New commits: commit 359ea4d690aa7b191619f65882d100f9e596816c Author: Michael Weghorn <[email protected]> AuthorDate: Thu Nov 13 11:50:40 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:57:12 2025 +0100 android: Drop unused PanZoomController.{g,s}etOverScrollMode Also drop the now unused Axis.setOverScrollMode. Change-Id: Ica0acd21a1450316225f3c96b5464d29bf2c6449 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193957 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/Axis.java b/android/source/src/java/org/mozilla/gecko/gfx/Axis.java index 253985852c1f..e22dd9b73857 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/Axis.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/Axis.java @@ -118,10 +118,6 @@ abstract class Axis { mOverscrollMode = View.OVER_SCROLL_IF_CONTENT_SCROLLS; } - public void setOverScrollMode(int overscrollMode) { - mOverscrollMode = overscrollMode; - } - public int getOverScrollMode() { return mOverscrollMode; } 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 a9236f5a7504..317bf92bf187 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -980,13 +980,4 @@ class JavaPanZoomController bounce(finalMetrics, PanZoomState.ANIMATED_ZOOM); return true; } - - public void setOverScrollMode(int overscrollMode) { - mX.setOverScrollMode(overscrollMode); - mY.setOverScrollMode(overscrollMode); - } - - public int getOverScrollMode() { - return mX.getOverScrollMode(); - } } 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 9cf95a82df37..27c6b65dc558 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java @@ -25,7 +25,4 @@ interface PanZoomController { PointF getVelocityVector(); void pageRectUpdated(); - - void setOverScrollMode(int overscrollMode); - int getOverScrollMode(); } commit f3e0df4d52daa0b41d2de7034890fd85c0785c03 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Nov 13 11:09:42 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:57:00 2025 +0100 android: Use local var instead of GeckoLayerClient.mLayerRenderer It's only used in this one place. Change-Id: Ifc64c6d4e06374db884d6aae4b911c0b2f2f6c39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193955 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 47050edaa778..2c6db0d22773 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -18,8 +18,6 @@ import java.util.List; public class GeckoLayerClient implements PanZoomTarget { private static final String LOGTAG = GeckoLayerClient.class.getSimpleName(); - private final LayerRenderer mLayerRenderer; - private final LibreOfficeMainActivity mContext; private IntSize mScreenSize; private DisplayPortMetrics mDisplayPort; @@ -68,9 +66,8 @@ public class GeckoLayerClient implements PanZoomTarget { mRootLayer = new DynamicTileLayer(mContext); mLowResLayer = new FixedZoomTileLayer(mContext); - mLayerRenderer = new LayerRenderer(mView); - - mView.setLayerRenderer(mLayerRenderer); + final LayerRenderer layerRenderer = new LayerRenderer(mView); + mView.setLayerRenderer(layerRenderer); sendResizeEventIfNecessary(false); mView.requestRender();
