android: remove screenshot layer

Change-Id: Ic2f0344bab4280fd3c55923707d100f87585199a

3 files changed, 3 insertions, 31 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 faa7d4e0f7b4..c3535e5044fa 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
@@ -78,7 +78,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
 
     /* The new color for the checkerboard. */
     private int mCheckerboardColor;
-    private boolean mCheckerboardShouldShowChecks;
 
     private final PanZoomController mPanZoomController;
     private LayerView mView;
@@ -98,7 +97,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
         mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
         mZoomConstraints = new ZoomConstraints(false);
         mCheckerboardColor = Color.WHITE;
-        mCheckerboardShouldShowChecks = true;
 
         mPanZoomController = PanZoomController.Factory.create(this);
     }
@@ -249,10 +247,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
         }
     }
 
-    boolean checkerboardShouldShowChecks() {
-        return mCheckerboardShouldShowChecks;
-    }
-
     int getCheckerboardColor() {
         return mCheckerboardColor;
     }
@@ -454,14 +448,6 @@ public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
         return layerPoint;
     }
 
-    /**
-     * Sets whether or not the checkerboard should show checkmarks.
-     */
-    public void setCheckerboardShowChecks(boolean showChecks) {
-        mCheckerboardShouldShowChecks = showChecks;
-        mView.requestRender();
-    }
-
     public ImmutableViewportMetrics getGeckoViewportMetrics() {
         return mGeckoViewport;
     }
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 64d3a5d84ab7..7b4ead30dc57 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
@@ -593,20 +593,10 @@ public class LayerRenderer implements GLSurfaceView.Renderer {
             if (!untransformedPageRect.contains(mFrameMetrics.getViewport()))
                 mShadowLayer.draw(mPageContext);
 
-            /* Draw the 'checkerboard'. We use gfx.show_checkerboard_pattern to
-             * determine whether to draw the screenshot layer.
+            /* Scissor around the page-rect, in case the page has shrunk
+             * since the screenshot layer was last updated.
              */
-            if (mView.getLayerClient().checkerboardShouldShowChecks()) {
-                /* Find the area the root layer will render into, to mask the checkerboard layer */
-                Rect rootMask = getMaskForLayer(mView.getLayerClient().getRoot());
-                mScreenshotLayer.setMask(rootMask);
-
-                /* Scissor around the page-rect, in case the page has shrunk
-                 * since the screenshot layer was last updated.
-                 */
-                setScissorRect(); // Calls glEnable(GL_SCISSOR_TEST))
-                mScreenshotLayer.draw(mPageContext);
-            }
+            setScissorRect(); // Calls glEnable(GL_SCISSOR_TEST))
         }
 
         // Draws the layer the client added to us.
diff --git a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index 4d23cf42d68f..db5c11062a32 100644
--- a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++ b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -418,8 +418,4 @@ public class LayerView extends FrameLayout {
             super(e);
         }
     }
-
-    public void changeCheckerboardBitmap(Bitmap bitmap, float pageWidth, float pageHeight) {
-        mRenderer.setCheckerboardBitmap(bitmap, pageWidth, pageHeight);
-    }
 }