Bug 1180295 - Stop exposing the old LayerMarginsAnimator from LayerView. r=rbarker
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 18 Aug 2015 14:27:19 -0400
changeset 258270 76a30651e5b582567ed2f7ee4a7843f7b8bac68a
parent 258269 0ee26da22cfc08cd90eeeb6929f05a7ed07b3001
child 258271 d388bd547a70fb9e1a48df3c841110a5581080b2
push id29249
push userryanvm@gmail.com
push dateWed, 19 Aug 2015 11:17:27 +0000
treeherdermozilla-central@706b23a03d1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrbarker
bugs1180295
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1180295 - Stop exposing the old LayerMarginsAnimator from LayerView. r=rbarker
mobile/android/base/gfx/GeckoLayerClient.java
mobile/android/base/gfx/LayerView.java
--- a/mobile/android/base/gfx/GeckoLayerClient.java
+++ b/mobile/android/base/gfx/GeckoLayerClient.java
@@ -230,20 +230,16 @@ class GeckoLayerClient implements LayerV
             GeckoAppShell.viewSizeChanged();
         }
     }
 
     PanZoomController getPanZoomController() {
         return mPanZoomController;
     }
 
-    LayerMarginsAnimator getLayerMarginsAnimator() {
-        return mMarginsAnimator;
-    }
-
     DynamicToolbarAnimator getDynamicToolbarAnimator() {
         return mToolbarAnimator;
     }
 
     /* Informs Gecko that the screen size has changed. */
     private void sendResizeEventIfNecessary(boolean force) {
         DisplayMetrics metrics = mContext.getResources().getDisplayMetrics();
 
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -49,17 +49,16 @@ import android.widget.FrameLayout;
 /**
  * A view rendered by the layer compositor.
  */
 public class LayerView extends FrameLayout implements Tabs.OnTabsChangedListener {
     private static final String LOGTAG = "GeckoLayerView";
 
     private GeckoLayerClient mLayerClient;
     private PanZoomController mPanZoomController;
-    private LayerMarginsAnimator mMarginsAnimator;
     private DynamicToolbarAnimator mToolbarAnimator;
     private final GLController mGLController;
     private InputConnectionHandler mInputConnectionHandler;
     private LayerRenderer mRenderer;
     /* Must be a PAINT_xxx constant */
     private int mPaintState;
     private int mBackgroundColor;
     private FullScreenState mFullScreenState;
@@ -125,17 +124,16 @@ public class LayerView extends FrameLayo
 
     public void initializeView(EventDispatcher eventDispatcher) {
         mLayerClient = new GeckoLayerClient(getContext(), this, eventDispatcher);
         if (mOverscroll != null) {
             mLayerClient.setOverscrollHandler(mOverscroll);
         }
 
         mPanZoomController = mLayerClient.getPanZoomController();
-        mMarginsAnimator = mLayerClient.getLayerMarginsAnimator();
         mToolbarAnimator = mLayerClient.getDynamicToolbarAnimator();
 
         mRenderer = new LayerRenderer(this);
         mInputConnectionHandler = null;
 
         setFocusable(true);
         setFocusableInTouchMode(true);
 
@@ -297,17 +295,16 @@ public class LayerView extends FrameLayo
         }
     }
 
     // Don't expose GeckoLayerClient to things outside this package; only expose it as an Object
     GeckoLayerClient getLayerClient() { return mLayerClient; }
     public Object getLayerClientObject() { return mLayerClient; }
 
     public PanZoomController getPanZoomController() { return mPanZoomController; }
-    public LayerMarginsAnimator getLayerMarginsAnimator() { return mMarginsAnimator; }
     public DynamicToolbarAnimator getDynamicToolbarAnimator() { return mToolbarAnimator; }
 
     public ImmutableViewportMetrics getViewportMetrics() {
         return mLayerClient.getViewportMetrics();
     }
 
     public void abortPanning() {
         if (mPanZoomController != null) {