Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 741400 - Guard against NullPointerException, and also move some code so it shouldn't happen. r=mfinkle

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-04-04 11:55:40 -04:00
parent 23b8ec9661
commit cae6397b6a
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/android/base/GeckoApp.java
View File

@ -2766,6 +2766,15 @@ abstract public class GeckoApp
private void connectGeckoLayerClient() {
LayerController layerController = getLayerController();
layerController.setLayerClient(mLayerClient);
layerController.setOnTouchListener(new View.OnTouchListener() {
public boolean onTouch(View view, MotionEvent event) {
if (event == null)
return true;
GeckoAppShell.sendEventToGecko(GeckoEvent.createMotionEvent(event));
return true;
}
});
}
public class GeckoAppHandler extends Handler {

10
mobile/android/base/GeckoAppShell.java
View File

@ -469,16 +469,6 @@ public class GeckoAppShell
final LayerController layerController = GeckoApp.mAppContext.getLayerController();
LayerView v = layerController.getView();
mInputConnection = v.setInputConnectionHandler();
layerController.setOnTouchListener(new View.OnTouchListener() {
public boolean onTouch(View view, MotionEvent event) {
if (event == null)
return true;
GeckoAppShell.sendEventToGecko(GeckoEvent.createMotionEvent(event));
return true;
}
});
layerController.notifyLayerClientOfGeometryChange();
}

4
mobile/android/base/gfx/LayerController.java
View File

@ -343,6 +343,10 @@ public class LayerController implements Tabs.OnTabsChangedListener {
* correct.
*/
public PointF convertViewPointToLayerPoint(PointF viewPoint) {
if (mLayerClient == null) {
return null;
}
ImmutableViewportMetrics viewportMetrics = mViewportMetrics;
PointF origin = viewportMetrics.getOrigin();
float zoom = viewportMetrics.zoomFactor;