Merge mozilla-central to inbound. r=merge a=merge on a CLOSED TREE

.eslintrc.js

@@ -24,5 +24,27 @@ module.exports = {
     "rules": {
       "eol-last": "off",
     }
+  }, {
+    // XXX Bug 1421969. These files/directories are still being fixed,
+    // so turn off mozilla/use-services for them for now.
+    "files": [
+      "accessible/**",
+      // Browser: Bug 1421379
+      "browser/extensions/shield-recipe-client/test/browser/head.js",
+      "browser/modules/offlineAppCache.jsm",
+      "chrome/**",
+      "devtools/**",
+      "dom/indexedDB/**",
+      "dom/media/**",
+      "extensions/pref/**",
+      "mobile/android/**",
+      "security/**",
+      "testing/**",
+      "tools/profiler/**",
+      "xpcom/**"
+    ],
+    "rules": {
+      "mozilla/use-services": "off",
+    }
   }]
 };

accessible/windows/msaa/RootAccessibleWrap.cpp

@@ -149,3 +149,52 @@ RootAccessibleWrap::accNavigate(
   pvarEndUpAt->vt = VT_DISPATCH;
   return S_OK;
 }
+
+STDMETHODIMP
+RootAccessibleWrap::get_accFocus(
+      /* [retval][out] */ VARIANT __RPC_FAR *pvarChild)
+{
+  HRESULT hr = DocAccessibleWrap::get_accFocus(pvarChild);
+  if (FAILED(hr) || pvarChild->vt != VT_EMPTY) {
+    // We got a definite result (either failure or an accessible).
+    return hr;
+  }
+
+  // The base implementation reported no focus.
+  // Focus might be in a remote document.
+  // (The base implementation can't handle this.)
+  // Get the document in the active tab.
+  ProxyAccessible* docProxy = GetPrimaryRemoteTopLevelContentDoc();
+  if (!docProxy) {
+    return hr;
+  }
+  Accessible* docAcc = WrapperFor(docProxy);
+  if (!docAcc) {
+    return E_FAIL;
+  }
+  RefPtr<IDispatch> docDisp = NativeAccessible(docAcc);
+  if (!docDisp) {
+    return E_FAIL;
+  }
+  RefPtr<IAccessible> docIa;
+  hr = docDisp->QueryInterface(IID_IAccessible, (void**)getter_AddRefs(docIa));
+  MOZ_ASSERT(SUCCEEDED(hr));
+  MOZ_ASSERT(docIa);
+
+  // Ask this document for its focused descendant.
+  // We return this as is to the client except for CHILDID_SELF (see below).
+  hr = docIa->get_accFocus(pvarChild);
+  if (FAILED(hr)) {
+    return hr;
+  }
+
+  if (pvarChild->vt == VT_I4 && pvarChild->lVal == CHILDID_SELF) {
+    // The document itself has focus.
+    // We're handling a call to accFocus on the root accessible,
+    // so replace CHILDID_SELF with the document accessible.
+    pvarChild->vt = VT_DISPATCH;
+    docDisp.forget(&pvarChild->pdispVal);
+  }
+
+  return S_OK;
+}

accessible/windows/msaa/RootAccessibleWrap.h

@@ -43,6 +43,9 @@ class RootAccessibleWrap : public RootAccessible
     /* [optional][in] */ VARIANT varStart,
     /* [retval][out] */ VARIANT __RPC_FAR *pvarEndUpAt) override;
 
+  virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_accFocus(
+    /* [retval][out] */ VARIANT __RPC_FAR *pvarChild) override;
+
 private:
   // DECLARE_AGGREGATABLE declares the internal IUnknown methods as well as
   // mInternalUnknown.

browser/components/.eslintrc.js

@@ -5,7 +5,5 @@ module.exports = {
     // XXX Bug 1326071 - This should be reduced down - probably to 20 or to
     // be removed & synced with the mozilla/recommended value.
     "complexity": ["error", 61],
-
-    "mozilla/use-services": "error",
   }
 };

