android: add getCSSRect to TileIdentifier and use id in SubTile

Change-Id: I565a5f88d5913f5337f5c3d32d54be71a32f542a

2 files changed, 20 insertions, 12 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java
index 40ec60c6054a..d682775eb852 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/TileIdentifier.java
@@ -1,5 +1,6 @@
 package org.libreoffice;
 
+import android.graphics.Rect;
 import android.graphics.RectF;
 
 import org.mozilla.gecko.gfx.IntSize;
@@ -17,14 +18,27 @@ public class TileIdentifier {
         this.size = size;
     }
 
-    public RectF getRect() {
+    public RectF getRectF() {
         return new RectF(x, y, x + size.width, y + size.height);
     }
 
-    public RectF getCSSRect() {
-        float cssX = x * zoom;
-        float cssY = y * zoom;
-        return new RectF(cssX, cssY, cssX + (size.width * zoom), cssY + (size.height * zoom));
+    public RectF getCSSRectF() {
+        float cssX = x / zoom;
+        float cssY = y / zoom;
+        float cssSizeW = size.width / zoom;
+        float cssSizeH = size.height / zoom;
+        return new RectF(cssX, cssY, cssX + cssSizeW, cssY + cssSizeH);
+    }
+
+    public Rect getCSSRect() {
+        float cssX = x / zoom;
+        float cssY = y / zoom;
+        float sizeW = size.width / zoom;
+        float sizeH = size.height / zoom;
+        return new Rect(
+                (int) cssX, (int) cssY,
+                (int) (cssX + sizeW),
+                (int) (cssY + sizeH) );
     }
 
     @Override
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
index d76bc54b2a33..b5af410735f4 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/SubTile.java
@@ -19,13 +19,7 @@ public class SubTile extends SingleTileLayer {
     }
 
     public void refreshTileMetrics() {
-        Rect position = getPosition();
-        float positionX = id.x / id.zoom;
-        float positionY = id.y / id.zoom;
-        float tileSizeWidth = id.size.width / id.zoom;
-        float tileSizeHeight = id.size.height / id.zoom;
-        position.set((int) positionX, (int) positionY, (int) (positionX + tileSizeWidth), (int) (positionY + tileSizeHeight));
-        setPosition(position);
+        setPosition(id.getCSSRect());
     }
 
     public void markForRemoval() {