mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1416918 - 5. Update generated bindings; r=jchen 

MozReview-Commit-ID: JF2T2i1xyGy

--HG--
extra : rebase_source : ce75ae2339c8514a9fa74658298b1bd6c9138d17
This commit is contained in:
Jim Chen 2017-12-13 22:57:22 -05:00
Родитель af3a18ee62
Коммит 7d5be27cff
3 изменённых файлов: 86 добавлений и 162 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
widget/android/GeneratedJNINatives.h
Просмотреть файл

@ -228,9 +228,9 @@ public:
template<class Impl>
const JNINativeMethod GeckoSession::Window::Natives<Impl>::methods[] = {
mozilla::jni::MakeNativeMethod<GeckoSession::Window::Attach_t>(
mozilla::jni::NativeStub<GeckoSession::Window::Attach_t, Impl>
::template Wrap<&Impl::Attach>),
mozilla::jni::MakeNativeMethod<GeckoSession::Window::AttachEditable_t>(
mozilla::jni::NativeStub<GeckoSession::Window::AttachEditable_t, Impl>
::template Wrap<&Impl::AttachEditable>),
mozilla::jni::MakeNativeMethod<GeckoSession::Window::Close_t>(
mozilla::jni::NativeStub<GeckoSession::Window::Close_t, Impl>

50
widget/android/GeneratedJNIWrappers.cpp
Просмотреть файл

@ -652,33 +652,6 @@ const char GeckoBatteryManager::name[] =
constexpr char GeckoBatteryManager::OnBatteryChange_t::name[];
constexpr char GeckoBatteryManager::OnBatteryChange_t::signature[];
const char GeckoEditable::name[] =
"org/mozilla/gecko/GeckoEditable";
constexpr char GeckoEditable::New_t::name[];
constexpr char GeckoEditable::New_t::signature[];
auto GeckoEditable::New() -> GeckoEditable::LocalRef
{
return mozilla::jni::Constructor<New_t>::Call(GeckoEditable::Context(), nullptr);
}
constexpr char GeckoEditable::OnViewChange_t::name[];
constexpr char GeckoEditable::OnViewChange_t::signature[];
auto GeckoEditable::OnViewChange(mozilla::jni::Object::Param a0) const -> void
{
return mozilla::jni::Method<OnViewChange_t>::Call(GeckoEditable::mCtx, nullptr, a0);
}
constexpr char GeckoEditable::SetDefaultEditableChild_t::name[];
constexpr char GeckoEditable::SetDefaultEditableChild_t::signature[];
auto GeckoEditable::SetDefaultEditableChild(mozilla::jni::Object::Param a0) const -> void
{
return mozilla::jni::Method<SetDefaultEditableChild_t>::Call(GeckoEditable::mCtx, nullptr, a0);
}
const char GeckoEditableChild::name[] =
"org/mozilla/gecko/GeckoEditableChild";
@ -701,9 +674,9 @@ auto GeckoEditableChild::NotifyIME(int32_t a0) const -> void
constexpr char GeckoEditableChild::NotifyIMEContext_t::name[];
constexpr char GeckoEditableChild::NotifyIMEContext_t::signature[];
auto GeckoEditableChild::NotifyIMEContext(int32_t a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, bool a4, bool a5) const -> void
auto GeckoEditableChild::NotifyIMEContext(int32_t a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, int32_t a4) const -> void
{
return mozilla::jni::Method<NotifyIMEContext_t>::Call(GeckoEditableChild::mCtx, nullptr, a0, a1, a2, a3, a4, a5);
return mozilla::jni::Method<NotifyIMEContext_t>::Call(GeckoEditableChild::mCtx, nullptr, a0, a1, a2, a3, a4);
}
constexpr char GeckoEditableChild::OnDefaultKeyEvent_t::name[];
@ -756,12 +729,6 @@ auto GeckoEditableChild::UpdateCompositionRects(mozilla::jni::ObjectArray::Param
return mozilla::jni::Method<UpdateCompositionRects_t>::Call(GeckoEditableChild::mCtx, nullptr, a0);
}
const char GeckoEditableClient::name[] =
"org/mozilla/gecko/GeckoEditableClient";
const char GeckoEditableListener::name[] =
"org/mozilla/gecko/GeckoEditableListener";
const char GeckoNetworkManager::name[] =
"org/mozilla/gecko/GeckoNetworkManager";
@ -783,8 +750,8 @@ const char GeckoSession::name[] =
const char GeckoSession::Window::name[] =
"org/mozilla/gecko/GeckoSession$Window";
constexpr char GeckoSession::Window::Attach_t::name[];
constexpr char GeckoSession::Window::Attach_t::signature[];
constexpr char GeckoSession::Window::AttachEditable_t::name[];
constexpr char GeckoSession::Window::AttachEditable_t::signature[];
constexpr char GeckoSession::Window::Close_t::name[];
constexpr char GeckoSession::Window::Close_t::signature[];
@ -1104,6 +1071,15 @@ constexpr char SurfaceTextureListener::DisposeNative_t::signature[];
constexpr char SurfaceTextureListener::OnFrameAvailable_t::name[];
constexpr char SurfaceTextureListener::OnFrameAvailable_t::signature[];
const char TextInputController::name[] =
"org/mozilla/gecko/TextInputController";
const char TextInputController::EditableClient::name[] =
"org/mozilla/gecko/TextInputController$EditableClient";
const char TextInputController::EditableListener::name[] =
"org/mozilla/gecko/TextInputController$EditableListener";
const char GeckoSurface::name[] =
"org/mozilla/gecko/gfx/GeckoSurface";

192
widget/android/GeneratedJNIWrappers.h
Просмотреть файл

@ -1854,77 +1854,6 @@ public:
template<class Impl> class Natives;
};
class GeckoEditable : public mozilla::jni::ObjectBase<GeckoEditable>
{
public:
static const char name[];
explicit GeckoEditable(const Context& ctx) : ObjectBase<GeckoEditable>(ctx) {}
struct New_t {
typedef GeckoEditable Owner;
typedef GeckoEditable::LocalRef ReturnType;
typedef GeckoEditable::Param SetterType;
typedef mozilla::jni::Args<> Args;
static constexpr char name[] = "<init>";
static constexpr char signature[] =
"()V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::GECKO;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
static auto New() -> GeckoEditable::LocalRef;
struct OnViewChange_t {
typedef GeckoEditable Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "onViewChange";
static constexpr char signature[] =
"(Lorg/mozilla/gecko/GeckoView;)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::GECKO;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
auto OnViewChange(mozilla::jni::Object::Param) const -> void;
struct SetDefaultEditableChild_t {
typedef GeckoEditable Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "setDefaultEditableChild";
static constexpr char signature[] =
"(Lorg/mozilla/gecko/IGeckoEditableChild;)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::GECKO;
static const mozilla::jni::DispatchTarget dispatchTarget =
mozilla::jni::DispatchTarget::CURRENT;
};
auto SetDefaultEditableChild(mozilla::jni::Object::Param) const -> void;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::GECKO;
};
class GeckoEditableChild : public mozilla::jni::ObjectBase<GeckoEditableChild>
{
public:
@ -1981,11 +1910,10 @@ public:
mozilla::jni::String::Param,
mozilla::jni::String::Param,
mozilla::jni::String::Param,
bool,
bool> Args;
int32_t> Args;
static constexpr char name[] = "notifyIMEContext";
static constexpr char signature[] =
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)V";
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
@ -1995,7 +1923,7 @@ public:
mozilla::jni::DispatchTarget::CURRENT;
};
auto NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, bool, bool) const -> void;
auto NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, int32_t) const -> void;
struct OnDefaultKeyEvent_t {
typedef GeckoEditableChild Owner;
@ -2218,50 +2146,6 @@ public:
template<class Impl> class Natives;
};
class GeckoEditableClient : public mozilla::jni::ObjectBase<GeckoEditableClient>
{
public:
static const char name[];
explicit GeckoEditableClient(const Context& ctx) : ObjectBase<GeckoEditableClient>(ctx) {}
static const int32_t END_MONITOR = 3;
static const int32_t ONE_SHOT = 1;
static const int32_t START_MONITOR = 2;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class GeckoEditableListener : public mozilla::jni::ObjectBase<GeckoEditableListener>
{
public:
static const char name[];
explicit GeckoEditableListener(const Context& ctx) : ObjectBase<GeckoEditableListener>(ctx) {}
static const int32_t NOTIFY_IME_OF_BLUR = 2;
static const int32_t NOTIFY_IME_OF_FOCUS = 1;
static const int32_t NOTIFY_IME_OF_TOKEN = -3;
static const int32_t NOTIFY_IME_OPEN_VKB = -2;
static const int32_t NOTIFY_IME_REPLY_EVENT = -1;
static const int32_t NOTIFY_IME_TO_CANCEL_COMPOSITION = 9;
static const int32_t NOTIFY_IME_TO_COMMIT_COMPOSITION = 8;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class GeckoNetworkManager : public mozilla::jni::ObjectBase<GeckoNetworkManager>
{
public:
@ -2367,15 +2251,16 @@ public:
explicit Window(const Context& ctx) : ObjectBase<Window>(ctx) {}
struct Attach_t {
struct AttachEditable_t {
typedef Window Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::Object::Param,
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "attach";
static constexpr char name[] = "attachEditable";
static constexpr char signature[] =
"(Lorg/mozilla/gecko/GeckoView;)V";
"(Lorg/mozilla/gecko/IGeckoEditableParent;Lorg/mozilla/gecko/GeckoEditableChild;)V";
static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT;
@ -3439,6 +3324,69 @@ public:
template<class Impl> class Natives;
};
class TextInputController : public mozilla::jni::ObjectBase<TextInputController>
{
public:
static const char name[];
explicit TextInputController(const Context& ctx) : ObjectBase<TextInputController>(ctx) {}
class EditableClient;
class EditableListener;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class TextInputController::EditableClient : public mozilla::jni::ObjectBase<EditableClient>
{
public:
static const char name[];
explicit EditableClient(const Context& ctx) : ObjectBase<EditableClient>(ctx) {}
static const int32_t END_MONITOR = 3;
static const int32_t ONE_SHOT = 1;
static const int32_t START_MONITOR = 2;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class TextInputController::EditableListener : public mozilla::jni::ObjectBase<EditableListener>
{
public:
static const char name[];
explicit EditableListener(const Context& ctx) : ObjectBase<EditableListener>(ctx) {}
static const int32_t IME_FLAG_PRIVATE_BROWSING = 1;
static const int32_t IME_FLAG_USER_ACTION = 2;
static const int32_t NOTIFY_IME_OF_BLUR = 2;
static const int32_t NOTIFY_IME_OF_FOCUS = 1;
static const int32_t NOTIFY_IME_OF_TOKEN = -3;
static const int32_t NOTIFY_IME_OPEN_VKB = -2;
static const int32_t NOTIFY_IME_REPLY_EVENT = -1;
static const int32_t NOTIFY_IME_TO_CANCEL_COMPOSITION = 9;
static const int32_t NOTIFY_IME_TO_COMMIT_COMPOSITION = 8;
static const mozilla::jni::CallingThread callingThread =
mozilla::jni::CallingThread::ANY;
};
class GeckoSurface : public mozilla::jni::ObjectBase<GeckoSurface>
{
public: