android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 11 +-- android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 28 ---------- 2 files changed, 3 insertions(+), 36 deletions(-)
New commits: commit b0c7f74a9ebb2d7492ff8a05f740263c211f6389 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:56:49 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:52:42 2025 +0100 android: Drop now unused SubdocumentScrollHelper This class is now unused, see previous commit Change-Id: I196cb3806c9dc9afca8baae03c4e8e526aa20484 Author: Michael Weghorn <[email protected]> Date: Wed Nov 12 15:55:28 2025 +0100 android: Stop using SubdocumentScrollHelper in JavaPanZoomController for more details. Change-Id: I2e9af707b401ed00d50a7a9d6888bc3a01dbb225 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193895 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java deleted file mode 100644 index eea6125d7541..000000000000 --- a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*- - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.gecko.gfx; - -import android.graphics.PointF; - -class SubdocumentScrollHelper { - SubdocumentScrollHelper() { - } - - boolean scrollBy(PointF displacement) { - return false; - } - - void cancel() { - } - - boolean scrolling() { - return false; - } - - boolean lastScrollSucceeded() { - return false; - } -} commit 806a7f2631b38f854da15daae0035f8bfab63538 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:55:28 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:52:31 2025 +0100 android: Stop using SubdocumentScrollHelper in JavaPanZoomController As demonstrated by (and obvious since) previous commit Change-Id: I01794dedc7b5d3582d67eef6b9f8c36cce4e686f Author: Michael Weghorn <[email protected]> Date: Wed Nov 12 15:42:48 2025 +0100 android: Drop dead SubdocumentScrollHelper logic , the SubdocumentScrollHelper class doesn't add any value, so stop using it in JavaPanZoomController. Change-Id: I196cb3806c9dc9afca8baae03c4e8e526aa20484 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193894 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins 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 49044ec33ee7..22b693fd6a8c 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -75,7 +75,6 @@ class JavaPanZoomController } private final PanZoomTarget mTarget; - private final SubdocumentScrollHelper mSubscroller; private final Axis mX; private final Axis mY; private final TouchEventHandler mTouchEventHandler; @@ -100,7 +99,6 @@ class JavaPanZoomController PAN_THRESHOLD = 1/16f * LOKitShell.getDpi(view.getContext()); MAX_SCROLL = 0.075f * LOKitShell.getDpi(view.getContext()); mTarget = target; - mSubscroller = new SubdocumentScrollHelper(); mX = new AxisX(); mY = new AxisY(); mTouchEventHandler = new TouchEventHandler(view.getContext(), view, this); @@ -167,7 +165,6 @@ class JavaPanZoomController /** This function must be called on the UI thread. */ void startingNewEventBlock(MotionEvent event, boolean waitingForTouchListeners) { checkMainThread(); - mSubscroller.cancel(); if (waitingForTouchListeners && (event.getAction() & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) { // this is the first touch point going down, so we enter the pending state // setting the state will kill any animations in progress, possibly leaving @@ -530,10 +527,8 @@ class JavaPanZoomController if (FloatUtils.fuzzyEquals(displacement.x, 0.0f) && FloatUtils.fuzzyEquals(displacement.y, 0.0f)) { return; } - if (! mSubscroller.scrollBy(displacement)) { - synchronized (mTarget.getLock()) { - scrollBy(displacement.x, displacement.y); - } + synchronized (mTarget.getLock()) { + scrollBy(displacement.x, displacement.y); } } @@ -649,7 +644,7 @@ class JavaPanZoomController * coast smoothly to a stop when not. In other words, require a greater velocity to * maintain the fling once we enter overscroll. */ - float threshold = (overscrolled && !mSubscroller.scrolling() ? STOPPED_THRESHOLD : FLING_STOPPED_THRESHOLD); + float threshold = (overscrolled ? STOPPED_THRESHOLD : FLING_STOPPED_THRESHOLD); if (getVelocity() >= threshold) { mContext.getDocumentOverlay().showPageNumberRect(); // we're still flinging
