wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 713011 - Add a check to ensure we are running on the correct thread. r=blassey

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-01-11 17:08:14 -05:00
parent 6d315af78e
commit bb00f53b94
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/ui/PanZoomController.java
View File

@ -124,6 +124,8 @@ public class PanZoomController
private final Axis mX;
private final Axis mY;
private Thread mMainThread;
/* The timer that handles flings or bounces. */
private Timer mAnimationTimer;
/* The runnable being scheduled by the animation timer. */
@ -141,12 +143,23 @@ public class PanZoomController
mX = new AxisX(mSubscroller);
mY = new AxisY(mSubscroller);
mMainThread = GeckoApp.mAppContext.getMainLooper().getThread();
checkMainThread();
mState = PanZoomState.NOTHING;
GeckoAppShell.registerGeckoEventListener(MESSAGE_ZOOM_RECT, this);
GeckoAppShell.registerGeckoEventListener(MESSAGE_ZOOM_PAGE, this);
}
// for debugging bug 713011; it can be taken out once that is resolved.
private void checkMainThread() {
if (mMainThread != Thread.currentThread()) {
// log with full stack trace
Log.e(LOGTAG, "Uh-oh, we're running on the wrong thread!", new Exception());
}
}
public void handleMessage(String event, JSONObject message) {
Log.i(LOGTAG, "Got message: " + event);
try {
@ -198,6 +211,7 @@ public class PanZoomController
/** This function must be called from the UI thread. */
@SuppressWarnings("fallthrough")
public void abortAnimation() {
checkMainThread();
// this happens when gecko changes the viewport on us or if the device is rotated.
// if that's the case, abort any animation in progress and re-zoom so that the page
// snaps to edges. for other cases (where the user's finger(s) are down) don't do
@ -631,6 +645,8 @@ public class PanZoomController
}
private void finishAnimation() {
checkMainThread();
Log.d(LOGTAG, "Finishing animation at " + mController.getViewportMetrics());
stopAnimationTimer();