Bug 719309 - Follow up. Rename a variable. r=mfinkle
authorWes Johnston <wjohnston@mozilla.com>
Wed, 25 Jan 2012 01:41:02 +0100
changeset 86522 ba99528f5f117303c1421eed48f5fbb49792cc88
parent 86521 f684bc45535353b3648aaa5e7d33fb799a8dcaff
child 86523 4b3f1baa77fc62db3c6be54a7a939b0722d04a22
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs719309
milestone12.0a1
Bug 719309 - Follow up. Rename a variable. r=mfinkle
mobile/android/base/gfx/LayerView.java
--- a/mobile/android/base/gfx/LayerView.java
+++ b/mobile/android/base/gfx/LayerView.java
@@ -72,17 +72,17 @@ public class LayerView extends GLSurface
     private LayerRenderer mRenderer;
     private GestureDetector mGestureDetector;
     private SimpleScaleGestureDetector mScaleGestureDetector;
     private long mRenderTime;
     private boolean mRenderTimeReset;
     private static String LOGTAG = "GeckoLayerView";
     /* List of events to be processed if the page does not prevent them. Should only be touched on the main thread */
     private LinkedList<MotionEvent> mEventQueue = new LinkedList<MotionEvent>();
-    private boolean sendTouchEvents = false;
+    private boolean touchEventsEnabled = false;
     private String touchEventsPrefName = "dom.w3c_touch_events.enabled";
 
     public LayerView(Context context, LayerController controller) {
         super(context);
 
         mContext = context;
         mController = controller;
         mRenderer = new LayerRenderer(this);
@@ -107,17 +107,17 @@ public class LayerView extends GLSurface
     public void handleMessage(String event, JSONObject message) {
         if (event.equals("Preferences:Data")) {
             try {
                 JSONArray jsonPrefs = message.getJSONArray("preferences");
                 for (int i = 0; i < jsonPrefs.length(); i++) {
                     JSONObject jPref = jsonPrefs.getJSONObject(i);
                     final String prefName = jPref.getString("name");
                     if (prefName.equals(touchEventsPrefName)) {
-                        sendTouchEvents = jPref.getBoolean("value");
+                        touchEventsEnabled = jPref.getBoolean("value");
                         GeckoAppShell.unregisterGeckoEventListener("Preferences:Data", this);
                     }
                 }
             } catch(JSONException ex) {
                 Log.e(LOGTAG, "Error decoding JSON", ex);
             }
         }
     }
@@ -136,17 +136,17 @@ public class LayerView extends GLSurface
     }
 
     public void clearEventQueue() {
         mEventQueue.clear();
     }
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        if (sendTouchEvents && mController.onTouchEvent(event)) {
+        if (touchEventsEnabled && mController.onTouchEvent(event)) {
             addToEventQueue(event);
             return true;
         }
         return processEvent(event);
     }
 
     private boolean processEvent(MotionEvent event) {
         if (mGestureDetector.onTouchEvent(event))