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

Merge m-c to autoland, a=merge 

MozReview-Commit-ID: 7Z1eEWwhzZC
parents 697050bf 519bb092

accessible/generic/DocAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1608,7 +1608,7 @@ DocAccessible::AddDependentIDsFor(Accessible* aRelProvider, nsIAtom* aRelAttr) 
        break;



      nsIContent* dependentContent = iter.GetElem(id);

      if (relAttr == nsGkAtoms::aria_owns &&

      if (relAttr == nsGkAtoms::aria_owns && dependentContent &&

          !aRelProvider->IsAcceptableChild(dependentContent))

        continue;

browser/components/extensions/test/browser/browser-common.ini

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ skip-if = debug || asan # Bug 1354681 
[browser_ext_tabs_executeScript_multiple.js]

[browser_ext_tabs_executeScript_no_create.js]

[browser_ext_tabs_executeScript_runAt.js]

skip-if = os == "win" # Bug 1398514

[browser_ext_tabs_getCurrent.js]

[browser_ext_tabs_insertCSS.js]

[browser_ext_tabs_lastAccessed.js]

browser/components/sessionstore/test/browser.ini

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ skip-if = true 
[browser_514751.js]

[browser_522375.js]

[browser_522545.js]

skip=if = true # Bug Bug 1380968

[browser_524745.js]

[browser_528776.js]

[browser_579868.js]

browser/components/uitour/test/browser_UITour_availableTargets.js

+2 −3
Original line number Diff line number Diff line
@@ -157,11 +157,10 @@ var pageActionsHelper = { 


function ensureScreenshotsEnabled() {

  SpecialPowers.pushPrefEnv({ set: [

    [ "extensions.screenshots.system", false ],

    [ "extensions.screenshots.disabled", false ],

    [ "extensions.screenshots.system-disabled", false ]

  ]});

  return BrowserTestUtils.waitForCondition(() => {

    return PageActions.actionForID("screenshots") &&

           !CustomizableUI.getWidget("screenshots_mozilla_org-browser-action");

    return PageActions.actionForID("screenshots");

  }, "Should enable Screenshots");

}

browser/extensions/screenshots/bootstrap.js

+4 −29
Original line number Diff line number Diff line 
/* globals ADDON_DISABLE */

// TODO: re-enable

/* eslint-disable */

const OLD_ADDON_PREF_NAME = "extensions.jid1-NeEaf3sAHdKHPA@jetpack.deviceIdInfo";

const OLD_ADDON_ID = "jid1-NeEaf3sAHdKHPA@jetpack";

const ADDON_ID = "screenshots@mozilla.org";
@@ -234,16 +236,8 @@ let photonPageAction; 
// Does nothing otherwise.  Ideally, in the future, WebExtension page actions

// and Photon page actions would be one in the same, but they aren't right now.

function initPhotonPageAction(api, webExtension) {

  // The MOZ_PHOTON_THEME ifdef got removed, but we need to support 55 and 56 as well,

  // so check if the property exists *and* is false before bailing.

  if (typeof AppConstants.MOZ_PHOTON_THEME != "undefined" && !AppConstants.MOZ_PHOTON_THEME) {

    // Photon not supported.  Use the WebExtension's browser action.

    return;

  }



  let id = "screenshots";

  let port = null;

  let baseIconPath = addonResourceURI.spec + "webextension/";



  let {tabManager} = webExtension.extension;
@@ -251,7 +245,7 @@ function initPhotonPageAction(api, webExtension) { 
  photonPageAction = PageActions.actionForID(id) || PageActions.addAction(new PageActions.Action({

    id,

    title: "Take a Screenshot",

    iconURL: baseIconPath + "icons/icon-32-v2.svg",

    iconURL: webExtension.extension.getURL("icons/icon-32-v2.svg"),

    _insertBeforeActionID: null,

    onCommand(event, buttonNode) {

      if (port) {
@@ -265,17 +259,6 @@ function initPhotonPageAction(api, webExtension) { 
    },

  }));



  // Remove the navbar button of the WebExtension's browser action.

  let cuiWidgetID = "screenshots_mozilla_org-browser-action";

  CustomizableUI.addListener({

    onWidgetAfterCreation(wid, aArea) {

      if (wid == cuiWidgetID) {

        CustomizableUI.destroyWidget(cuiWidgetID);

        CustomizableUI.removeListener(this);

      }

    },

  });



  // Establish a port to the WebExtension side.

  api.browser.runtime.onConnect.addListener((listenerPort) => {

    if (listenerPort.name != "photonPageActionPort") {
@@ -289,7 +272,7 @@ function initPhotonPageAction(api, webExtension) { 
          photonPageAction.title = message.title;

        }

        if (message.iconPath) {

          photonPageAction.iconURL = baseIconPath + message.iconPath;

          photonPageAction.iconURL = webExtension.extension.getURL(message.iconPath);

        }

        break;

      default:
@@ -297,13 +280,5 @@ function initPhotonPageAction(api, webExtension) { 
        break;

      }

    });



    // It's necessary to tell the WebExtension not to use its browser action,

    // due to the CUI widget's removal.  Otherwise Firefox's WebExtension

    // machinery throws exceptions.

    port.postMessage({

      type: "setUsePhotonPageAction",

      value: true

    });

  });

}