android: Clean-up LayerClient - add @Override, rearrange, comments

Change-Id: I75f32f2a99430ff65345e203ac49189fec011e2e

1 files changed, 28 insertions, 22 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 ea729a5265f1..e975bf99b9e8 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
@@ -24,12 +24,10 @@ public class GeckoLayerClient implements PanZoomTarget {
     private static final String LOGTAG = GeckoLayerClient.class.getSimpleName();
 
     private LayerRenderer mLayerRenderer;
-    private boolean mLayerRendererInitialized;
 
     private Context mContext;
     private IntSize mScreenSize;
     private DisplayPortMetrics mDisplayPort;
-    private DisplayPortMetrics mReturnDisplayPort;
 
     private ComposedTileLayer mLowResLayer;
     private ComposedTileLayer mRootLayer;
@@ -89,6 +87,26 @@ public class GeckoLayerClient implements PanZoomTarget {
         sendResizeEventIfNecessary();
     }
 
+    public void destroy() {
+        mPanZoomController.destroy();
+    }
+
+    public Context getContext() {
+        return mContext;
+    }
+
+    Layer getRoot() {
+        return mIsReady ? mRootLayer : null;
+    }
+
+    Layer getLowResLayer() {
+        return mIsReady ? mLowResLayer : null;
+    }
+
+    public LayerView getView() {
+        return mView;
+    }
+
     /**
      * Returns true if this controller is fine with performing a redraw operation or false if it
      * would prefer that the action didn't take place.
@@ -105,18 +123,6 @@ public class GeckoLayerClient implements PanZoomTarget {
         return DisplayPortCalculator.aboutToCheckerboard(mViewportMetrics, mPanZoomController.getVelocityVector(), getDisplayPort());
     }
 
-    Layer getRoot() {
-        return mIsReady ? mRootLayer : null;
-    }
-
-    Layer getLowResLayer() {
-        return mIsReady ? mLowResLayer : null;
-    }
-
-    public LayerView getView() {
-        return mView;
-    }
-
     /**
      * The view calls this function to indicate that the viewport changed size. It must hold the
      * monitor while calling it.
@@ -243,16 +249,19 @@ public class GeckoLayerClient implements PanZoomTarget {
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public ImmutableViewportMetrics getViewportMetrics() {
         return mViewportMetrics;
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public ZoomConstraints getZoomConstraints() {
         return mZoomConstraints;
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public void setAnimationTarget(ImmutableViewportMetrics viewport) {
         if (mIsReady) {
             // We know what the final viewport of the animation is going to be, so
@@ -267,6 +276,7 @@ public class GeckoLayerClient implements PanZoomTarget {
     /** Implementation of PanZoomTarget
      * You must hold the monitor while calling this.
      */
+    @Override
     public void setViewportMetrics(ImmutableViewportMetrics viewport) {
         mViewportMetrics = viewport;
         mView.requestRender();
@@ -276,6 +286,7 @@ public class GeckoLayerClient implements PanZoomTarget {
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public void forceRedraw() {
         mForceRedraw = true;
         if (mIsReady) {
@@ -284,11 +295,13 @@ public class GeckoLayerClient implements PanZoomTarget {
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public boolean post(Runnable action) {
         return mView.post(action);
     }
 
     /** Implementation of PanZoomTarget */
+    @Override
     public Object getLock() {
         return this;
     }
@@ -305,19 +318,12 @@ public class GeckoLayerClient implements PanZoomTarget {
         return layerPoint;
     }
 
+    /** Implementation of PanZoomTarget */
     @Override
     public boolean isFullScreen() {
         return false;
     }
 
-    public void destroy() {
-        mPanZoomController.destroy();
-    }
-
-    public Context getContext() {
-        return mContext;
-    }
-
     public void zoomTo(RectF rect) {
         if (mPanZoomController instanceof JavaPanZoomController) {
             ((JavaPanZoomController) mPanZoomController).animatedZoomTo(rect);