diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-09-25 15:48:58 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-09-26 23:17:21 +0200 |
commit | 91d9276a1288121a126af1d67b7d5f09db7f5101 (patch) | |
tree | c243f2903080cdb2ed99a197710c2e1c449e52ec /android | |
parent | 3d394257945f6b0a4bc4b5ea397a3942a59c5d06 (diff) |
android: clean MultiTileLayer of unneeded variables/methods
Change-Id: I7750322000230448d6283107daace3d9bb5da61d
Diffstat (limited to 'android')
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 2 | ||||
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java | 32 |
2 files changed, 2 insertions, 32 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 4f94e170bb7f..f826b26ef9c0 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 @@ -112,7 +112,7 @@ public class GeckoLayerClient implements LayerView.Listener { mLayerController = layerController; - mRootLayer = new MultiTileLayer(new IntSize(256, 256)); + mRootLayer = new MultiTileLayer(); view.setListener(this); layerController.setRoot(mRootLayer); 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 e60e89d7c133..c6c1befe04a5 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 @@ -39,7 +39,6 @@ package org.mozilla.gecko.gfx; import android.graphics.Point; -import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; @@ -53,30 +52,10 @@ public class MultiTileLayer extends Layer { private static final String LOGTAG = "GeckoMultiTileLayer"; private final List<SubTile> mTiles; - private IntSize mTileSize; - private IntSize mSize; - public MultiTileLayer(IntSize tileSize) { + public MultiTileLayer() { super(); - mTileSize = tileSize; mTiles = new CopyOnWriteArrayList<SubTile>(); - mSize = new IntSize(0,0); - } - - public void invalidate(Rect dirtyRect) { - if (!inTransaction()) { - throw new RuntimeException("invalidate() is only valid inside a transaction"); - } - - for (SubTile layer : mTiles) { - Rect rect = layer.getPosition(); - Rect tileRect = new Rect(layer.x, layer.y, layer.x + rect.width(), layer.y + rect.height()); - - if (tileRect.intersect(dirtyRect)) { - tileRect.offset(-layer.x, -layer.y); - layer.invalidate(); - } - } } public void invalidate() { @@ -85,14 +64,6 @@ public class MultiTileLayer extends Layer { } } - public void setSize(IntSize size) { - mSize = size; - } - - public IntSize getSize() { - return mSize; - } - private void validateTiles() { // Set tile origins and resolution Point origin = new Point(); @@ -141,7 +112,6 @@ public class MultiTileLayer extends Layer { } private void refreshTileMetrics(Point origin, float resolution, boolean inTransaction) { - IntSize size = getSize(); for (SubTile layer : mTiles) { if (!inTransaction) { layer.beginTransaction(); |