From f3fdc828f1856a4f5c5eea23dd96b13a1afe58cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Wed, 21 Jan 2015 11:41:38 +0900 Subject: [PATCH] android: small cleanup of ComposedTileLayer Change-Id: Ifa4b35fa23a754c0ba0dbf63653986e61e6cb399 --- .../org/mozilla/gecko/gfx/ComposedTileLayer.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java index 7989ffe2b4e2..db27d1beb923 100644 --- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java +++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ComposedTileLayer.java @@ -130,11 +130,11 @@ public abstract class ComposedTileLayer extends Layer implements ComponentCallba } public void reevaluateTiles(ImmutableViewportMetrics viewportMetrics, DisplayPortMetrics mDisplayPort) { - RectF newCurrentViewPort = getViewPort(viewportMetrics); + RectF newViewPort = getViewPort(viewportMetrics); float newZoom = getZoom(viewportMetrics); - if (!currentViewport.equals(newCurrentViewPort) || currentZoom != newZoom) { - currentViewport = newCurrentViewPort; + if (!currentViewport.equals(newViewPort) || currentZoom != newZoom) { + currentViewport = newViewPort; currentZoom = newZoom; RectF pageRect = viewportMetrics.getPageRect(); @@ -232,12 +232,10 @@ public abstract class ComposedTileLayer extends Layer implements ComponentCallba @Override public void onTrimMemory(int level) { - Log.i(LOGTAG, "Trimming memory " + level); - if (level >= 10 /*TRIM_MEMORY_RUNNING_LOW*/) { - Log.i(LOGTAG, "Trimming memory - TRIM_MEMORY_RUNNING_LOW"); - } else if (level >= 15 /*TRIM_MEMORY_RUNNING_CRITICAL*/) { + if (level >= 15 /*TRIM_MEMORY_RUNNING_CRITICAL*/) { Log.i(LOGTAG, "Trimming memory - TRIM_MEMORY_RUNNING_CRITICAL"); - //clearAndReset(); + } else if (level >= 10 /*TRIM_MEMORY_RUNNING_LOW*/) { + Log.i(LOGTAG, "Trimming memory - TRIM_MEMORY_RUNNING_LOW"); } }