author | Jim Chen <nchen@mozilla.com> |
Thu, 04 Aug 2016 09:16:05 -0400 | |
changeset 308204 | 86b4155ce94b3ac028dc4c62a62452f439e1a20b |
parent 308203 | c016f9d74449dbafc76c8bcd207c37794f72cb56 |
child 308205 | 40578d56c4ff22bb260209ee626372edd758de00 |
push id | 31092 |
push user | cbook@mozilla.com |
push date | Fri, 05 Aug 2016 10:16:59 +0000 |
treeherder | autoland@b97dd7dd3cb9 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me |
bugs | 1289208 |
milestone | 51.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/widget/android/GeneratedJNINatives.h +++ b/widget/android/GeneratedJNINatives.h @@ -47,16 +47,39 @@ template<class Impl> const JNINativeMethod AlarmReceiver::Natives<Impl>::methods[] = { mozilla::jni::MakeNativeMethod<AlarmReceiver::NotifyAlarmFired_t>( mozilla::jni::NativeStub<AlarmReceiver::NotifyAlarmFired_t, Impl> ::template Wrap<&Impl::NotifyAlarmFired>) }; template<class Impl> +class AndroidGamepadManager::Natives : public mozilla::jni::NativeImpl<AndroidGamepadManager, Impl> +{ +public: + static const JNINativeMethod methods[3]; +}; + +template<class Impl> +const JNINativeMethod AndroidGamepadManager::Natives<Impl>::methods[] = { + + mozilla::jni::MakeNativeMethod<AndroidGamepadManager::OnAxisChange_t>( + mozilla::jni::NativeStub<AndroidGamepadManager::OnAxisChange_t, Impl> + ::template Wrap<&Impl::OnAxisChange>), + + mozilla::jni::MakeNativeMethod<AndroidGamepadManager::OnButtonChange_t>( + mozilla::jni::NativeStub<AndroidGamepadManager::OnButtonChange_t, Impl> + ::template Wrap<&Impl::OnButtonChange>), + + mozilla::jni::MakeNativeMethod<AndroidGamepadManager::OnGamepadChange_t>( + mozilla::jni::NativeStub<AndroidGamepadManager::OnGamepadChange_t, Impl> + ::template Wrap<&Impl::OnGamepadChange>) +}; + +template<class Impl> class GeckoAppShell::Natives : public mozilla::jni::NativeImpl<GeckoAppShell, Impl> { public: static const JNINativeMethod methods[5]; }; template<class Impl> const JNINativeMethod GeckoAppShell::Natives<Impl>::methods[] = {
--- a/widget/android/GeneratedJNIWrappers.cpp +++ b/widget/android/GeneratedJNIWrappers.cpp @@ -23,16 +23,52 @@ constexpr char ANRReporter::RequestNativ constexpr char ANRReporter::RequestNativeStack_t::signature[]; const char AlarmReceiver::name[] = "org/mozilla/gecko/AlarmReceiver"; constexpr char AlarmReceiver::NotifyAlarmFired_t::name[]; constexpr char AlarmReceiver::NotifyAlarmFired_t::signature[]; +const char AndroidGamepadManager::name[] = + "org/mozilla/gecko/AndroidGamepadManager"; + +constexpr char AndroidGamepadManager::OnAxisChange_t::name[]; +constexpr char AndroidGamepadManager::OnAxisChange_t::signature[]; + +constexpr char AndroidGamepadManager::OnButtonChange_t::name[]; +constexpr char AndroidGamepadManager::OnButtonChange_t::signature[]; + +constexpr char AndroidGamepadManager::OnGamepadAdded_t::name[]; +constexpr char AndroidGamepadManager::OnGamepadAdded_t::signature[]; + +auto AndroidGamepadManager::OnGamepadAdded(int32_t a0, int32_t a1) -> void +{ + return mozilla::jni::Method<OnGamepadAdded_t>::Call(AndroidGamepadManager::Context(), nullptr, a0, a1); +} + +constexpr char AndroidGamepadManager::OnGamepadChange_t::name[]; +constexpr char AndroidGamepadManager::OnGamepadChange_t::signature[]; + +constexpr char AndroidGamepadManager::Start_t::name[]; +constexpr char AndroidGamepadManager::Start_t::signature[]; + +auto AndroidGamepadManager::Start() -> void +{ + return mozilla::jni::Method<Start_t>::Call(AndroidGamepadManager::Context(), nullptr); +} + +constexpr char AndroidGamepadManager::Stop_t::name[]; +constexpr char AndroidGamepadManager::Stop_t::signature[]; + +auto AndroidGamepadManager::Stop() -> void +{ + return mozilla::jni::Method<Stop_t>::Call(AndroidGamepadManager::Context(), nullptr); +} + const char DownloadsIntegration::name[] = "org/mozilla/gecko/DownloadsIntegration"; constexpr char DownloadsIntegration::GetTemporaryDownloadDirectory_t::name[]; constexpr char DownloadsIntegration::GetTemporaryDownloadDirectory_t::signature[]; auto DownloadsIntegration::GetTemporaryDownloadDirectory() -> mozilla::jni::String::LocalRef { @@ -229,24 +265,16 @@ auto GeckoAppShell::EnableScreenOrientat constexpr char GeckoAppShell::EnableSensor_t::name[]; constexpr char GeckoAppShell::EnableSensor_t::signature[]; auto GeckoAppShell::EnableSensor(int32_t a0) -> void { return mozilla::jni::Method<EnableSensor_t>::Call(GeckoAppShell::Context(), nullptr, a0); } -constexpr char GeckoAppShell::GamepadAdded_t::name[]; -constexpr char GeckoAppShell::GamepadAdded_t::signature[]; - -auto GeckoAppShell::GamepadAdded(int32_t a0, int32_t a1) -> void -{ - return mozilla::jni::Method<GamepadAdded_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1); -} - constexpr char GeckoAppShell::GetApplicationContext_t::name[]; constexpr char GeckoAppShell::GetApplicationContext_t::signature[]; auto GeckoAppShell::GetApplicationContext() -> mozilla::jni::Object::LocalRef { return mozilla::jni::Method<GetApplicationContext_t>::Call(GeckoAppShell::Context(), nullptr); } @@ -697,32 +725,16 @@ auto GeckoAppShell::ShowAlertNotificatio constexpr char GeckoAppShell::ShowPersistentAlertNotificationWrapper_t::name[]; constexpr char GeckoAppShell::ShowPersistentAlertNotificationWrapper_t::signature[]; auto GeckoAppShell::ShowPersistentAlertNotificationWrapper(mozilla::jni::String::Param a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, mozilla::jni::String::Param a4, mozilla::jni::String::Param a5, mozilla::jni::String::Param a6) -> void { return mozilla::jni::Method<ShowPersistentAlertNotificationWrapper_t>::Call(GeckoAppShell::Context(), nullptr, a0, a1, a2, a3, a4, a5, a6); } -constexpr char GeckoAppShell::StartMonitoringGamepad_t::name[]; -constexpr char GeckoAppShell::StartMonitoringGamepad_t::signature[]; - -auto GeckoAppShell::StartMonitoringGamepad() -> void -{ - return mozilla::jni::Method<StartMonitoringGamepad_t>::Call(GeckoAppShell::Context(), nullptr); -} - -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 {
--- a/widget/android/GeneratedJNIWrappers.h +++ b/widget/android/GeneratedJNIWrappers.h @@ -84,16 +84,123 @@ public: mozilla::jni::ExceptionMode::ABORT; }; static const bool isMultithreaded = false; template<class Impl> class Natives; }; +class AndroidGamepadManager : public mozilla::jni::ObjectBase<AndroidGamepadManager, jobject> +{ +public: + static const char name[]; + + explicit AndroidGamepadManager(const Context& ctx) : ObjectBase<AndroidGamepadManager, jobject>(ctx) {} + + struct OnAxisChange_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args< + int32_t, + mozilla::jni::BooleanArray::Param, + mozilla::jni::FloatArray::Param> Args; + static constexpr char name[] = "onAxisChange"; + static constexpr char signature[] = + "(I[Z[F)V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + struct OnButtonChange_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args< + int32_t, + int32_t, + bool, + float> Args; + static constexpr char name[] = "onButtonChange"; + static constexpr char signature[] = + "(IIZF)V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + struct OnGamepadAdded_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args< + int32_t, + int32_t> Args; + static constexpr char name[] = "onGamepadAdded"; + static constexpr char signature[] = + "(II)V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + static auto OnGamepadAdded(int32_t, int32_t) -> void; + + struct OnGamepadChange_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args< + int32_t, + bool> Args; + static constexpr char name[] = "onGamepadChange"; + static constexpr char signature[] = + "(IZ)V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + struct Start_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args<> Args; + static constexpr char name[] = "start"; + static constexpr char signature[] = + "()V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + static auto Start() -> void; + + struct Stop_t { + typedef AndroidGamepadManager Owner; + typedef void ReturnType; + typedef void SetterType; + typedef mozilla::jni::Args<> Args; + static constexpr char name[] = "stop"; + static constexpr char signature[] = + "()V"; + static const bool isStatic = true; + static const mozilla::jni::ExceptionMode exceptionMode = + mozilla::jni::ExceptionMode::ABORT; + }; + + static auto Stop() -> void; + + static const bool isMultithreaded = true; + + template<class Impl> class Natives; +}; + class DownloadsIntegration : public mozilla::jni::ObjectBase<DownloadsIntegration, jobject> { public: static const char name[]; explicit DownloadsIntegration(const Context& ctx) : ObjectBase<DownloadsIntegration, jobject>(ctx) {} struct GetTemporaryDownloadDirectory_t { @@ -513,33 +620,16 @@ public: "(I)V"; static const bool isStatic = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static auto EnableSensor(int32_t) -> void; - struct GamepadAdded_t { - typedef GeckoAppShell Owner; - typedef void ReturnType; - typedef void SetterType; - typedef mozilla::jni::Args< - int32_t, - int32_t> Args; - static constexpr char name[] = "gamepadAdded"; - static constexpr char signature[] = - "(II)V"; - static const bool isStatic = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; - }; - - static auto GamepadAdded(int32_t, int32_t) -> void; - struct GetApplicationContext_t { typedef GeckoAppShell Owner; typedef mozilla::jni::Object::LocalRef ReturnType; typedef mozilla::jni::Object::Param SetterType; typedef mozilla::jni::Args<> Args; static constexpr char name[] = "getApplicationContext"; static constexpr char signature[] = "()Landroid/content/Context;"; @@ -1509,46 +1599,16 @@ public: "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"; static const bool isStatic = true; static const mozilla::jni::ExceptionMode exceptionMode = mozilla::jni::ExceptionMode::ABORT; }; static auto ShowPersistentAlertNotificationWrapper(mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) -> void; - struct StartMonitoringGamepad_t { - typedef GeckoAppShell Owner; - typedef void ReturnType; - typedef void SetterType; - typedef mozilla::jni::Args<> Args; - static constexpr char name[] = "startMonitoringGamepad"; - static constexpr char signature[] = - "()V"; - static const bool isStatic = true; - static const mozilla::jni::ExceptionMode exceptionMode = - mozilla::jni::ExceptionMode::ABORT; - }; - - static auto StartMonitoringGamepad() -> void; - - struct StopMonitoringGamepad_t { - typedef GeckoAppShell Owner; - typedef void ReturnType; - typedef void SetterType; - typedef mozilla::jni::Args<> Args; - static constexpr char name[] = "stopMonitoringGamepad"; - static constexpr char signature[] = - "()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";