Bug 1051842 - Backout 90ca7355bbcc (bug 1051842) due to bug 1122208
authorBill McCloskey <wmccloskey@mozilla.com>
Tue, 20 Jan 2015 14:02:52 -0800
changeset 251879 cf5b4551a035edc74a89d5532deb6b0de21e5756
parent 251878 21d4b5f35e8f4ec2847ee7314205d2a44e700f8f
child 251880 d61b3b84f8a307ebdb11f488e1deb565b81daf87
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1051842, 1122208
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1051842 - Backout 90ca7355bbcc (bug 1051842) due to bug 1122208
widget/cocoa/nsChildView.mm
widget/cocoa/nsCocoaWindow.mm
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -1591,18 +1591,16 @@ nsChildView::NotifyIME(const IMENotifica
       return NS_OK;
     case REQUEST_TO_CANCEL_COMPOSITION:
       NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
       mTextInputHandler->CancelIMEComposition();
       return NS_OK;
     case NOTIFY_IME_OF_FOCUS:
       if (mInputContext.IsPasswordEditor()) {
         TextInputHandler::EnableSecureEventInput();
-      } else {
-        TextInputHandler::EnsureSecureEventInputDisabled();
       }
 
       NS_ENSURE_TRUE(mTextInputHandler, NS_ERROR_NOT_AVAILABLE);
       mTextInputHandler->OnFocusChangeInGecko(true);
       return NS_OK;
     case NOTIFY_IME_OF_BLUR:
       // When we're going to be deactive, we must disable the secure event input
       // mode, see the Carbon Event Manager Reference.
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -2113,18 +2113,16 @@ void nsCocoaWindow::SetPopupWindowLevel(
 
 NS_IMETHODIMP
 nsCocoaWindow::NotifyIME(const IMENotification& aIMENotification)
 {
   switch (aIMENotification.mMessage) {
     case NOTIFY_IME_OF_FOCUS:
       if (mInputContext.IsPasswordEditor()) {
         TextInputHandler::EnableSecureEventInput();
-      } else {
-        TextInputHandler::EnsureSecureEventInputDisabled();
       }
       return NS_OK;
     case NOTIFY_IME_OF_BLUR:
       // When we're going to be deactive, we must disable the secure event input
       // mode, see the Carbon Event Manager Reference.
       TextInputHandler::EnsureSecureEventInputDisabled();
       return NS_OK;
     default: