Bug 1266683 - Part 3 - Update notifyIMEContext JNI bindings to include private mode info. r=jchen

MozReview-Commit-ID: Gl2iRWxo9lE

--HG--
extra : rebase_source : 4b0aad157af22dcb96aeb68b199bfa9404902dea
This commit is contained in:
Jan Henning 2017-07-31 22:45:54 +02:00
Родитель 34bb1f8a36
Коммит 641e43da0b
4 изменённых файлов: 12 добавлений и 8 удалений

Просмотреть файл

@ -158,12 +158,14 @@ final class GeckoEditableChild extends JNIObject implements IGeckoEditableChild
@WrapForJNI(calledFrom = "gecko") @WrapForJNI(calledFrom = "gecko")
private void notifyIMEContext(final int state, final String typeHint, private void notifyIMEContext(final int state, final String typeHint,
final String modeHint, final String actionHint) { final String modeHint, final String actionHint,
final boolean inPrivateBrowsing) {
if (DEBUG) { if (DEBUG) {
ThreadUtils.assertOnGeckoThread(); ThreadUtils.assertOnGeckoThread();
Log.d(LOGTAG, "notifyIMEContext(" + GeckoEditable.getConstantName( Log.d(LOGTAG, "notifyIMEContext(" + GeckoEditable.getConstantName(
GeckoEditableListener.class, "IME_STATE_", state) + ", \"" + GeckoEditableListener.class, "IME_STATE_", state) + ", \"" +
typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\")"); typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\", " +
"inPrivateBrowsing=" + inPrivateBrowsing + ")");
} }
try { try {

Просмотреть файл

@ -1197,7 +1197,8 @@ GeckoEditableSupport::SetInputContext(const InputContext& aContext,
mEditable->NotifyIMEContext(mInputContext.mIMEState.mEnabled, mEditable->NotifyIMEContext(mInputContext.mIMEState.mEnabled,
mInputContext.mHTMLInputType, mInputContext.mHTMLInputType,
mInputContext.mHTMLInputInputmode, mInputContext.mHTMLInputInputmode,
mInputContext.mActionHint); mInputContext.mActionHint,
mInputContext.mInPrivateBrowsing);
}); });
} }

Просмотреть файл

@ -640,9 +640,9 @@ auto GeckoEditableChild::NotifyIME(int32_t a0) const -> void
constexpr char GeckoEditableChild::NotifyIMEContext_t::name[]; constexpr char GeckoEditableChild::NotifyIMEContext_t::name[];
constexpr char GeckoEditableChild::NotifyIMEContext_t::signature[]; 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) const -> void auto GeckoEditableChild::NotifyIMEContext(int32_t a0, mozilla::jni::String::Param a1, mozilla::jni::String::Param a2, mozilla::jni::String::Param a3, bool a4) const -> void
{ {
return mozilla::jni::Method<NotifyIMEContext_t>::Call(GeckoEditableChild::mCtx, nullptr, a0, a1, a2, a3); return mozilla::jni::Method<NotifyIMEContext_t>::Call(GeckoEditableChild::mCtx, nullptr, a0, a1, a2, a3, a4);
} }
constexpr char GeckoEditableChild::OnDefaultKeyEvent_t::name[]; constexpr char GeckoEditableChild::OnDefaultKeyEvent_t::name[];

Просмотреть файл

@ -1831,10 +1831,11 @@ public:
int32_t, int32_t,
mozilla::jni::String::Param, mozilla::jni::String::Param,
mozilla::jni::String::Param, mozilla::jni::String::Param,
mozilla::jni::String::Param> Args; mozilla::jni::String::Param,
bool> Args;
static constexpr char name[] = "notifyIMEContext"; static constexpr char name[] = "notifyIMEContext";
static constexpr char signature[] = static constexpr char signature[] =
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"; "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V";
static const bool isStatic = false; static const bool isStatic = false;
static const mozilla::jni::ExceptionMode exceptionMode = static const mozilla::jni::ExceptionMode exceptionMode =
mozilla::jni::ExceptionMode::ABORT; mozilla::jni::ExceptionMode::ABORT;
@ -1844,7 +1845,7 @@ public:
mozilla::jni::DispatchTarget::CURRENT; mozilla::jni::DispatchTarget::CURRENT;
}; };
auto NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param) const -> void; auto NotifyIMEContext(int32_t, mozilla::jni::String::Param, mozilla::jni::String::Param, mozilla::jni::String::Param, bool) const -> void;
struct OnDefaultKeyEvent_t { struct OnDefaultKeyEvent_t {
typedef GeckoEditableChild Owner; typedef GeckoEditableChild Owner;