browser/components/nsBrowserGlue.js

@@ -2204,11 +2204,7 @@ BrowserGlue.prototype = {
         if (currentEngine._loadPath.startsWith("[https]")) {
           Services.prefs.setCharPref("browser.search.reset.status", "pending");
         } else {
-          // Can't call resetToOriginalDefaultEngine because it doesn't
-          // unhide the engine.
-          let defaultEngine = Services.search.originalDefaultEngine;
-          defaultEngine.hidden = false;
-          Services.search.currentEngine = defaultEngine;
+          Services.search.resetToOriginalDefaultEngine();
           Services.prefs.setCharPref("browser.search.reset.status", "silent");
         }
       });

browser/components/syncedtabs/SyncedTabsDeckComponent.js

@@ -73,6 +73,11 @@ SyncedTabsDeckComponent.prototype = {
     Services.obs.addObserver(this, this._SyncedTabs.TOPIC_TABS_CHANGED);
     Services.obs.addObserver(this, FxAccountsCommon.ONLOGIN_NOTIFICATION);
     Services.obs.addObserver(this, "weave:service:login:change");
+    // If the Sync service is not ready, in init() > updatePanel() we will
+    // show a blank screen. If tab syncing is disabled, we will not get any other
+    // ui-refreshing notifications! We listen to :ready in order to check again
+    // if this engine is disabled and refresh the UI one last time.
+    Services.obs.addObserver(this, "weave:service:ready");
 
     // Go ahead and trigger sync
     this._SyncedTabs.syncTabs()
@@ -95,6 +100,7 @@ SyncedTabsDeckComponent.prototype = {
     Services.obs.removeObserver(this, this._SyncedTabs.TOPIC_TABS_CHANGED);
     Services.obs.removeObserver(this, FxAccountsCommon.ONLOGIN_NOTIFICATION);
     Services.obs.removeObserver(this, "weave:service:login:change");
+    Services.obs.removeObserver(this, "weave:service:ready");
     this._deckView.destroy();
   },
 
@@ -104,6 +110,9 @@ SyncedTabsDeckComponent.prototype = {
         this._syncedTabsListStore.getData();
         this.updatePanel();
         break;
+      case "weave:service:ready":
+        Services.obs.removeObserver(this, "weave:service:ready");
+        // Intended fallthrough.
       case FxAccountsCommon.ONLOGIN_NOTIFICATION:
       case "weave:service:login:change":
         this.updatePanel();

browser/extensions/formautofill/FormAutofillContent.jsm

@@ -111,6 +111,7 @@ AutofillProfileAutoCompleteSearch.prototype = {
     let searchPermitted = isAddressField ?
                           FormAutofillUtils.isAutofillAddressesEnabled :
                           FormAutofillUtils.isAutofillCreditCardsEnabled;
+    let AutocompleteResult = isAddressField ? AddressResult : CreditCardResult;
 
     ProfileAutocomplete.lastProfileAutoCompleteFocusedInput = focusedInput;
     // Fallback to form-history if ...
@@ -122,8 +123,8 @@ AutofillProfileAutoCompleteSearch.prototype = {
         (!isInputAutofilled && filledRecordGUID) || (isAddressField &&
         allFieldNames.filter(field => savedFieldNames.has(field)).length < FormAutofillUtils.AUTOFILL_FIELDS_THRESHOLD)) {
       if (focusedInput.autocomplete == "off") {
-        // Create a dummy AddressResult as an empty search result.
-        let result = new AddressResult("", "", [], [], {});
+        // Create a dummy result as an empty search result.
+        let result = new AutocompleteResult("", "", [], [], {});
         listener.onSearchResult(this, result);
         return;
       }
@@ -138,6 +139,13 @@ AutofillProfileAutoCompleteSearch.prototype = {
       return;
     }
 
+    if (isInputAutofilled) {
+      let result = new AutocompleteResult(searchString, "", [], [], {isInputAutofilled});
+      listener.onSearchResult(this, result);
+      ProfileAutocomplete.lastProfileAutoCompleteResult = result;
+      return;
+    }
+
     let infoWithoutElement = Object.assign({}, info);
     delete infoWithoutElement.elementWeakRef;
 
@@ -156,21 +164,13 @@ AutofillProfileAutoCompleteSearch.prototype = {
 
       let adaptedRecords = handler.getAdaptedProfiles(records, focusedInput);
       let result = null;
-      if (isAddressField) {
-        result = new AddressResult(searchString,
-                                   info.fieldName,
-                                   allFieldNames,
-                                   adaptedRecords,
-                                   {isInputAutofilled});
-      } else {
-        let isSecure = InsecurePasswordUtils.isFormSecure(handler.form);
-
-        result = new CreditCardResult(searchString,
+      let isSecure = InsecurePasswordUtils.isFormSecure(handler.form);
+
+      result = new AutocompleteResult(searchString,
                                       info.fieldName,
                                       allFieldNames,
                                       adaptedRecords,
                                       {isSecure, isInputAutofilled});
-      }
       listener.onSearchResult(this, result);
       ProfileAutocomplete.lastProfileAutoCompleteResult = result;
     });

browser/extensions/formautofill/ProfileAutoCompleteResult.jsm

@@ -53,6 +53,11 @@ class ProfileAutoCompleteResult {
       return fieldSet;
     }, new Set())].filter(field => allFieldNames.includes(field));
 
+    // Force return success code if the focused field is auto-filled in order
+    // to show clear form button popup.
+    if (isInputAutofilled) {
+      resultCode = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
+    }
     // The result code of this result object.
     if (resultCode) {
       this.searchResult = resultCode;

browser/extensions/formautofill/test/mochitest/test_clear_form.html

@@ -21,7 +21,7 @@
 
 const MOCK_STORAGE = [{
   organization: "Sesame Street",
-  "street-address": "123 Sesame Street.",
+  "street-address": "2 Harrison St\nline2\nline3",
   tel: "+13453453456",
 }, {
   organization: "Mozilla",
@@ -59,6 +59,15 @@
   checkIsFormCleared();
 });
 
+add_task(async function clear_adapted_record() {
+  await triggerPopupAndHoverItem("#street-address", 0);
+  await triggerAutofillAndCheckProfile(MOCK_STORAGE[0]);
+
+  await triggerPopupAndHoverItem("#street-address", 0);
+  doKey("return");
+  checkIsFormCleared();
+});
+
 add_task(async function clear_modified_form() {
   await triggerPopupAndHoverItem("#organization", 0);
   await triggerAutofillAndCheckProfile(MOCK_STORAGE[0]);

browser/extensions/pocket/locale/ar/pocket.properties

@@ -37,7 +37,7 @@ viewlist = اعرض القائمة
 pocket-button.label = Pocket
 pocket-button.tooltiptext = احفظ في Pocket
 saveToPocketCmd.label = احفظ الصفحة في Pocket
-saveToPocketCmd.accesskey = ت
-saveLinkToPocketCmd.label = احفظ الوصلة في Pocket
-saveLinkToPocketCmd.accesskey = ص
+saveToPocketCmd.accesskey = ظ
+saveLinkToPocketCmd.label = احفظ الرابط في Pocket
+saveLinkToPocketCmd.accesskey = ف
 pocketMenuitem.label = اعرض قائمة Pocket

browser/extensions/pocket/locale/bg/pocket.properties

@@ -19,10 +19,10 @@ processingtags = Добавяне на етикети…
 removepage = Премахване на страница
 save = Запазване
 saving = Запазване…
-signupemail = Регистриране с мейл
+signupemail = Регистриране с електронна поща
 signuptosave = Регистрирайте се в Pocket. Безплатно е.
 suggestedtags = Предложени етикети
-tagline = Запазвайте статии и видеота от Firefox и можете да ги преглеждате в Pocket на всяко устройство по всяко време.
+tagline = Запазвайте статии и видео от Firefox и можете да ги преглеждате в Pocket на всяко устройство по всяко време.
 taglinestory_one = Щракнете на бутона на Pocket за запазване на статия, видео или страница от Firefox.
 taglinestory_two = Преглеждайте в Pocket на всяко устройство и по всяко време.
 tagssaved = Етикетите са добавени

browser/extensions/pocket/locale/br/pocket.properties

@@ -0,0 +1,43 @@
+# 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/.
+
+addtags = Ouzhpennañ skritelligoù
+alreadyhaveacct = Un arveriad Pocket oc'h endeo ?
+continueff = Kenderc'hel gant Firefox
+errorgeneric = Ur fazi a zo bet en ur enrollañ davet Pocket.
+learnmore = Gouzout hiroc'h
+loginnow = Kennaskañ
+maxtaglength = Bevennet eo ar skritelligoù da 25 arouezenn
+mustbeconnected = Ret eo deoc'h bezañ kennasket d'ar genrouedad evit bezañ gouest da enrollañ davet Pocket. Gwiriekait ho kennask ha klaskit en-dro.
+onlylinkssaved = N'haller enrollañ ereoù nemetken
+pagenotsaved = N'eo ket bet enrollet ar bajenn
+pageremoved = Dilamet ar bajenn
+pagesaved = Enrollet davet Pocket
+processingremove = O tilemel ar bajenn...
+processingtags = Oc'h ouzhpennañ skritelligoù...
+removepage = Dilemel ar bajenn
+save = Enrollañ
+saving = Oc'h enrollañ…
+signupemail = Krouiñ ur gont gant ar chomlec'h postel
+signuptosave = Krouit ur gont Pocket. Digoust eo.
+suggestedtags = Skritelligoù kinniget
+tagline = Enrollit pennadoù ha videoioù adalek Firefox evit gwelet anezho war Pocket war forzh peseurt trevnad, p'ho peus c'hoant.
+taglinestory_one = Klikit war an afell Pocket evit enrollañ ur pennad, video pe pajenn adalek Firefox.
+taglinestory_two = Sellit anezhañ e Pocket war forzh peseurt trevnad, p'ho peus c'hoant.
+tagssaved = Ouzhpennet ur skritellig
+tos = En ur genderc'hel e asantit da <a href="%1$S" target="_blank">Divizoù Arver</a> ha <a href="%2$S" target="_blank">Reolennoù a-fet buhez prevez</a> Pocket
+tryitnow = Amprouit bremañ
+signinfirefox = Kennaskañ gant Firefox
+signupfirefox = Krouiñ ur gont gant Firefox
+viewlist = Gwelout ar roll
+
+# LOCALIZATION NOTE(pocket-button.label, pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+# "Pocket" is a brand name.
+pocket-button.label = Pocket
+pocket-button.tooltiptext = Enrollañ davet Pocket
+saveToPocketCmd.label = Enrollañ ar bajenn davet Pocket
+saveToPocketCmd.accesskey = c
+saveLinkToPocketCmd.label = Enrollañ an ere davet Pocket
+saveLinkToPocketCmd.accesskey = v
+pocketMenuitem.label = Gwelout ar roll Pocket

browser/extensions/pocket/locale/bs/pocket.properties

@@ -0,0 +1,43 @@
+# 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/.
+
+addtags = Dodaj tagove
+alreadyhaveacct = Već ste Pocket korisnik?
+continueff = Nastavi sa Firefoxom
+errorgeneric = Došlo je do greške prilikom spašavanja u Pocket.
+learnmore = Saznajte više
+loginnow = Prijava
+maxtaglength = Tagovi su ograničeni na 25 znakova
+mustbeconnected = Trebate biti konektovani na Internet da biste spasili u Pocket. Molimo da provjerite vašu konekciju i pokušate ponovo.
+onlylinkssaved = Jedino linkovi mogu biti spašeni
+pagenotsaved = Stranica nije spašena
+pageremoved = Stranica uklonjena
+pagesaved = Spašeno u Pocket
+processingremove = Uklanjam stranicu…
+processingtags = Dodajem tagove…
+removepage = Ukloni stranicu
+save = Spasi
+saving = Spašavam…
+signupemail = Registrujte se pomoću emaila
+signuptosave = Registrujte se na Pocket. Besplatan je.
+suggestedtags = Preporučeni tagovi
+tagline = Spasite članke i video klipove iz Firefoxa za pregled u Pocketu na bilo kojem uređaju u bilo koje vrijeme.
+taglinestory_one = Kliknite Pocket dugme da spasite bilo koji članak, video ili stranicu iz Firefoxa.
+taglinestory_two = Pregledajte u Pocketu na bilo kojem uređaju u bilo koje vrijeme.
+tagssaved = Tagovi dodani
+tos = Nastavljanjem, prihvatate Pocketove <a href="%1$S" target="_blank">Uslove korištenja</a> i <a href="%2$S" target="_blank">Policu privatnosti</a>
+tryitnow = Probajte odmah
+signinfirefox = Prijavite se pomoću Firefoxa
+signupfirefox = Registrujte se pomoću Firefoxa
+viewlist = Prikaži listu
+
+# LOCALIZATION NOTE(pocket-button.label, pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+# "Pocket" is a brand name.
+pocket-button.label = Pocket
+pocket-button.tooltiptext = Spasi u Pocket
+saveToPocketCmd.label = Spasi stranicu u Pocket
+saveToPocketCmd.accesskey = k
+saveLinkToPocketCmd.label = Spasi link u Pocket
+saveLinkToPocketCmd.accesskey = o
+pocketMenuitem.label = Prikaži Pocket listu

browser/extensions/pocket/locale/ca/pocket.properties

@@ -0,0 +1,43 @@
+# 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/.
+
+addtags = Afegeix etiquetes
+alreadyhaveacct = Ja teniu un compte al Pocket?
+continueff = Continua amb el Firefox
+errorgeneric = S'ha produït un error en intentar desar al Pocket.
+learnmore = Més informació
+loginnow = Inicia la sessió
+maxtaglength = Les etiquetes tenen un límit de 25 caràcters
+mustbeconnected = Heu d'estar connectat a Internet per poder desar al Pocket. Comproveu la connexió i torneu-ho a provar.
+onlylinkssaved = Només es poden desar enllaços
+pagenotsaved = No s'ha desat la pàgina
+pageremoved = S'ha eliminat la pàgina
+pagesaved = S'ha desat al Pocket
+processingremove = S'està eliminant la pàgina…
+processingtags = S'estan afegint les etiquetes…
+removepage = Elimina la pàgina
+save = Desa
+saving = S'està desant…
+signupemail = Registre amb correu electrònic
+signuptosave = Registreu-vos al Pocket. És gratuït.
+suggestedtags = Etiquetes recomanades
+tagline = Deseu articles i vídeos des del Firefox per veure'ls al Pocket en qualsevol dispositiu i a qualsevol hora.
+taglinestory_one = Feu clic al botó del Pocket per desar un article, vídeo o pàgina des del Firefox.
+taglinestory_two = Vegeu-lo al Pocket en qualsevol dispositiu, a qualsevol hora.
+tagssaved = Etiquetes afegides
+tos = Si continueu, accepteu les <a href="%1$S" target="_blank">condicions del servei</a> i la <a href="%2$S" target="_blank">política de privadesa</a> del Pocket
+tryitnow = Proveu-ho ara
+signinfirefox = Inicia la sessió amb el Firefox
+signupfirefox = Registre amb el Firefox
+viewlist = Mostra la llista
+
+# LOCALIZATION NOTE(pocket-button.label, pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
+# "Pocket" is a brand name.
+pocket-button.label = Pocket
+pocket-button.tooltiptext = Desa al Pocket
+saveToPocketCmd.label = Desa la pàgina al Pocket
+saveToPocketCmd.accesskey = k
+saveLinkToPocketCmd.label = Desa l'enllaç al Pocket
+saveLinkToPocketCmd.accesskey = o
+pocketMenuitem.label = Mostra la llista del Pocket