android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 13 --- android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 34 ---------- android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 2 android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java | 20 ----- 4 files changed, 69 deletions(-)
New commits: commit 9068d477ba1ba5d8f95ea057df03b675476502e5 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:11:11 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:51:18 2025 +0100 android: Drop unused GeckoLayerClient.abortPanZoomAnimation Also drop the then unused PanZoomController.abortAnimation. Change-Id: I64d8f4d2ab73d55ae6189a325f0d8e6e292f60c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193888 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 c0d863b7b09d..b5b4e26a7294 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java @@ -184,19 +184,6 @@ public class GeckoLayerClient implements PanZoomTarget { reevaluateTiles(); } - /** - * Aborts any pan/zoom animation that is currently in progress. - */ - public void abortPanZoomAnimation() { - if (mPanZoomController != null) { - mView.post(new Runnable() { - public void run() { - mPanZoomController.abortAnimation(); - } - }); - } - } - public void setZoomConstraints(ZoomConstraints constraints) { mZoomConstraints = constraints; } 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 452074e37132..8b20f9613e7f 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -165,35 +165,6 @@ class JavaPanZoomController return false; } - /** This function must be called from the UI thread. */ - public void abortAnimation() { - checkMainThread(); - // this happens when gecko changes the viewport on us or if the device is rotated. - // if that's the case, abort any animation in progress and re-zoom so that the page - // snaps to edges. for other cases (where the user's finger(s) are down) don't do - // anything special. - switch (mState) { - case FLING: - mX.stopFling(); - mY.stopFling(); - // fall through - case BOUNCE: - case ANIMATED_ZOOM: - // the zoom that's in progress likely makes no sense any more (such as if - // the screen orientation changed) so abort it - setState(PanZoomState.NOTHING); - // fall through - case NOTHING: - // Don't do animations here; they're distracting and can cause flashes on page - // transitions. - synchronized (mTarget.getLock()) { - mTarget.setViewportMetrics(getValidViewportMetrics()); - mTarget.forceRedraw(); - } - break; - } - } - /** This function must be called on the UI thread. */ void startingNewEventBlock(MotionEvent event, boolean waitingForTouchListeners) { checkMainThread(); 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 0fb20a350178..51e60a231a98 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java @@ -27,7 +27,6 @@ interface PanZoomController { PointF getVelocityVector(); void pageRectUpdated(); - void abortAnimation(); void setOverScrollMode(int overscrollMode); int getOverScrollMode(); commit 33cd5363f361e81529665ba26e6b197c36ef9456 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:05:17 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:51:09 2025 +0100 android: Drop unused PanZoomController.notifyDefaultActionPrevented Also drop the then unused TouchEventHandler.handleEventListenerAction. Change-Id: I8c25279851031c5c13f3a8273804ddf3d7997062 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193880 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> 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 14b5f44bfca2..452074e37132 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -165,11 +165,6 @@ class JavaPanZoomController return false; } - /** This function MUST be called on the UI thread */ - public void notifyDefaultActionPrevented(boolean prevented) { - mTouchEventHandler.handleEventListenerAction(!prevented); - } - /** This function must be called from the UI thread. */ public void abortAnimation() { checkMainThread(); 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 c75c61a261b6..0fb20a350178 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java @@ -22,7 +22,6 @@ interface PanZoomController { boolean onTouchEvent(MotionEvent event); boolean onMotionEvent(MotionEvent event); - void notifyDefaultActionPrevented(boolean prevented); boolean getRedrawHint(); PointF getVelocityVector(); diff --git a/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java b/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java index 1c227de20b2d..01c5949f0fda 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/TouchEventHandler.java @@ -180,26 +180,6 @@ public final class TouchEventHandler { return true; } - /** - * This function is how gecko sends us a default-prevented notification. It is called - * once gecko knows definitively whether the block of events has had preventDefault - * called on it (either on the initial down event that starts the block, or on - * the first event following that down event). - * - * This function MUST be called on the UI thread. - */ - public void handleEventListenerAction(boolean allowDefaultAction) { - if (mProcessingBalance > 0) { - // this event listener that triggered this took too long, and the corresponding - // ListenerTimeoutProcessor runnable already ran for the event in question. the - // block of events this is for has already been processed, so we don't need to - // do anything here. - } else { - processEventBlock(allowDefaultAction); - } - mProcessingBalance--; - } - /* This function MUST be called on the UI thread. */ public void setWaitForTouchListeners(boolean aValue) { mWaitForTouchListeners = aValue;
