--- a/widget/android/GeneratedJNINatives.h
+++ b/widget/android/GeneratedJNINatives.h
@@ -223,19 +223,19 @@ class GeckoSession::Window::Natives : pu
 {
 public:
     static const JNINativeMethod methods[5];
 };
 
 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>
             ::template Wrap<&Impl::Close>),
 
     mozilla::jni::MakeNativeMethod<GeckoSession::Window::DisposeNative_t>(
             mozilla::jni::NativeStub<GeckoSession::Window::DisposeNative_t, Impl>
             ::template Wrap<&Impl::DisposeNative>),

--- a/widget/android/GeneratedJNIWrappers.cpp
+++ b/widget/android/GeneratedJNIWrappers.cpp
@@ -647,43 +647,16 @@ constexpr char GeckoAppShell::CameraCall
 constexpr char GeckoAppShell::CameraCallback::OnFrameData_t::signature[];
 
 const char GeckoBatteryManager::name[] =
         "org/mozilla/gecko/GeckoBatteryManager";
 
 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";
 
 constexpr char GeckoEditableChild::New_t::name[];
 constexpr char GeckoEditableChild::New_t::signature[];
 
 auto GeckoEditableChild::New(mozilla::jni::Object::Param a0) -> GeckoEditableChild::LocalRef
 {
@@ -696,19 +669,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, 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[];
 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);
@@ -751,22 +724,16 @@ auto GeckoEditableChild::OnTextChange(mo
 constexpr char GeckoEditableChild::UpdateCompositionRects_t::name[];
 constexpr char GeckoEditableChild::UpdateCompositionRects_t::signature[];
 
 auto GeckoEditableChild::UpdateCompositionRects(mozilla::jni::ObjectArray::Param a0) const -> void
 {
     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";
 
 constexpr char GeckoNetworkManager::OnConnectionChanged_t::name[];
 constexpr char GeckoNetworkManager::OnConnectionChanged_t::signature[];
 
 constexpr char GeckoNetworkManager::OnStatusChanged_t::name[];
 constexpr char GeckoNetworkManager::OnStatusChanged_t::signature[];
@@ -778,18 +745,18 @@ constexpr char GeckoScreenOrientation::O
 constexpr char GeckoScreenOrientation::OnOrientationChange_t::signature[];
 
 const char GeckoSession::name[] =
         "org/mozilla/gecko/GeckoSession";
 
 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[];
 
 constexpr char GeckoSession::Window::DisposeNative_t::name[];
 constexpr char GeckoSession::Window::DisposeNative_t::signature[];
 
 constexpr char GeckoSession::Window::OnReady_t::name[];
@@ -1099,16 +1066,25 @@ auto SurfaceTextureListener::New() -> Su
 }
 
 constexpr char SurfaceTextureListener::DisposeNative_t::name[];
 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";
 
 constexpr char GeckoSurface::New_t::name[];
 constexpr char GeckoSurface::New_t::signature[];
 
 auto GeckoSurface::New(mozilla::jni::Object::Param a0, GeckoSurface::LocalRef* a1) -> nsresult
 {

--- a/widget/android/GeneratedJNIWrappers.h
+++ b/widget/android/GeneratedJNIWrappers.h
@@ -1849,87 +1849,16 @@ public:
     };
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::UI;
 
     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:
     static const char name[];
 
     explicit GeckoEditableChild(const Context& ctx) : ObjectBase<GeckoEditableChild>(ctx) {}
 
     struct New_t {
@@ -1976,31 +1905,30 @@ public:
         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,
-                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;
         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, 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;
         typedef void ReturnType;
         typedef void SetterType;
         typedef mozilla::jni::Args<
                 mozilla::jni::Object::Param> Args;
         static constexpr char name[] = "onDefaultKeyEvent";
@@ -2213,60 +2141,16 @@ public:
     static const int32_t FLAG_KEEP_CURRENT_COMPOSITION = 1;
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
     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:
     static const char name[];
 
     explicit GeckoNetworkManager(const Context& ctx) : ObjectBase<GeckoNetworkManager>(ctx) {}
 
     struct OnConnectionChanged_t {
@@ -2362,25 +2246,26 @@ public:
 
 class GeckoSession::Window : public mozilla::jni::ObjectBase<Window>
 {
 public:
     static const char name[];
 
     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 signature[] =
-                "(Lorg/mozilla/gecko/GeckoView;)V";
+        static constexpr char name[] = "attachEditable";
+        static constexpr char signature[] =
+                "(Lorg/mozilla/gecko/IGeckoEditableParent;Lorg/mozilla/gecko/GeckoEditableChild;)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::ANY;
         static const mozilla::jni::DispatchTarget dispatchTarget =
                 mozilla::jni::DispatchTarget::PROXY;
     };
@@ -3434,16 +3319,79 @@ public:
     };
 
     static const mozilla::jni::CallingThread callingThread =
             mozilla::jni::CallingThread::ANY;
 
     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:
     static const char name[];
 
     explicit GeckoSurface(const Context& ctx) : ObjectBase<GeckoSurface>(ctx) {}
 
     struct New_t {