summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-01-12 14:49:39 +0900
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-01-12 11:06:45 +0100
commit0ecf41b4b1ea995beab8ee79d608360f69a40040 (patch)
treefa88ee643bc042ffd5bb26c484ca4f3035814b51 /android
parent9563293912d2d25989c4f869e58000c78487455a (diff)
android: remove checkerboard color property - fix set to white
Change-Id: I7a11b0eea71e96f8bd2b307539f1964acb240216
Diffstat (limited to 'android')
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java10
-rw-r--r--android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java3
2 files changed, 2 insertions, 11 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 676e73c2638b..c1849d1511d3 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
@@ -96,7 +96,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
mZoomConstraints = new ZoomConstraints(false);
- mCheckerboardColor = Color.WHITE;
mPanZoomController = PanZoomController.Factory.create(this);
}
@@ -247,15 +246,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
}
}
- int getCheckerboardColor() {
- return mCheckerboardColor;
- }
-
- public void setCheckerboardColor(int newColor) {
- mCheckerboardColor = newColor;
- mView.requestRender();
- }
-
public void setZoomConstraints(ZoomConstraints constraints) {
mZoomConstraints = constraints;
}
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
index 7b4ead30dc57..6fe97b81e113 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerRenderer.java
@@ -8,6 +8,7 @@ package org.mozilla.gecko.gfx;
import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
+import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.RectF;
@@ -571,7 +572,7 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
GLES20.glDisable(GLES20.GL_SCISSOR_TEST);
/* Update background color. */
- mBackgroundColor = mView.getLayerClient().getCheckerboardColor();
+ mBackgroundColor = Color.WHITE;
/* Clear to the page background colour. The bits set here need to
* match up with those used in gfx/layers/opengl/LayerManagerOGL.cpp.