Bug 1266683 - Part 3 - Update notifyIMEContext JNI bindings to include private mode info. r?jchen
MozReview-Commit-ID: Gl2iRWxo9lE
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoEditableChild.java
@@ -153,22 +153,24 @@ final class GeckoEditableChild extends J
} catch (final RemoteException e) {
Log.e(LOGTAG, "Remote call failed", e);
return;
}
}
@WrapForJNI(calledFrom = "gecko")
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) {
ThreadUtils.assertOnGeckoThread();
Log.d(LOGTAG, "notifyIMEContext(" + GeckoEditable.getConstantName(
GeckoEditableListener.class, "IME_STATE_", state) + ", \"" +
- typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\")");
+ typeHint + "\", \"" + modeHint + "\", \"" + actionHint + "\", " +
+ "inPrivateBrowsing=" + inPrivateBrowsing + ")");
}
try {
mEditableParent.notifyIMEContext(state, typeHint, modeHint, actionHint);
} catch (final RemoteException e) {
Log.e(LOGTAG, "Remote call failed", e);
}
}
--- a/widget/android/GeckoEditableSupport.cpp
+++ b/widget/android/GeckoEditableSupport.cpp
@@ -1211,17 +1211,18 @@ GeckoEditableSupport::SetInputContext(co
mIMEUpdatingContext = false;
if (!widget || widget->Destroyed()) {
return;
}
mEditable->NotifyIMEContext(mInputContext.mIMEState.mEnabled,
mInputContext.mHTMLInputType,
mInputContext.mHTMLInputInputmode,
- mInputContext.mActionHint);
+ mInputContext.mActionHint,
+ mInputContext.mInPrivateBrowsing);
});
}
InputContext
GeckoEditableSupport::GetInputContext()
{
InputContext context = mInputContext;
context.mIMEState.mOpen = IMEState::OPEN_STATE_NOT_SUPPORTED;
--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -643,19 +643,19 @@ constexpr char GeckoEditableChild::Notif
auto GeckoEditableChild::NotifyIME(int32_t a0) const -> void
{
return mozilla::jni::Method<NotifyIME_t>::Call(GeckoEditableChild::mCtx, nullptr, a0);
}
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) 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::signature[];
auto GeckoEditableChild::OnDefaultKeyEvent(mozilla::jni::Object::Param a0) const -> void
{
return mozilla::jni::Method<OnDefaultKeyEvent_t>::Call(GeckoEditableChild::mCtx, nullptr, a0);
--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -1847,30 +1847,31 @@ public:
struct NotifyIMEContext_t {
typedef GeckoEditableChild Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
int32_t,
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 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 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 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 {
typedef GeckoEditableChild Owner;
typedef void ReturnType;
typedef void SetterType;
typedef mozilla::jni::Args<
mozilla::jni::Object::Param> Args;
static constexpr char name[] = "onDefaultKeyEvent";