diff -r 000000000000 -r 6474c204b198 toolkit/components/satchel/AutoCompleteE10S.jsm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/satchel/AutoCompleteE10S.jsm	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,159 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
+
+this.EXPORTED_SYMBOLS = [ "AutoCompleteE10S" ];
+
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+
+// nsITreeView implementation that feeds the autocomplete popup
+// with the search data.
+let AutoCompleteE10SView = {
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsITreeView,
+                                         Ci.nsIAutoCompleteController]),
+  treeBox: null,
+  selection: null,
+  treeData: [],
+
+  get rowCount()                     { return this.treeData.length; },
+  setTree: function(treeBox)         { this.treeBox = treeBox; },
+  getCellText: function(idx, column) { return this.treeData[idx] },
+  isContainer: function(idx)         { return false; },
+  getCellValue: function(idx, column){ return false },
+  isContainerOpen: function(idx)     { return false; },
+  isContainerEmpty: function(idx)    { return false; },
+  isSeparator: function(idx)         { return false; },
+  isSorted: function()               { return false; },
+  isEditable: function(idx, column)  { return false; },
+  canDrop: function(idx, orientation, dt) { return false; },
+  getLevel: function(idx)            { return 0; },
+  getParentIndex: function(idx)      { return -1; },
+  hasNextSibling: function(idx, after) { return idx < this.treeData.length - 1 },
+  toggleOpenState: function(idx)     { },
+  getCellProperties: function(idx, column) { return ""; },
+  getRowProperties: function(idx)    { return ""; },
+  getImageSrc: function(idx, column) { return null; },
+  getProgressMode : function(idx, column) { },
+  cycleHeader: function(column) { },
+  cycleCell: function(idx, column) { },
+  selectionChanged: function() { },
+  performAction: function(action) { },
+  performActionOnCell: function(action, index, column) { },
+  getColumnProperties: function(column) { return ""; },
+
+  get matchCount() this.rowCount,
+
+
+  clearResults: function() {
+    this.treeData = [];
+  },
+
+  addResult: function(result) {
+    this.treeData.push(result);
+  },
+
+  handleEnter: function(aIsPopupSelection) {
+    AutoCompleteE10S.handleEnter(aIsPopupSelection);
+  },
+
+  stopSearch: function(){}
+};
+
+this.AutoCompleteE10S = {
+  init: function() {
+    let messageManager = Cc["@mozilla.org/globalmessagemanager;1"].
+                         getService(Ci.nsIMessageListenerManager);
+    messageManager.addMessageListener("FormAutoComplete:SelectBy", this);
+    messageManager.addMessageListener("FormAutoComplete:GetSelectedIndex", this);
+    messageManager.addMessageListener("FormAutoComplete:ClosePopup", this);
+  },
+
+  search: function(message) {
+    let browserWindow = message.target.ownerDocument.defaultView;
+    this.browser = browserWindow.gBrowser.selectedBrowser;
+    this.popup = this.browser.autoCompletePopup;
+    this.popup.hidden = false;
+    this.popup.setAttribute("width", message.data.width);
+
+    let rect = message.data;
+    let {x, y} = this.browser.mapScreenCoordinatesFromContent(rect.left, rect.top + rect.height);
+    this.x = x;
+    this.y = y;
+
+    let formAutoComplete = Cc["@mozilla.org/satchel/form-autocomplete;1"]
+                             .getService(Ci.nsIFormAutoComplete);
+
+    formAutoComplete.autoCompleteSearchAsync(message.data.inputName,
+                                             message.data.untrimmedSearchString,
+                                             null,
+                                             null,
+                                             this.onSearchComplete.bind(this));
+  },
+
+  onSearchComplete: function(results) {
+    AutoCompleteE10SView.clearResults();
+
+    let resultsArray = [];
+    let count = results.matchCount;
+    for (let i = 0; i < count; i++) {
+      let result = results.getValueAt(i);
+      resultsArray.push(result);
+      AutoCompleteE10SView.addResult(result);
+    }
+
+    this.popup.view = AutoCompleteE10SView;
+
+    this.browser.messageManager.sendAsyncMessage(
+      "FormAutoComplete:AutoCompleteSearchAsyncResult",
+      {results: resultsArray}
+    );
+
+    this.popup.selectedIndex = -1;
+    this.popup.invalidate();
+
+    if (count > 0) {
+      this.popup.openPopupAtScreen(this.x, this.y, true);
+      // Bug 947503 - This openPopup call is not triggering the "popupshowing"
+      // event, which autocomplete.xml uses to track the openness of the popup
+      // by setting its mPopupOpen flag. This flag needs to be properly set
+      // for closePopup to work. For now, we set it manually.
+      this.popup.mPopupOpen = true;
+    } else {
+      this.popup.closePopup();
+    }
+  },
+
+  receiveMessage: function(message) {
+    switch (message.name) {
+      case "FormAutoComplete:SelectBy":
+        this.popup.selectBy(message.data.reverse, message.data.page);
+        break;
+
+      case "FormAutoComplete:GetSelectedIndex":
+        return this.popup.selectedIndex;
+
+      case "FormAutoComplete:ClosePopup":
+        this.popup.closePopup();
+        break;
+    }
+  },
+
+  handleEnter: function(aIsPopupSelection) {
+    this.browser.messageManager.sendAsyncMessage(
+      "FormAutoComplete:HandleEnter",
+      { selectedIndex: this.popup.selectedIndex,
+        IsPopupSelection: aIsPopupSelection }
+    );
+  },
+
+  stopSearch: function() {}
+}
+
+this.AutoCompleteE10S.init();