merge fx-team to mozilla-central a=merge

2014-09-30 15:10:47 +02:00
parent e5c1d14cef 08a74f88d6
commit bf64baf8a1
270 changed files with 5977 additions and 3593 deletions
--- a/mobile/android/base/gfx/JavaPanZoomController.java
+++ b/mobile/android/base/gfx/JavaPanZoomController.java
@@ -275,6 +275,11 @@ class JavaPanZoomController
            } else if (MESSAGE_TOUCH_LISTENER.equals(event)) {
                int tabId = message.getInt("tabID");
                final Tab tab = Tabs.getInstance().getTab(tabId);
+                // Make sure we still have a Tab
+                if (tab == null) {
+                    return;
+                }
+
                tab.setHasTouchListeners(true);
                mTarget.post(new Runnable() {
                    @Override