android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java | 6 +- android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java | 21 +++------- android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java | 6 -- android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java | 1 4 files changed, 10 insertions(+), 24 deletions(-)
New commits: commit d9f2904168c85fe911854fac43e5f7cbdd30463a Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 15:01:36 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:50:57 2025 +0100 android: Drop unused PanZoomController.abortPanning Change-Id: Iefdfa05d97508bf784cd15144b15a0afc49b3e8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193879 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 063975abf947..14b5f44bfca2 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java @@ -1069,12 +1069,6 @@ class JavaPanZoomController return true; } - /** This function must be called from the UI thread. */ - public void abortPanning() { - checkMainThread(); - bounce(); - } - public void setOverScrollMode(int overscrollMode) { mX.setOverScrollMode(overscrollMode); mY.setOverScrollMode(overscrollMode); 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 ebcd641f21af..c75c61a261b6 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/PanZoomController.java @@ -28,7 +28,6 @@ interface PanZoomController { PointF getVelocityVector(); void pageRectUpdated(); - void abortPanning(); void abortAnimation(); void setOverScrollMode(int overscrollMode); commit b1c21289bb3339c5e72a70bf018976dd3f4d48eb Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 14:48:42 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:50:48 2025 +0100 android: Drop resolution from DisplayPortMetrics DisplayPortMetrics.mResolution is only set in the ctor, but the getter is never used, and the resolution value is also not used for anything else except in DisplayPortMetrics.toString. Therefore, drop it altogether. Change-Id: I0fce08c7c79290bddb70967b02e79327f9593533 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193878 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java index a571b87e2221..71e9555d9f40 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java @@ -52,7 +52,7 @@ final class DisplayPortCalculator { * the tiles are TILE_SIZE by TILE_SIZE and start at the origin, such that there will always be * a tile at (0,0)-(TILE_SIZE,TILE_SIZE)). */ - private static DisplayPortMetrics getTileAlignedDisplayPortMetrics(RectF margins, float zoom, ImmutableViewportMetrics metrics) { + private static DisplayPortMetrics getTileAlignedDisplayPortMetrics(RectF margins, ImmutableViewportMetrics metrics) { float left = metrics.viewportRectLeft - margins.left; float top = metrics.viewportRectTop - margins.top; float right = metrics.viewportRectRight + margins.right; @@ -61,7 +61,7 @@ final class DisplayPortCalculator { top = (float) Math.max(metrics.pageRectTop, TILE_SIZE * Math.floor(top / TILE_SIZE)); right = (float) Math.min(metrics.pageRectRight, TILE_SIZE * Math.ceil(right / TILE_SIZE)); bottom = (float) Math.min(metrics.pageRectBottom, TILE_SIZE * Math.ceil(bottom / TILE_SIZE)); - return new DisplayPortMetrics(left, top, right, bottom, zoom); + return new DisplayPortMetrics(left, top, right, bottom); } /** @@ -189,7 +189,7 @@ final class DisplayPortCalculator { RectF margins = velocityBiasedMargins(horizontalBuffer, verticalBuffer, velocity); margins = shiftMarginsForPageBounds(margins, metrics); - return getTileAlignedDisplayPortMetrics(margins, metrics.zoomFactor, metrics); + return getTileAlignedDisplayPortMetrics(margins, metrics); } public boolean aboutToCheckerboard(ImmutableViewportMetrics metrics, PointF velocity, DisplayPortMetrics displayPort) { diff --git a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java index a79b994a963c..3a81679d4141 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java @@ -10,32 +10,25 @@ import android.graphics.RectF; import org.mozilla.gecko.util.FloatUtils; /* - * This class keeps track of the area we request Gecko to paint, as well - * as the resolution of the paint. The area may be different from the visible - * area of the page, and the resolution may be different from the resolution - * used in the compositor to render the page. This is so that we can ask Gecko + * This class keeps track of the area we request Gecko to paint. + * The area may be different from the visible + * area of the page. This is so that we can ask Gecko * to paint a much larger area without using extra memory, and then render some - * subsection of that with compositor scaling. + * subsection of that. */ public final class DisplayPortMetrics { private final RectF mPosition; - private final float mResolution; public RectF getPosition() { return mPosition; } - public float getResolution() { - return mResolution; - } - public DisplayPortMetrics() { - this(0, 0, 0, 0, 1); + this(0, 0, 0, 0); } - public DisplayPortMetrics(float left, float top, float right, float bottom, float resolution) { + public DisplayPortMetrics(float left, float top, float right, float bottom) { mPosition = new RectF(left, top, right, bottom); - mResolution = resolution; } public boolean contains(RectF rect) { @@ -46,6 +39,6 @@ public final class DisplayPortMetrics { public String toString() { return "DisplayPortMetrics v=(" + mPosition.left + "," + mPosition.top + "," + mPosition.right + "," - + mPosition.bottom + ") z=" + mResolution; + + mPosition.bottom + ")"; } }
