summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-08 16:45:47 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2014-07-10 11:17:55 +0200
commit40499e3db9ab890af13e6e8b47da68191fa11157 (patch)
tree75ede84a441cae4f94e00614d9ca38faff707e68 /android
parentd646e43cc088c70c2d8c2decaf1590ede0f3e898 (diff)
LOAndroid3: clean-up imports TileLayer, GeckoSoftwareLayerClient
Change-Id: I420d2b28a3d3904989ea9c52e8a4326a0c8d7c3c
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java3
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java9
2 files changed, 5 insertions, 7 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java
index 8efe82d62c44..43cf88dbe85a 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoSoftwareLayerClient.java
@@ -74,8 +74,9 @@ public class GeckoSoftwareLayerClient extends GeckoLayerClient {
@Override
protected boolean setupLayer() {
Log.i(LOGTAG, "Creating MultiTileLayer");
- if(mTileLayer == null)
+ if(mTileLayer == null) {
mTileLayer = new MultiTileLayer(TILE_SIZE);
+ }
mLayerController.setRoot(mTileLayer);
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
index 64ec94dc694a..31c1b6d992da 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/TileLayer.java
@@ -38,16 +38,12 @@
package org.mozilla.gecko.gfx;
-import android.graphics.Point;
import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Region;
import android.opengl.GLES20;
import android.util.Log;
+
import java.nio.Buffer;
import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.FloatBuffer;
/**
* Base class for tile layers, which encapsulate the logic needed to draw textured tiles in OpenGL
@@ -82,8 +78,9 @@ public abstract class TileLayer extends Layer {
@Override
protected void finalize() throws Throwable {
- if (mTextureIDs != null)
+ if (mTextureIDs != null) {
TextureReaper.get().add(mTextureIDs);
+ }
}
/**