android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java | 14 +--------- android/source/src/java/org/mozilla/gecko/gfx/Layer.java | 11 ------- 2 files changed, 2 insertions(+), 23 deletions(-)
New commits: commit 06580376bda9d4f962602be8a22190d0a43fbd48 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 14:10:22 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:49:36 2025 +0100 android: Drop unused Layer.setResolution Presumably unused since commit 43bbf53bbad4623355e6344094573f8efca01df2 Date: Tue Jan 27 13:01:53 2015 +0900 android: remove unneded code from GeckoLayerClient Change-Id: I5c7af6dfa7c921b186972b7b8d7bc079ddec0629 Change-Id: I2012a292eb1e8508b73ebab7db2eda6a488e1988 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193867 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java index ecc0d9305908..3df35ca44826 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java @@ -133,16 +133,6 @@ public abstract class ComposedTileLayer extends Layer implements ComponentCallba return validRegion; } - @Override - public void setResolution(float newResolution) { - super.setResolution(newResolution); - tilesReadLock.lock(); - for (SubTile tile : tiles) { - tile.setResolution(newResolution); - } - tilesReadLock.unlock(); - } - public void reevaluateTiles(ImmutableViewportMetrics viewportMetrics, DisplayPortMetrics mDisplayPort) { RectF newViewPort = getViewPort(viewportMetrics); float newZoom = getZoom(viewportMetrics); 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 b7fee29fc943..2b2529e8eb96 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/Layer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/Layer.java @@ -122,17 +122,6 @@ public abstract class Layer { return mResolution; } - /** - * Sets the layer resolution. This value is used to determine how many pixels per - * device pixel this layer was rendered at. This will be reflected by scaling by - * the reciprocal of the resolution in the layer's transform() function. - * Only valid inside a transaction. */ - public void setResolution(float newResolution) { - if (!mInTransaction) - throw new RuntimeException("setResolution() is only valid inside a transaction"); - mNewResolution = newResolution; - } - public boolean usesDefaultProgram() { return mUsesDefaultProgram; } commit c20b1b8a10f3692f28d99d963effd82666b3d027 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Nov 12 13:53:25 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Nov 14 11:49:25 2025 +0100 android: Use Math.max Change-Id: I9e0d271dcbc4b56066fa2e93106db10e1317f724 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193866 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java index bdef7022186a..ecc0d9305908 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java @@ -50,10 +50,10 @@ public abstract class ComposedTileLayer extends Layer implements ComponentCallba protected static RectF inflate(RectF rect, IntSize inflateSize) { RectF newRect = new RectF(rect); newRect.left -= inflateSize.width; - newRect.left = newRect.left < 0.0f ? 0.0f : newRect.left; + newRect.left = Math.max(newRect.left, 0.0f); newRect.top -= inflateSize.height; - newRect.top = newRect.top < 0.0f ? 0.0f : newRect.top; + newRect.top = Math.max(newRect.top, 0.0f); newRect.right += inflateSize.width; newRect.bottom += inflateSize.height;
