From 5b302ab8f202464a28a46eaf35f844b0a1aa2c0a Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Fri, 8 Feb 2013 09:11:37 -0500 Subject: [PATCH] Bug 777468 - Remove unneeded dependency on PanZoomController. r=Cwiiis --- mobile/android/base/ui/PanZoomController.java | 2 +- mobile/android/base/ui/SubdocumentScrollHelper.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mobile/android/base/ui/PanZoomController.java b/mobile/android/base/ui/PanZoomController.java index 78ad036977a..3842813ede8 100644 --- a/mobile/android/base/ui/PanZoomController.java +++ b/mobile/android/base/ui/PanZoomController.java @@ -99,7 +99,7 @@ public class PanZoomController public PanZoomController(PanZoomTarget target, EventDispatcher eventDispatcher) { mTarget = target; - mSubscroller = new SubdocumentScrollHelper(this, eventDispatcher); + mSubscroller = new SubdocumentScrollHelper(eventDispatcher); mX = new AxisX(mSubscroller); mY = new AxisY(mSubscroller); diff --git a/mobile/android/base/ui/SubdocumentScrollHelper.java b/mobile/android/base/ui/SubdocumentScrollHelper.java index d4ecb3a06a4..6c594a7b118 100644 --- a/mobile/android/base/ui/SubdocumentScrollHelper.java +++ b/mobile/android/base/ui/SubdocumentScrollHelper.java @@ -25,7 +25,6 @@ class SubdocumentScrollHelper implements GeckoEventListener { private static String MESSAGE_SCROLL = "Gesture:Scroll"; private static String MESSAGE_SCROLL_ACK = "Gesture:ScrollAck"; - private final PanZoomController mPanZoomController; private final Handler mUiHandler; private final EventDispatcher mEventDispatcher; @@ -49,8 +48,7 @@ class SubdocumentScrollHelper implements GeckoEventListener { * the subdocument; we use this to decide when we have reached the end of the subdocument. */ private boolean mScrollSucceeded; - SubdocumentScrollHelper(PanZoomController controller, EventDispatcher eventDispatcher) { - mPanZoomController = controller; + SubdocumentScrollHelper(EventDispatcher eventDispatcher) { // mUiHandler will be bound to the UI thread since that's where this constructor runs mUiHandler = new Handler(); mPendingDisplacement = new PointF();