Commit 32041026 authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge autoland to central, a=merge 

MozReview-Commit-ID: Kf2J7gzSoWd
parents abe68d5d 47db4ca0

accessible/base/nsAccessibilityService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,9 @@ nsAccessibilityService::CreateAccessible(nsINode* aNode, 
    // accessible for it.

    if (!newAcc && aContext->IsXULTabpanels() &&

        content->GetParent() == aContext->GetContent()) {

      FrameType frameType = frame->Type();

      if (frameType == FrameType::Box || frameType == FrameType::Scroll) {

      LayoutFrameType frameType = frame->Type();

      if (frameType == LayoutFrameType::Box ||

          frameType == LayoutFrameType::Scroll) {

        newAcc = new XULTabpanelAccessible(content, document);

      }

    }

accessible/generic/Accessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ Accessible::RelativeBounds(nsIFrame** aBoundingFrame) const 
      nsIFrame* canvasFrame = frame->GetParent();

      if (canvasFrame) {

        canvasFrame = nsLayoutUtils::GetClosestFrameOfType(

          canvasFrame, FrameType::HTMLCanvas);

          canvasFrame, LayoutFrameType::HTMLCanvas);

      }



      // make the canvas the bounding frame

browser/extensions/screenshots/bootstrap.js

+19 −12
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
const OLD_ADDON_PREF_NAME = "extensions.jid1-NeEaf3sAHdKHPA@jetpack.deviceIdInfo";

const OLD_ADDON_ID = "jid1-NeEaf3sAHdKHPA@jetpack";

const ADDON_ID = "screenshots@mozilla.org";

const TELEMETRY_ENABLED_PREF = "toolkit.telemetry.enabled";

const TELEMETRY_ENABLED_PREF = "datareporting.healthreport.uploadEnabled";

const PREF_BRANCH = "extensions.screenshots.";

const USER_DISABLE_PREF = "extensions.screenshots.disabled";

const SYSTEM_DISABLE_PREF = "extensions.screenshots.system-disabled";
@@ -28,15 +28,15 @@ const appStartupPromise = new Promise((resolve,reject) => { 


const prefs = Services.prefs;

const prefObserver = {

  register: function() {

    prefs.addObserver(PREF_BRANCH, this);

  register() {

    prefs.addObserver(PREF_BRANCH, this, false); // eslint-disable-line mozilla/no-useless-parameters

  },



  unregister: function() {

    prefs.removeObserver(PREF_BRANCH, this);

  unregister() {

    prefs.removeObserver(PREF_BRANCH, this, false); // eslint-disable-line mozilla/no-useless-parameters

  },



  observe: function(aSubject, aTopic, aData) {

  observe(aSubject, aTopic, aData) {

    // aSubject is the nsIPrefBranch we're observing (after appropriate QI)

    // aData is the name of the pref that's been changed (relative to aSubject)

    if (aData == USER_DISABLE_PREF || aData == SYSTEM_DISABLE_PREF) {
@@ -47,15 +47,15 @@ const prefObserver = { 
};



const appStartupObserver = {

  register: function() {

    Services.obs.addObserver(this, "sessionstore-windows-restored");

  register() {

    Services.obs.addObserver(this, "sessionstore-windows-restored", false); // eslint-disable-line mozilla/no-useless-parameters

  },



  unregister: function() {

    Services.obs.removeObserver(this, "sessionstore-windows-restored", false);

  unregister() {

    Services.obs.removeObserver(this, "sessionstore-windows-restored", false); // eslint-disable-line mozilla/no-useless-parameters

  },



  observe: function() {

  observe() {

    appStartupDone();

    this.unregister();

  }
@@ -76,6 +76,13 @@ function startup(data, reason) { // eslint-disable-line no-unused-vars 


function shutdown(data, reason) { // eslint-disable-line no-unused-vars

  prefObserver.unregister();

  const webExtension = LegacyExtensionsUtils.getEmbeddedExtensionFor({

    id: ADDON_ID,

    resourceURI: addonResourceURI

  });

  if (webExtension.started) {

    stop(webExtension);

  }

}



function install(data, reason) {} // eslint-disable-line no-unused-vars

browser/extensions/screenshots/install.rdf

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
      </Description>

    </em:targetApplication>

    <em:type>2</em:type>

    <em:version>6.3.0</em:version>

    <em:version>6.6.0</em:version>

    <em:bootstrap>true</em:bootstrap>

    <em:homepageURL>https://pageshot.net/</em:homepageURL>

    <em:multiprocessCompatible>true</em:multiprocessCompatible>

browser/extensions/screenshots/moz.build

+42 −4
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/ach/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["az"] += [

  'webextension/_locales/az/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["be"] += [

  'webextension/_locales/be/messages.json'

]
@@ -45,6 +49,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/cs/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["cy"] += [

  'webextension/_locales/cy/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["de"] += [

  'webextension/_locales/de/messages.json'

]
@@ -89,6 +97,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/fa/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["fi"] += [

  'webextension/_locales/fi/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["fr"] += [

  'webextension/_locales/fr/messages.json'

]
@@ -105,6 +117,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/he/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["hi_IN"] += [

  'webextension/_locales/hi_IN/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["hsb"] += [

  'webextension/_locales/hsb/messages.json'

]
@@ -137,6 +153,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/kk/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["km"] += [

  'webextension/_locales/km/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["ko"] += [

  'webextension/_locales/ko/messages.json'

]
@@ -157,6 +177,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/ms/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["my"] += [

  'webextension/_locales/my/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["nb_NO"] += [

  'webextension/_locales/nb_NO/messages.json'

]
@@ -189,6 +213,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/rm/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["ro"] += [

  'webextension/_locales/ro/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["ru"] += [

  'webextension/_locales/ru/messages.json'

]
@@ -213,6 +241,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/sv_SE/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["te"] += [

  'webextension/_locales/te/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["th"] += [

  'webextension/_locales/th/messages.json'

]
@@ -233,6 +265,10 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales 
  'webextension/_locales/ur/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["uz"] += [

  'webextension/_locales/uz/messages.json'

]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["_locales"]["zh_CN"] += [

  'webextension/_locales/zh_CN/messages.json'

]
@@ -262,6 +298,7 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["build"] 
]



FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["icons"] += [

  'webextension/icons/back-highlight.svg',

  'webextension/icons/back.svg',

  'webextension/icons/cancel.svg',

  'webextension/icons/copy.png',
@@ -269,16 +306,17 @@ FINAL_TARGET_FILES.features['screenshots@mozilla.org']["webextension"]["icons"] 
  'webextension/icons/download.svg',

  'webextension/icons/icon-128.png',

  'webextension/icons/icon-16.png',

  'webextension/icons/icon-16.svg',

  'webextension/icons/icon-19.png',

  'webextension/icons/icon-256.png',

  'webextension/icons/icon-32.png',

  'webextension/icons/icon-32.svg',

  'webextension/icons/icon-38.png',

  'webextension/icons/icon-48.png',

  'webextension/icons/icon-64.png',

  'webextension/icons/icon-highlight-19.png',

  'webextension/icons/icon-highlight-38.png',

  'webextension/icons/icon-starred-19.png',

  'webextension/icons/icon-starred-38.png',

  'webextension/icons/icon-highlight-32.svg',

  'webextension/icons/icon-starred-32.svg',

  'webextension/icons/icon-welcome-face-without-eyes.svg',

  'webextension/icons/menu-fullpage.svg',

  'webextension/icons/menu-myshot.svg',

  'webextension/icons/menu-visible.svg',