Bug 1317604 - 3. Don't create EventDispatcher when JNI is not availab…

…le; r=me Follow-up to not create the global EventDispatcher in AndroidBridge when JNI is not available.
dothq · Nov 21, 2016 · dd02faa · dd02faa
1 parent 5db79d7
commit dd02faa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
@@ -738,10 +738,12 @@ NS_IMPL_ISUPPORTS(nsAndroidBridge, nsIAndroidEventDispatcher, nsIAndroidBridge)
 
 nsAndroidBridge::nsAndroidBridge()
 {
-  RefPtr<widget::EventDispatcher> dispatcher = new widget::EventDispatcher();
-  dispatcher->Attach(java::EventDispatcher::GetInstance(),
-                     /* window */ nullptr);
-  mEventDispatcher = dispatcher;
+  if (jni::IsAvailable()) {
+    RefPtr<widget::EventDispatcher> dispatcher = new widget::EventDispatcher();
+    dispatcher->Attach(java::EventDispatcher::GetInstance(),
+                       /* window */ nullptr);
+    mEventDispatcher = dispatcher;
+  }
 
   AddObservers();
 }

diff --git a/widget/android/AndroidBridge.h b/widget/android/AndroidBridge.h
@@ -403,7 +403,7 @@ class nsAndroidBridge final : public nsIAndroidBridge,
   NS_DECL_NSIANDROIDBRIDGE
   NS_DECL_NSIOBSERVER
 
-  NS_FORWARD_NSIANDROIDEVENTDISPATCHER(mEventDispatcher->)
+  NS_FORWARD_SAFE_NSIANDROIDEVENTDISPATCHER(mEventDispatcher)
 
   nsAndroidBridge();