android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java | 48 ---------- 1 file changed, 4 insertions(+), 44 deletions(-)
New commits: commit a91e834e3c598393acee6a89e685229280196d59 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:42:48 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:52:03 2025 +0100 android: Drop dead SubdocumentScrollHelper logic Both, SubdocumentsScrollHelper.mOverridePanning and SubdocumentsScrollHelper.mScrollSucceeded don't get any value explicitly assigned in the ctor, i.e. they'r initialized to the default boolean value of false. Both never get assigned a different value, i.e. they're always false. Drop all logic that would only be run if they were true, and drop now unused class members. This demonstrates the whole class is eventually pointless, and prepares for its removal in an upcoming commit. Change-Id: I01794dedc7b5d3582d67eef6b9f8c36cce4e686f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193892 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 4ce29e6c2443..eea6125d7541 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java @@ -8,56 +8,21 @@ package org.mozilla.gecko.gfx; import android.graphics.PointF; class SubdocumentScrollHelper { - private static final String LOGTAG = "GeckoSubdocumentScrollHelper"; - - /* 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. */ - private boolean mOverridePanning; - - /* When this is true, we have received an ack for the last scroll event we sent to JS, and - * are ready to send the next scroll event. Note we only ever have one scroll event inflight - * at a time. */ - private boolean mOverrideScrollAck; - - /* 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; - - SubdocumentScrollHelper() { - mPendingDisplacement = new PointF(); + SubdocumentScrollHelper() { } boolean scrollBy(PointF displacement) { - if (! mOverridePanning) { - return false; - } - - if (! mOverrideScrollAck) { - mPendingDisplacement.x += displacement.x; - mPendingDisplacement.y += displacement.y; - return true; - } - - mOverrideScrollAck = false; - // clear the |mPendingDisplacement| after serializing |displacement| to - // JSON because they might be the same object - mPendingDisplacement.x = 0; - mPendingDisplacement.y = 0; - - return true; + return false; } void cancel() { - mOverridePanning = false; } boolean scrolling() { - return mOverridePanning; + return false; } boolean lastScrollSucceeded() { - return mScrollSucceeded; + return false; } } commit 143223f00f5b7a4addb64e4318b2c5a0881be486 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:20:34 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:51:53 2025 +0100 android: Drop SubdocumentScrollHelper.mUIHandler It's only assigned in the ctor, but never used later. Change-Id: I79aab8d4e85fe5cce5389401c60a0773b26f8f7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193891 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 8eb54a79735c..4ce29e6c2443 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java @@ -6,13 +6,10 @@ package org.mozilla.gecko.gfx; import android.graphics.PointF; -import android.os.Handler; class SubdocumentScrollHelper { private static final String LOGTAG = "GeckoSubdocumentScrollHelper"; - private final Handler mUiHandler; - /* This is the amount of displacement we have accepted but not yet sent to JS. */ private final PointF mPendingDisplacement; @@ -29,8 +26,6 @@ class SubdocumentScrollHelper { private boolean mScrollSucceeded; SubdocumentScrollHelper() { - // mUiHandler will be bound to the UI thread since that's where this constructor runs - mUiHandler = new Handler(); mPendingDisplacement = new PointF(); }
