android: define mRootLayer directly as MultiTileLayer

Change-Id: I6a1f6971482ea1de28977d7905ba9fd85921551d

2 files changed, 9 insertions, 17 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index e43a308fae46..4f94e170bb7f 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -67,7 +67,7 @@ public class GeckoLayerClient implements LayerView.Listener {
     private boolean mRecordDrawTimes;
     private DrawTimingQueue mDrawTimingQueue;
 
-    private Layer mRootLayer;
+    private MultiTileLayer mRootLayer;
 
     /* The viewport that Gecko is currently displaying. */
     private ViewportMetrics mGeckoViewport;
@@ -129,9 +129,7 @@ public class GeckoLayerClient implements LayerView.Listener {
     }
 
     protected void updateLayerAfterDraw() {
-        if (mRootLayer instanceof MultiTileLayer) {
-            ((MultiTileLayer) mRootLayer).invalidate();
-        }
+        mRootLayer.invalidate();
     }
 
     public void beginDrawing(ViewportMetrics viewportMetrics) {
@@ -250,7 +248,7 @@ public class GeckoLayerClient implements LayerView.Listener {
         synchronized (mLayerController) {
         // adjust the page dimensions to account for differences in zoom
         // between the rendered content (which is what the compositor tells us)
-    // and our zoom level (which may have diverged).
+        // and our zoom level (which may have diverged).
         float ourZoom = mLayerController.getZoomFactor();
         pageWidth = pageWidth * ourZoom / zoom;
         pageHeight = pageHeight * ourZoom /zoom;
@@ -273,16 +271,11 @@ public class GeckoLayerClient implements LayerView.Listener {
     }
 
     public List<SubTile> getTiles() {
-        if (mRootLayer instanceof MultiTileLayer) {
-            return ((MultiTileLayer) mRootLayer).getTiles();
-        }
-        return null;
+        return mRootLayer.getTiles();
     }
 
     public void addTile(SubTile tile) {
-        if (mRootLayer instanceof MultiTileLayer) {
-            ((MultiTileLayer) mRootLayer).addTile(tile);
-        }
+        mRootLayer.addTile(tile);
     }
 
     @Override
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
index 469d7f563cbe..e60e89d7c133 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
@@ -42,7 +42,6 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Region;
-import android.util.Log;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -95,8 +94,6 @@ public class MultiTileLayer extends Layer {
     }
 
     private void validateTiles() {
-        Log.i(LOGTAG, "validateTiles()");
-
         // Set tile origins and resolution
         Point origin = new Point();
         refreshTileMetrics(origin, getResolution(), false);
@@ -120,8 +117,9 @@ public class MultiTileLayer extends Layer {
             RectF layerBounds = layer.getBounds(context);
 
             if (!RectF.intersects(layerBounds, context.viewport)) {
-                if (firstDirtyTile == null)
+                if (firstDirtyTile == null) {
                     firstDirtyTile = layer;
+                }
                 dirtyTiles++;
             } else {
                 // This tile intersects with the screen and is dirty,
@@ -196,8 +194,9 @@ public class MultiTileLayer extends Layer {
         for (SubTile layer : mTiles) {
             // Avoid work, only draw tiles that intersect with the viewport
             RectF layerBounds = layer.getBounds(context);
-            if (RectF.intersects(layerBounds, context.viewport))
+            if (RectF.intersects(layerBounds, context.viewport)) {
                 layer.draw(context);
+            }
         }
     }