diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-02-15 15:14:44 +0900 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-23 10:10:20 +0100 |
commit | b21fd935d9b79ec494d553429eb357581b68bddb (patch) | |
tree | 9424b32530b6ccc9234597753df22d4294fbdbd2 | |
parent | c207e6cd5807355c1dbd23f662d1106b9e23dacc (diff) |
android: cleanup more in LayerClient
Change-Id: I2ea316c9f63343290da59df7f07433e38db974c3
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java | 13 | ||||
-rw-r--r-- | android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java | 1 |
2 files changed, 2 insertions, 12 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 6fdfc8b540f5..ea729a5265f1 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 @@ -34,12 +34,6 @@ public class GeckoLayerClient implements PanZoomTarget { private ComposedTileLayer mLowResLayer; private ComposedTileLayer mRootLayer; - /* - * The viewport metrics being used to draw the current frame. This is only - * accessed by the compositor thread, and so needs no synchronisation. - */ - private ImmutableViewportMetrics mFrameMetrics; - private boolean mForceRedraw; /* The current viewport metrics. @@ -58,10 +52,7 @@ public class GeckoLayerClient implements PanZoomTarget { private ZoomConstraints mZoomConstraints; - private boolean mIsReady ; - - /* The new color for the checkerboard. */ - private int mCheckerboardColor; + private boolean mIsReady; private PanZoomController mPanZoomController; private LayerView mView; @@ -94,6 +85,7 @@ public class GeckoLayerClient implements PanZoomTarget { mLayerRenderer = new LayerRenderer(mView); mView.setLayerRenderer(mLayerRenderer); + sendResizeEventIfNecessary(); } @@ -110,7 +102,6 @@ public class GeckoLayerClient implements PanZoomTarget { if (!mPanZoomController.getRedrawHint()) { return false; } - return DisplayPortCalculator.aboutToCheckerboard(mViewportMetrics, mPanZoomController.getVelocityVector(), getDisplayPort()); } 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 b401fd4c90a4..3f0fb785233b 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 @@ -182,7 +182,6 @@ public class LayerView extends FrameLayout { public GeckoLayerClient getLayerClient() { return mLayerClient; } public PanZoomController getPanZoomController() { return mPanZoomController; } - /** The LayerRenderer calls this to indicate that the window has changed size. */ public void setViewportSize(IntSize size) { mLayerClient.setViewportSize(new FloatSize(size)); } |