Commit e685c4ed authored by Kartikaya Gupta's avatar Kartikaya Gupta
Browse files

Bug 742019 - Rewrite how we handle touch events so we don't break panning, and... 

Bug 742019 - Rewrite how we handle touch events so we don't break panning, and don't introduce unnecessary latency. r=wesj
parent 218ff032

embedding/android/GeckoAppShell.java

+1 −1
Original line number Diff line number Diff line
@@ -1846,7 +1846,7 @@ public class GeckoAppShell 
    }



    // This is only used in Native Fennec.

    public static void setPreventPanning(final boolean aPreventPanning) { }

    public static void notifyDefaultPrevented(boolean defaultPrevented) { }



    public static short getScreenOrientation() {

        return GeckoScreenOrientationListener.getInstance().getScreenOrientation();

mobile/android/base/GeckoApp.java

+2 −2
Original line number Diff line number Diff line
@@ -991,7 +991,7 @@ abstract public class GeckoApp 
                if (Tabs.getInstance().isSelectedTab(tab)) {

                    mMainHandler.post(new Runnable() {

                        public void run() {

                            mLayerController.setWaitForTouchListeners(true);

                            mLayerController.getView().getTouchEventHandler().setWaitForTouchListeners(true);

                        }

                    });

                }
@@ -2805,7 +2805,7 @@ abstract public class GeckoApp 
        LayerController layerController = getLayerController();

        layerController.setLayerClient(mLayerClient);



        layerController.setOnTouchListener(new View.OnTouchListener() {

        layerController.getView().getTouchEventHandler().setOnTouchListener(new View.OnTouchListener() {

            public boolean onTouch(View view, MotionEvent event) {

                if (event == null)

                    return true;

mobile/android/base/GeckoAppShell.java

+3 −3
Original line number Diff line number Diff line
@@ -1201,11 +1201,11 @@ public class GeckoAppShell 
        });

    }



    public static void setPreventPanning(final boolean aPreventPanning) {

    public static void notifyDefaultPrevented(final boolean defaultPrevented) {

        getMainHandler().post(new Runnable() {

            public void run() {

                LayerController layerController = GeckoApp.mAppContext.getLayerController();

                layerController.preventPanning(aPreventPanning);

                LayerView view = GeckoApp.mAppContext.getLayerController().getView();

                view.getTouchEventHandler().handleEventListenerAction(!defaultPrevented);

            }

        });

    }

mobile/android/base/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ FENNEC_JAVA_FILES = \ 
  gfx/TextureGenerator.java \

  gfx/TextureReaper.java \

  gfx/TileLayer.java \

  gfx/TouchEventHandler.java \

  gfx/ViewTransform.java \

  gfx/ViewportMetrics.java \

  gfx/VirtualLayer.java \

mobile/android/base/gfx/LayerController.java

+2 −113
Original line number Diff line number Diff line
@@ -38,33 +38,20 @@ 


package org.mozilla.gecko.gfx;



import org.mozilla.gecko.gfx.IntSize;

import org.mozilla.gecko.gfx.Layer;

import org.mozilla.gecko.ui.PanZoomController;

import org.mozilla.gecko.ui.SimpleScaleGestureDetector;

import org.mozilla.gecko.GeckoApp;

import org.mozilla.gecko.GeckoEvent;

import org.mozilla.gecko.Tabs;

import org.mozilla.gecko.Tab;

import android.content.Context;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.Color;

import android.graphics.Matrix;

import android.graphics.Point;

import android.graphics.PointF;

import android.graphics.Rect;

import android.graphics.RectF;

import android.util.Log;

import android.view.MotionEvent;

import android.view.GestureDetector;

import android.view.ScaleGestureDetector;

import android.view.View.OnTouchListener;

import android.view.ViewConfiguration;

import java.lang.Math;

import java.util.Timer;

import java.util.TimerTask;

import java.util.regex.Matcher;

import java.util.regex.Pattern;
@@ -75,7 +62,7 @@ import java.util.regex.Pattern; 
 *

 * Many methods require that the monitor be held, with a synchronized (controller) { ... } block.

 */

public class LayerController implements Tabs.OnTabsChangedListener {

public class LayerController {

    private static final String LOGTAG = "GeckoLayerController";



    private Layer mRootLayer;                   /* The root layer. */
@@ -95,15 +82,12 @@ public class LayerController implements Tabs.OnTabsChangedListener { 
     *    fields. */

    private volatile ImmutableViewportMetrics mViewportMetrics;   /* The current viewport metrics. */



    private boolean mWaitForTouchListeners;



    private PanZoomController mPanZoomController;

    /*

     * The panning and zooming controller, which interprets pan and zoom gestures for us and

     * updates our visible rect appropriately.

     */

    private PanZoomController mPanZoomController;



    private OnTouchListener mOnTouchListener;       /* The touch listener. */

    private GeckoLayerClient mLayerClient;          /* The layer client. */



    /* The new color for the checkerboard. */
@@ -112,14 +96,6 @@ public class LayerController implements Tabs.OnTabsChangedListener { 


    private boolean mForceRedraw;



    /* The time limit for pages to respond with preventDefault on touchevents

     * before we begin panning the page */

    private int mTimeout = 200;



    private boolean allowDefaultActions = true;

    private Timer allowDefaultTimer =  null;

    private PointF initialTouchLocation = null;



    private static Pattern sColorPattern;



    public LayerController(Context context) {
@@ -130,14 +106,6 @@ public class LayerController implements Tabs.OnTabsChangedListener { 
        mPanZoomController = new PanZoomController(this);

        mView = new LayerView(context, this);

        mCheckerboardShouldShowChecks = true;



        Tabs.registerOnTabsChangedListener(this);



        mTimeout = ViewConfiguration.getLongPressTimeout();

    }



    public void onDestroy() {

        Tabs.unregisterOnTabsChangedListener(this);

    }



    public void setRoot(Layer layer) { mRootLayer = layer; }
@@ -293,10 +261,6 @@ public class LayerController implements Tabs.OnTabsChangedListener { 


    public boolean post(Runnable action) { return mView.post(action); }



    public void setOnTouchListener(OnTouchListener onTouchListener) {

        mOnTouchListener = onTouchListener;

    }



    /**

     * The view as well as the controller itself use this method to notify the layer client that

     * the geometry changed.
@@ -366,81 +330,6 @@ public class LayerController implements Tabs.OnTabsChangedListener { 
        return layerPoint;

    }



    /*

     * Gesture detection. This is handled only at a high level in this class; we dispatch to the

     * pan/zoom controller to do the dirty work.

     */

    public boolean onTouchEvent(MotionEvent event) {

        int action = event.getAction();

        PointF point = new PointF(event.getX(), event.getY());



        // this will only match the first touchstart in a series

        if ((action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_DOWN) {

            initialTouchLocation = point;

            allowDefaultActions = !mWaitForTouchListeners;



            // if we have a timer, this may be a double tap,

            // cancel the current timer but don't clear the event queue

            if (allowDefaultTimer != null) {

              allowDefaultTimer.cancel();

            } else {

              // if we don't have a timer, make sure we remove any old events

              mView.clearEventQueue();

            }

            allowDefaultTimer = new Timer();

            allowDefaultTimer.schedule(new TimerTask() {

                public void run() {

                    post(new Runnable() {

                        public void run() {

                            preventPanning(false);

                        }

                    });

                }

            }, mTimeout);

        }



        // After the initial touch, ignore touch moves until they exceed a minimum distance.

        if (initialTouchLocation != null && (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_MOVE) {

            if (PointUtils.subtract(point, initialTouchLocation).length() > PanZoomController.PAN_THRESHOLD) {

                initialTouchLocation = null;

            } else {

                return !allowDefaultActions;

            }

        }



        // send the event to content

        if (mOnTouchListener != null)

            mOnTouchListener.onTouch(mView, event);



        return !allowDefaultActions;

    }



    public void preventPanning(boolean aValue) {

        if (allowDefaultTimer != null) {

            allowDefaultTimer.cancel();

            allowDefaultTimer = null;

        }

        if (aValue == allowDefaultActions) {

            allowDefaultActions = !aValue;

    

            if (aValue) {

                mView.clearEventQueue();

                mPanZoomController.cancelTouch();

            } else {

                mView.processEventQueue();

            }

        }

    }



    public void onTabChanged(Tab tab, Tabs.TabEvents msg) {

        if ((Tabs.getInstance().isSelectedTab(tab) && msg == Tabs.TabEvents.STOP) || msg == Tabs.TabEvents.SELECTED) {

            mWaitForTouchListeners = tab.getHasTouchListeners();

        }

    }

    public void setWaitForTouchListeners(boolean aValue) {

        mWaitForTouchListeners = aValue;

    }



    /** Retrieves whether we should show checkerboard checks or not. */

    public boolean checkerboardShouldShowChecks() {

        return mCheckerboardShouldShowChecks;