Bug 1116525 - Remove unused local variables in TextSelection, r=margaret
authorPierpaolo Calligaris <p.calligaris.code@gmail.com>
Mon, 05 Jan 2015 19:49:25 -0500
changeset 222227 121c15407fbdf9755828d1c9202cfa1882e40b9c
parent 222226 a2719cbe55bde9d5e50b7f892aa501bf434e0e90
child 222228 77c0488fa25d712dfc3f0d1fb9161e07cf2a2693
push id28060
push userryanvm@gmail.com
push dateTue, 06 Jan 2015 16:02:34 +0000
treeherdermozilla-central@b42615e51c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs1116525
milestone37.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 1116525 - Remove unused local variables in TextSelection, r=margaret
mobile/android/base/GeckoApp.java
mobile/android/base/TextSelection.java
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -1582,19 +1582,17 @@ public abstract class GeckoApp
         }
 
         mContactService = new ContactService(EventDispatcher.getInstance(), this);
 
         mPromptService = new PromptService(this);
 
         mTextSelection = new TextSelection((TextSelectionHandle) findViewById(R.id.anchor_handle),
                                            (TextSelectionHandle) findViewById(R.id.caret_handle),
-                                           (TextSelectionHandle) findViewById(R.id.focus_handle),
-                                           EventDispatcher.getInstance(),
-                                           this);
+                                           (TextSelectionHandle) findViewById(R.id.focus_handle));
 
         PrefsHelper.getPref("app.update.autodownload", new PrefsHelper.PrefHandlerBase() {
             @Override public void prefValue(String pref, String value) {
                 UpdateServiceHelper.registerForUpdates(GeckoApp.this, value);
             }
         });
 
         // Trigger the completion of the telemetry timer that wraps activity startup,
--- a/mobile/android/base/TextSelection.java
+++ b/mobile/android/base/TextSelection.java
@@ -34,17 +34,16 @@ import android.util.Log;
 import android.view.View;
 
 class TextSelection extends Layer implements GeckoEventListener {
     private static final String LOGTAG = "GeckoTextSelection";
 
     private final TextSelectionHandle anchorHandle;
     private final TextSelectionHandle caretHandle;
     private final TextSelectionHandle focusHandle;
-    private final EventDispatcher eventDispatcher;
 
     private final DrawListener mDrawListener;
     private boolean mDraggingHandles;
 
     private float mViewLeft;
     private float mViewTop;
     private float mViewZoom;
 
@@ -65,23 +64,20 @@ class TextSelection extends Layer implem
                 }
             });
         }
     };
     private ActionModeTimerTask mActionModeTimerTask;
 
     TextSelection(TextSelectionHandle anchorHandle,
                   TextSelectionHandle caretHandle,
-                  TextSelectionHandle focusHandle,
-                  EventDispatcher eventDispatcher,
-                  GeckoApp activity) {
+                  TextSelectionHandle focusHandle) {
         this.anchorHandle = anchorHandle;
         this.caretHandle = caretHandle;
         this.focusHandle = focusHandle;
-        this.eventDispatcher = eventDispatcher;
 
         mDrawListener = new DrawListener() {
             @Override
             public void drawFinished() {
                 if (!mDraggingHandles) {
                     GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("TextSelection:LayerReflow", ""));
                 }
             }