From 8041c1a27e77aaae1f9d48810de1fae75f2c5ae9 Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Fri, 20 May 2011 14:44:09 -0400 Subject: [PATCH] bug 624163 - IME input does not work in rich editors with e10s r=dougt --- dom/ipc/TabParent.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 5f8123a9f96..ac3e5f1d809 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -527,6 +527,9 @@ TabParent::RecvGetIMEEnabled(PRUint32* aValue) bool TabParent::RecvSetInputMode(const PRUint32& aValue, const nsString& aType, const nsString& aAction, const PRUint32& aReason) { + // mIMETabParent (which is actually static) tracks which if any TabParent has IMEFocus + // When the input mode is set to anything but IME_STATUS_NONE, mIMETabParent should be set to this + mIMETabParent = aValue & nsIContent::IME_STATUS_MASK_ENABLED ? this : nsnull; nsCOMPtr widget = GetWidget(); if (!widget || !AllowContentIME()) return true;