Merge pull request #17423 from timdream/keyboard-mempressure-race-master

Bug 984238 - Don't kill the keyboard when when it's being launched +shepherd

apps/system/js/keyboard_manager.js

@@ -91,6 +91,7 @@ var KeyboardManager = {
       console.log('[Keyboard Manager] ' + msg);
   },
   keyboardHeight: 0,
+  hasActiveKeyboard: false,
   isOutOfProcessEnabled: false,
 
   init: function km_init() {
@@ -449,9 +450,10 @@ var KeyboardManager = {
         // get rid of it.
         // We only do that when we don't run keyboards OOP.
         this._debug('mozmemorypressure event');
-        if (!this.isOutOfProcessEnabled && this.keyboardHeight == 0) {
+        if (!this.isOutOfProcessEnabled && !this.hasActiveKeyboard) {
           Object.keys(this.runningLayouts).forEach(this.removeKeyboard, this);
           this.runningLayouts = {};
+          this._debug('mozmemorypressure event; keyboard removed');
         }
         break;
     }
@@ -752,6 +754,7 @@ var KeyboardManager = {
     if (frame.setInputMethodActive) {
       frame.setInputMethodActive(active);
     }
+    this.hasActiveKeyboard = active;
   }
 };