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 1253703 - Null-check createNativeGestureEvent result; r=kats a=sylvestre

Browse Source 
createNativeGestureEvent can fail and return null, so we should guard
against that.

MozReview-Commit-ID: 8V0zMiOzKnG
This commit is contained in:
Jim Chen 2016-03-11 13:47:22 -05:00
parent 32a8933cad
commit 31eb63011e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/android/base/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
View File

@ -1169,7 +1169,11 @@ class JavaPanZoomController
mLastZoomFocus = new PointF(detector.getFocusX(), detector.getFocusY());
cancelTouch();
GeckoAppShell.sendEventToGecko(GeckoEvent.createNativeGestureEvent(GeckoEvent.ACTION_MAGNIFY_START, mLastZoomFocus, getMetrics().zoomFactor));
final GeckoEvent event = GeckoEvent.createNativeGestureEvent(
GeckoEvent.ACTION_MAGNIFY_START, mLastZoomFocus, getMetrics().zoomFactor);
if (event != null) {
GeckoAppShell.sendEventToGecko(event);
}
return true;
}
@ -1202,8 +1206,11 @@ class JavaPanZoomController
mTarget.setViewportMetrics(target);
}
GeckoEvent event = GeckoEvent.createNativeGestureEvent(GeckoEvent.ACTION_MAGNIFY, mLastZoomFocus, getMetrics().zoomFactor);
GeckoAppShell.sendEventToGecko(event);
final GeckoEvent event = GeckoEvent.createNativeGestureEvent(
GeckoEvent.ACTION_MAGNIFY, mLastZoomFocus, getMetrics().zoomFactor);
if (event != null) {
GeckoAppShell.sendEventToGecko(event);
}
return true;
}