Backed out changeset 4f5a93b89b2b (bug 1344892) for Mochitest rc4 failures in Android

2017-03-15 17:37:39 +08:00
parent 7b14b71848
commit 87d8f82bc0
17 changed files with 74 additions and 67 deletions
--- a/widget/android/nsAppShell.cpp
+++ b/widget/android/nsAppShell.cpp
@@ -254,6 +254,20 @@ public:
        MOZ_CRASH("Uncaught Java exception");
    }

+    static void SyncNotifyObservers(jni::String::Param aTopic,
+                                    jni::String::Param aData)
+    {
+        MOZ_RELEASE_ASSERT(NS_IsMainThread());
+        NotifyObservers(aTopic, aData);
+    }
+
+    template<typename Functor>
+    static void OnNativeCall(Functor&& aCall)
+    {
+        MOZ_ASSERT(aCall.IsTarget(&NotifyObservers));
+        NS_DispatchToMainThread(NS_NewRunnableFunction(mozilla::Move(aCall)));
+    }
+
    static void NotifyObservers(jni::String::Param aTopic,
                                jni::String::Param aData)
    {