android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 1 android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 12 ---------- 2 files changed, 1 insertion(+), 12 deletions(-)
New commits: commit fbc19a5828f10f3ba8ea3b2b619e8a93a3e65371 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:17:52 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:51:40 2025 +0100 android: Drop never read SubdocumentScrollHelper.mOverrideScrollPending The field is only assigned a value, but it's never read. Change-Id: Id89f7e552194321a15691bb2c17207bff8e298c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193890 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java index b0f04594cc2f..8eb54a79735c 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java @@ -13,8 +13,7 @@ class SubdocumentScrollHelper { private final Handler mUiHandler; - /* This is the amount of displacement we have accepted but not yet sent to JS; this is - * only valid when mOverrideScrollPending is true. */ + /* This is the amount of displacement we have accepted but not yet sent to JS. */ private final PointF mPendingDisplacement; /* When this is true, we're sending scroll events to JS to scroll the active subdocument. */ @@ -25,10 +24,6 @@ class SubdocumentScrollHelper { * at a time. */ private boolean mOverrideScrollAck; - /* When this is true, we have a pending scroll that we need to send to JS; we were unable - * to send it when it was initially requested because mOverrideScrollAck was not true. */ - private boolean mOverrideScrollPending; - /* When this is true, the last scroll event we sent actually did some amount of scrolling on * the subdocument; we use this to decide when we have reached the end of the subdocument. */ private boolean mScrollSucceeded; @@ -45,14 +40,12 @@ class SubdocumentScrollHelper { } if (! mOverrideScrollAck) { - mOverrideScrollPending = true; mPendingDisplacement.x += displacement.x; mPendingDisplacement.y += displacement.y; return true; } mOverrideScrollAck = false; - mOverrideScrollPending = false; // clear the |mPendingDisplacement| after serializing |displacement| to // JSON because they might be the same object mPendingDisplacement.x = 0; commit e83674c8187ea66b16427835853cb4f6cbc50132 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:12:51 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:51:29 2025 +0100 android: Drop SubdocumentScrollHelper.destroy The method doesn't do anything. Drop it. Change-Id: I56964bf2a871d626bb6383341de6a0e208d494c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193889 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 8b20f9613e7f..4b72b732f658 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -112,7 +112,6 @@ class JavaPanZoomController } public void destroy() { - mSubscroller.destroy(); mTouchEventHandler.destroy(); } diff --git a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java index 5a752e3c71a8..b0f04594cc2f 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java @@ -39,9 +39,6 @@ class SubdocumentScrollHelper { mPendingDisplacement = new PointF(); } - void destroy() { - } - boolean scrollBy(PointF displacement) { if (! mOverridePanning) { return false;
