Bug 1257319 - Update auto-generated bindings; r=me
☠☠ backed out by 88dbd01499c0 ☠ ☠
authorJim Chen <nchen@mozilla.com>
Tue, 22 Mar 2016 22:24:31 -0400
changeset 290023 bba3d09859d65d4123d912878b4a0d2ac776c252
parent 290022 0b0b229e5968956b237f74013b44c54bd07d6a36
child 290024 3e80b5052d0b33bdbdeb7b670d38bfeea03ac7ae
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1257319
milestone48.0a1
Bug 1257319 - Update auto-generated bindings; r=me Update auto-generated bindings. The jni-stubs.inc change is due to the fact that we still have old-style native methods in GeckoAppShell.
mozglue/android/jni-stubs.inc
widget/android/GeneratedJNINatives.h
widget/android/GeneratedJNIWrappers.cpp
widget/android/GeneratedJNIWrappers.h
--- a/mozglue/android/jni-stubs.inc
+++ b/mozglue/android/jni-stubs.inc
@@ -224,31 +224,50 @@ Java_org_mozilla_gecko_GeckoAppShell_not
 #endif
 
 #ifdef JNI_BINDINGS
   xul_dlsym("Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoOfEvent", &f_Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoOfEvent);
 #endif
 
 #ifdef JNI_STUBS
 
-typedef void (*Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers_t)(JNIEnv *, jclass, jstring, jstring);
-static Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers_t f_Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers;
+typedef void (*Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers_t)(JNIEnv *, jclass, jstring, jstring);
+static Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers_t f_Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers;
 extern "C" NS_EXPORT void MOZ_JNICALL
-Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers(JNIEnv * arg0, jclass arg1, jstring arg2, jstring arg3) {
-    if (!f_Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers) {
+Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers(JNIEnv * arg0, jclass arg1, jstring arg2, jstring arg3) {
+    if (!f_Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers) {
         arg0->ThrowNew(arg0->FindClass("java/lang/UnsupportedOperationException"),
                        "JNI Function called before it was loaded");
         return ;
     }
-     f_Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers(arg0, arg1, arg2, arg3);
+     f_Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers(arg0, arg1, arg2, arg3);
 }
 #endif
 
 #ifdef JNI_BINDINGS
-  xul_dlsym("Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers", &f_Java_org_mozilla_gecko_GeckoAppShell_notifyGeckoObservers);
+  xul_dlsym("Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers", &f_Java_org_mozilla_gecko_GeckoAppShell_syncNotifyObservers);
+#endif
+
+#ifdef JNI_STUBS
+
+typedef void (*Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers_t)(JNIEnv *, jclass, jstring, jstring);
+static Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers_t f_Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers;
+extern "C" NS_EXPORT void MOZ_JNICALL
+Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers(JNIEnv * arg0, jclass arg1, jstring arg2, jstring arg3) {
+    if (!f_Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers) {
+        arg0->ThrowNew(arg0->FindClass("java/lang/UnsupportedOperationException"),
+                       "JNI Function called before it was loaded");
+        return ;
+    }
+     f_Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers(arg0, arg1, arg2, arg3);
+}
+#endif
+
+#ifdef JNI_BINDINGS
+  xul_dlsym("Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers", &f_Java_org_mozilla_gecko_GeckoAppShell_nativeNotifyObservers);
 #endif
 
 #ifdef JNI_STUBS
 
 typedef jlong (*Java_org_mozilla_gecko_GeckoAppShell_runUiThreadCallback_t)(JNIEnv *, jclass);
 static Java_org_mozilla_gecko_GeckoAppShell_runUiThreadCallback_t f_Java_org_mozilla_gecko_GeckoAppShell_runUiThreadCallback;
 extern "C" NS_EXPORT jlong MOZ_JNICALL
 Java_org_mozilla_gecko_GeckoAppShell_runUiThreadCallback(JNIEnv * arg0, jclass arg1) {
--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -47,16 +47,35 @@ public:
                 ::template Wrap<&Impl::NotifyAlarmFired>)
     };
 };
 
 template<class Impl>
 constexpr JNINativeMethod AlarmReceiver::Natives<Impl>::methods[];
 
 template<class Impl>
