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 859962 - Guard against LayerView.getPanZoomController() returning null in BrowserApp. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta 2013-04-17 17:39:11 -04:00
parent 3dda6378db
commit 0ad0bde863
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mobile/android/base/BrowserApp.java
View File

@ -10,6 +10,7 @@ import org.mozilla.gecko.db.BrowserDB;
import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PanZoomController;
import org.mozilla.gecko.util.FloatUtils;
import org.mozilla.gecko.util.GamepadUtils;
import org.mozilla.gecko.util.HardwareUtils;
@ -338,9 +339,10 @@ abstract public class BrowserApp extends GeckoApp
action == MotionEvent.ACTION_CANCEL) {
// Animate the toolbar to fully on or off, depending on how much
// of it is hidden and the current swipe velocity.
PanZoomController pzc = mLayerView.getPanZoomController();
float yVelocity = (pzc == null ? 0.0f : pzc.getVelocityVector().y);
mBrowserToolbar.animateVisibilityWithVelocityBias(
toolbarY > toolbarHeight / 2 ? false : true,
mLayerView.getPanZoomController().getVelocityVector().y);
toolbarY > toolbarHeight / 2 ? false : true, yVelocity);
}
// Update the last recorded position.