android: clear tiles when adding a new tile, various

Change-Id: Ifc6e01a1beb39187a5231019d1bf7ac816052e78

1 files changed, 5 insertions, 2 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 3c6fb8267e81..7c41db1df294 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
@@ -128,10 +128,12 @@ public abstract class ComposedTileLayer extends Layer {
         float newZoom = viewportMetrics.zoomFactor;
 
         if (!currentViewport.equals(newCurrentViewPort) || currentZoom != newZoom) {
+            if (newZoom == 1.0f) {
+                Log.i(LOGTAG, "Suspisious zoom 1.0");
+            }
             currentViewport = newCurrentViewPort;
             currentZoom = newZoom;
 
-            clearMarkedTiles();
             addNewTiles(viewportMetrics);
             markTiles(viewportMetrics);
         }
@@ -180,7 +182,7 @@ public abstract class ComposedTileLayer extends Layer {
         float zoom = getZoom(viewportMetrics);
         for (SubTile tile : tiles) {
             if (FloatUtils.fuzzyEquals(tile.id.zoom, zoom)) {
-                RectF tileRect = new RectF(tile.id.x, tile.id.y, tile.id.x + tileSize.width, tile.id.y + tileSize.height);
+                RectF tileRect = tile.id.getRect();
                 if (!RectF.intersects(currentViewport, tileRect)) {
                     tile.markForRemoval();
                     Log.i(LOGTAG, "Mark for remove - " + currentViewport + " " + tileRect);
@@ -198,6 +200,7 @@ public abstract class ComposedTileLayer extends Layer {
     }
 
     public void addTile(SubTile tile) {
+        clearMarkedTiles();
         tile.beginTransaction();
         tiles.add(tile);
     }