android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java | 8 -------- android/source/src/java/org/mozilla/gecko/gfx/Layer.java | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-)
New commits: commit 9e43dc64b4be4dfe2ec6d6e1e96608344e151540 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 14:28:21 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:50:19 2025 +0100 android: Drop unused ImmutableViewportMetrics.setZoomFactor Change-Id: I7fec1259d38cdc078f91c766ca62a754bc0b9e0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193875 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java b/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java index f90580fbee8c..77734c4dff10 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java @@ -148,14 +148,6 @@ public class ImmutableViewportMetrics { zoomFactor); } - public ImmutableViewportMetrics setZoomFactor(float newZoomFactor) { - return new ImmutableViewportMetrics( - pageRectLeft, pageRectTop, pageRectRight, pageRectBottom, - cssPageRectLeft, cssPageRectTop, cssPageRectRight, cssPageRectBottom, - viewportRectLeft, viewportRectTop, viewportRectRight, viewportRectBottom, - newZoomFactor); - } - public ImmutableViewportMetrics offsetViewportBy(float dx, float dy) { return setViewportOrigin(viewportRectLeft + dx, viewportRectTop + dy); } commit 97524ff8345a655ca3056815e0b5c0baf430d5c0 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 14:23:06 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:50:08 2025 +0100 android: Drop Layer.mResolution As is more clear with the previous changes in place, its value is initialized to 1.0 and never changed again, so there's no need to divide by it. Change-Id: I4c6a67558d85fb0f84d24d3ddc4e6caa8b57aefe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193874 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/android/source/src/java/org/mozilla/gecko/gfx/Layer.java b/android/source/src/java/org/mozilla/gecko/gfx/Layer.java index 41a015df9c08..758214e363dd 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/Layer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/Layer.java @@ -20,7 +20,6 @@ public abstract class Layer { private Rect mNewPosition; protected Rect mPosition; - protected float mResolution; protected boolean mUsesDefaultProgram = true; public Layer() { @@ -34,7 +33,6 @@ public abstract class Layer { } else { mPosition = new Rect(0, 0, size.width, size.height); } - mResolution = 1.0f; } /** @@ -64,7 +62,7 @@ public abstract class Layer { /** Given the intrinsic size of the layer, returns the pixel boundaries of the layer rect. */ protected RectF getBounds(RenderContext context) { - return RectUtils.scale(new RectF(mPosition), context.zoomFactor / mResolution); + return RectUtils.scale(new RectF(mPosition), context.zoomFactor); } /**