+class GeckoAppShell::Natives : public mozilla::jni::NativeImpl<GeckoAppShell, Impl>
+{
+public:
+    static constexpr JNINativeMethod methods[] = {
+
+        mozilla::jni::MakeNativeMethod<GeckoAppShell::NotifyObservers_t>(
+                mozilla::jni::NativeStub<GeckoAppShell::NotifyObservers_t, Impl>
+                ::template Wrap<&Impl::NotifyObservers>),
+
+        mozilla::jni::MakeNativeMethod<GeckoAppShell::SyncNotifyObservers_t>(
+                mozilla::jni::NativeStub<GeckoAppShell::SyncNotifyObservers_t, Impl>
+                ::template Wrap<&Impl::SyncNotifyObservers>)
+    };
+};
+
+template<class Impl>
+constexpr JNINativeMethod GeckoAppShell::Natives<Impl>::methods[];
+
+template<class Impl>
 class GeckoEditable::Natives : public mozilla::jni::NativeImpl<GeckoEditable, Impl>
 {
 public:
     static constexpr JNINativeMethod methods[] = {
 
         mozilla::jni::MakeNativeMethod<GeckoEditable::DisposeNative_t>(
                 mozilla::jni::NativeStub<GeckoEditable::DisposeNative_t, Impl>
                 ::template Wrap<&Impl::DisposeNative>),
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -549,16 +549,19 @@ auto GeckoAppShell::MarkURIVisited(mozil
 constexpr char GeckoAppShell::MoveTaskToBack_t::name[];
 constexpr char GeckoAppShell::MoveTaskToBack_t::signature[];
 
 auto GeckoAppShell::MoveTaskToBack() -> void
 {
     return mozilla::jni::Method<MoveTaskToBack_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
+constexpr char GeckoAppShell::NotifyObservers_t::name[];
+constexpr char GeckoAppShell::NotifyObservers_t::signature[];
+
 constexpr char GeckoAppShell::NetworkLinkType_t::name[];
 constexpr char GeckoAppShell::NetworkLinkType_t::signature[];
 
 auto GeckoAppShell::NetworkLinkType() -> int32_t
 {
     return mozilla::jni::Method<NetworkLinkType_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
@@ -701,16 +704,19 @@ auto GeckoAppShell::StartMonitoringGamep
 constexpr char GeckoAppShell::StopMonitoringGamepad_t::name[];
 constexpr char GeckoAppShell::StopMonitoringGamepad_t::signature[];
 
 auto GeckoAppShell::StopMonitoringGamepad() -> void
 {
     return mozilla::jni::Method<StopMonitoringGamepad_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
+constexpr char GeckoAppShell::SyncNotifyObservers_t::name[];
+constexpr char GeckoAppShell::SyncNotifyObservers_t::signature[];
+
 constexpr char GeckoAppShell::UnlockProfile_t::name[];
 constexpr char GeckoAppShell::UnlockProfile_t::signature[];
 
 auto GeckoAppShell::UnlockProfile() -> bool
 {
     return mozilla::jni::Method<UnlockProfile_t>::Call(GeckoAppShell::Context(), nullptr);
 }
 
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -1139,16 +1139,31 @@ public:
                 "()V";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto MoveTaskToBack() -> void;
 
+    struct NotifyObservers_t {
+        typedef GeckoAppShell Owner;
+        typedef void ReturnType;
+        typedef void SetterType;
+        typedef mozilla::jni::Args<
+                mozilla::jni::String::Param,
+                mozilla::jni::String::Param> Args;
+        static constexpr char name[] = "nativeNotifyObservers";
+        static constexpr char signature[] =
+                "(Ljava/lang/String;Ljava/lang/String;)V";
+        static const bool isStatic = true;
+        static const mozilla::jni::ExceptionMode exceptionMode =
+                mozilla::jni::ExceptionMode::ABORT;
+    };
+
     struct NetworkLinkType_t {
         typedef GeckoAppShell Owner;
         typedef int32_t ReturnType;
         typedef int32_t SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "networkLinkType";
         static constexpr char signature[] =
                 "()I";
@@ -1455,16 +1470,31 @@ public:
                 "()V";
         static const bool isStatic = true;
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto StopMonitoringGamepad() -> void;
 
+    struct SyncNotifyObservers_t {
+        typedef GeckoAppShell Owner;
+        typedef void ReturnType;
+        typedef void SetterType;
+        typedef mozilla::jni::Args<
+                mozilla::jni::String::Param,
+                mozilla::jni::String::Param> Args;
+        static constexpr char name[] = "syncNotifyObservers";
+        static constexpr char signature[] =
+                "(Ljava/lang/String;Ljava/lang/String;)V";
+        static const bool isStatic = true;
+        static const mozilla::jni::ExceptionMode exceptionMode =
+                mozilla::jni::ExceptionMode::ABORT;
+    };
+
     struct UnlockProfile_t {
         typedef GeckoAppShell Owner;
         typedef bool ReturnType;
         typedef bool SetterType;
         typedef mozilla::jni::Args<> Args;
         static constexpr char name[] = "unlockProfile";
         static constexpr char signature[] =
                 "()Z";
@@ -1536,16 +1566,17 @@ public:
         static const mozilla::jni::ExceptionMode exceptionMode =
                 mozilla::jni::ExceptionMode::ABORT;
     };
 
     static auto VibrateA(mozilla::jni::LongArray::Param, int32_t) -> void;
 
     static const bool isMultithreaded = true;
 
+    template<class Impl> class Natives;
 };
 
 class GeckoEditable : public mozilla::jni::ObjectBase<GeckoEditable, jobject>
 {
 public:
     explicit GeckoEditable(const Context& ctx) : ObjectBase<GeckoEditable, jobject>(ctx) {}
 
     struct New_t {