mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Bug 741400 - Guard against NullPointerException, and also move some code so it shouldn't happen. r=mfinkle
This commit is contained in:
parent
23b8ec9661
commit
cae6397b6a
@ -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 {
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user