Merge mozilla-central to inbound a=merge

Cargo.lock

@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "Inflector"
 version = "0.11.2"

browser/base/content/tabbrowser.xml

@@ -153,7 +153,7 @@
             this.removeAttribute("overflow");
 
             if (this._lastTabClosedByMouse) {
-              this._expandSpacerBy(this._scrollButtonDown.clientWidth);
+              this._expandSpacerBy(this.arrowScrollbox._scrollButtonDown.clientWidth);
             }
 
             for (let tab of Array.from(gBrowser._removingTabs)) {

browser/components/BrowserGlue.jsm

@@ -517,6 +517,8 @@ const listeners = {
     "FormValidation:HidePopup": ["FormValidationHandler"],
     "PictureInPicture:Request": ["PictureInPicture"],
     "PictureInPicture:Close": ["PictureInPicture"],
+    "PictureInPicture:Playing": ["PictureInPicture"],
+    "PictureInPicture:Paused": ["PictureInPicture"],
     "Prompt:Open": ["RemotePrompt"],
     "Reader:FaviconRequest": ["ReaderParent"],
     "Reader:UpdateReaderButton": ["ReaderParent"],

browser/components/preferences/in-content/tests/siteData/browser_siteData3.js

@@ -92,7 +92,7 @@ add_task(async function test_grouping() {
 
   let [value, unit] = DownloadUtils.convertByteUnits(quotaUsage * 4);
   let l10nAttributes = frameDoc.l10n.getAttributes(columns[2]);
-  is(l10nAttributes.id, "site-usage-persistent",
+  is(l10nAttributes.id, "site-storage-persistent",
     "Should show the site as persistent if one origin is persistent.");
   // The shown quota can be slightly larger than the raw data we put in (though it should
   // never be smaller), but that doesn't really matter to us since we only want to test that

browser/components/preferences/siteDataSettings.js

@@ -62,7 +62,7 @@ let gSiteDataSettings = {
     // Add "Storage" column
     if (site.usage > 0 || site.persisted) {
       let [value, unit] = DownloadUtils.convertByteUnits(site.usage);
-      let strName = site.persisted ? "site-usage-persistent" : "site-usage-pattern";
+      let strName = site.persisted ? "site-storage-persistent" : "site-storage-usage";
       addColumnItem({
         id: strName,
         args: { value, unit },

browser/extensions/screenshots/background/main.js

@@ -189,7 +189,7 @@ this.main = (function() {
     // Discussion: https://bugzilla.mozilla.org/show_bug.cgi?id=1310082
     // List of domains copied from: https://dxr.mozilla.org/mozilla-central/source/browser/app/permissions#18-19
     // Note we disable it here to be informative, the security check is done in WebExtension code
-    const badDomains = ["addons.mozilla.org", "testpilot.firefox.com"];
+    const badDomains = ["testpilot.firefox.com"];
     let domain = url.replace(/^https?:\/\//i, "");
     domain = domain.replace(/\/.*/, "").replace(/:.*/, "");
     domain = domain.toLowerCase();

browser/locales/en-US/browser/preferences/siteDataSettings.ftl

@@ -38,8 +38,10 @@ site-data-button-save =
 # Variables:
 #   $value (Number) - Value of the unit (for example: 4.6, 500)
 #   $unit (String) - Name of the unit (for example: "bytes", "KB")
-site-usage-pattern = { $value } { $unit }
-site-usage-persistent = { site-usage-pattern } (Persistent)
+site-storage-usage =
+    .value = { $value } { $unit }
+site-storage-persistent =
+    .value = { site-storage-usage.value } (Persistent)
 
 site-data-remove-all =
     .label = Remove All

browser/themes/shared/controlcenter/panel.inc.css

@@ -612,9 +612,9 @@ description#identity-popup-content-verifier,
 
 /* Show the right action buttons depending on content state */
 /* Offer to temporarily add an exception in private mode. */
-#main-window:not([privatebrowsingmode]) #identity-popup-content-blocking-content[blocking]:not([hasException]) > #tracking-action-unblock,
+:root:not([privatebrowsingmode]) #identity-popup-content-blocking-content[blocking]:not([hasException]) > #tracking-action-unblock,
 /* Offer to permanently add an exception in normal mode. */
-#main-window[privatebrowsingmode] #identity-popup-content-blocking-content[blocking]:not([hasException]) > #tracking-action-unblock-private,
+:root[privatebrowsingmode] #identity-popup-content-blocking-content[blocking]:not([hasException]) > #tracking-action-unblock-private,
 /* If there's an exception just offer to remove the exception again. */
 #identity-popup-content-blocking-content[hasException] > #tracking-action-block {
   display: -moz-box;

devtools/client/debugger/new/panel.js

@@ -99,6 +99,21 @@ DebuggerPanel.prototype = {
     return Promise.all([onNodeFrontSet, onInspectorUpdated]);
   },
 
+  highlightDomElement: async function(grip) {
+    await this.toolbox.initInspector();
+    if (!this.toolbox.highlighter) {
+      return null;
+    }
+    const nodeFront = await this.toolbox.walker.gripToNodeFront(grip);
+    return this.toolbox.highlighter.highlight(nodeFront);
+  },
+
+  unHighlightDomElement: function() {
+    return this.toolbox.highlighter
+      ? this.toolbox.highlighter.unhighlight(false)
+      : null;
+  },
+
   getFrames: function() {
     const thread = this._selectors.getCurrentThread(this._getState());
     const frames = this._selectors.getFrames(this._getState(), thread);

devtools/client/debugger/new/src/actions/toolbox.js

@@ -34,3 +34,15 @@ export function openElementInInspectorCommand(grip: Grip) {
     return panel.openElementInInspector(grip);
   };
 }
+
+export function highlightDomElement(grip: Grip) {
+  return async ({ panel }: ThunkArgs) => {
+    return panel.highlightDomElement(grip);
+  };
+}
+
+export function unHighlightDomElement(grip: Grip) {
+  return async ({ panel }: ThunkArgs) => {
+    return panel.unHighlightDomElement(grip);
+  };
+}

devtools/client/debugger/new/src/client/firefox/types.js

@@ -364,5 +364,7 @@ export type Panel = {|
   openLink: (url: string) => void,
   openWorkerToolbox: (worker: Worker) => void,
   openElementInInspector: (grip: Object) => void,
-  openConsoleAndEvaluate: (input: string) => void
+  openConsoleAndEvaluate: (input: string) => void,
+  highlightDomElement: (grip: Object) => void,
+  unHighlightDomElement: (grip: Object) => void
 |};

devtools/client/debugger/new/src/components/Editor/Preview/Popup.js

@@ -51,7 +51,9 @@ type Props = {
   addExpression: typeof actions.addExpression,
   selectSourceURL: typeof actions.selectSourceURL,
   openLink: typeof actions.openLink,
-  openElementInInspector: typeof actions.openElementInInspectorCommand
+  openElementInInspector: typeof actions.openElementInInspectorCommand,
+  highlightDomElement: typeof actions.highlightDomElement,
+  unHighlightDomElement: typeof actions.unHighlightDomElement
 };
 
 type State = {
@@ -243,7 +245,12 @@ export class Popup extends Component<Props, State> {
   }
 
   renderObjectInspector(roots: Array<Object>) {
-    const { openLink, openElementInInspector } = this.props;
+    const {
+      openLink,
+      openElementInInspector,
+      highlightDomElement,
+      unHighlightDomElement
+    } = this.props;
 
     return (
       <ObjectInspector
@@ -255,6 +262,8 @@ export class Popup extends Component<Props, State> {
         createObjectClient={grip => createObjectClient(grip)}
         onDOMNodeClick={grip => openElementInInspector(grip)}
         onInspectIconClick={grip => openElementInInspector(grip)}
+        onDOMNodeMouseOver={grip => highlightDomElement(grip)}
+        onDOMNodeMouseOut={grip => unHighlightDomElement(grip)}
       />
     );
   }
@@ -332,7 +341,9 @@ const {
   selectSourceURL,
   setPopupObjectProperties,
   openLink,
-  openElementInInspectorCommand
+  openElementInInspectorCommand,
+  highlightDomElement,
+  unHighlightDomElement
 } = actions;
 
 const mapDispatchToProps = {
@@ -340,7 +351,9 @@ const mapDispatchToProps = {
   selectSourceURL,
   setPopupObjectProperties,
   openLink,
-  openElementInInspector: openElementInInspectorCommand
+  openElementInInspector: openElementInInspectorCommand,
+  highlightDomElement,
+  unHighlightDomElement
 };
 
 export default connect(

devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js

@@ -49,7 +49,9 @@ type Props = {
   updateExpression: typeof actions.updateExpression,
   deleteExpression: typeof actions.deleteExpression,
   openLink: typeof actions.openLink,
-  openElementInInspector: typeof actions.openElementInInspectorCommand
+  openElementInInspector: typeof actions.openElementInInspectorCommand,
+  highlightDomElement: typeof actions.highlightDomElement,
+  unHighlightDomElement: typeof actions.unHighlightDomElement
 };
 
 class Expressions extends Component<Props, State> {
@@ -215,7 +217,14 @@ class Expressions extends Component<Props, State> {
   };
 
   renderExpression = (expression: Expression, index: number) => {
-    const { expressionError, openLink, openElementInInspector } = this.props;
+    const {
+      expressionError,
+      openLink,
+      openElementInInspector,
+      highlightDomElement,
+      unHighlightDomElement
+    } = this.props;
+
     const { editing, editIndex } = this.state;
     const { input, updating } = expression;
     const isEditingExpr = editing && editIndex === index;
@@ -253,6 +262,8 @@ class Expressions extends Component<Props, State> {
             createObjectClient={grip => createObjectClient(grip)}
             onDOMNodeClick={grip => openElementInInspector(grip)}
             onInspectIconClick={grip => openElementInInspector(grip)}
+            onDOMNodeMouseOver={grip => highlightDomElement(grip)}
+            onDOMNodeMouseOut={grip => unHighlightDomElement(grip)}
           />
           <div className="expression-container__close-btn">
             <CloseButton
@@ -383,6 +394,8 @@ export default connect(
     updateExpression: actions.updateExpression,
     deleteExpression: actions.deleteExpression,
     openLink: actions.openLink,
-    openElementInInspector: actions.openElementInInspectorCommand
+    openElementInInspector: actions.openElementInInspectorCommand,
+    highlightDomElement: actions.highlightDomElement,
+    unHighlightDomElement: actions.unHighlightDomElement
   }
 )(Expressions);

devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js

@@ -39,6 +39,8 @@ type Props = {
   shouldMapScopes: boolean,
   openLink: typeof actions.openLink,
   openElementInInspector: typeof actions.openElementInInspectorCommand,
+  highlightDomElement: typeof actions.highlightDomElement,
+  unHighlightDomElement: typeof actions.unHighlightDomElement,
   toggleMapScopes: typeof actions.toggleMapScopes
 };
 
@@ -111,6 +113,8 @@ class Scopes extends PureComponent<Props, State> {
       isLoading,
       openLink,
       openElementInInspector,
+      highlightDomElement,
+      unHighlightDomElement,
       shouldMapScopes
     } = this.props;
     const { originalScopes, generatedScopes, showOriginal } = this.state;
@@ -131,6 +135,8 @@ class Scopes extends PureComponent<Props, State> {
             createObjectClient={grip => createObjectClient(grip)}
             onDOMNodeClick={grip => openElementInInspector(grip)}
             onInspectIconClick={grip => openElementInInspector(grip)}
+            onDOMNodeMouseOver={grip => highlightDomElement(grip)}
+            onDOMNodeMouseOut={grip => unHighlightDomElement(grip)}
           />
         </div>
       );
@@ -200,6 +206,8 @@ export default connect(
   {
     openLink: actions.openLink,
     openElementInInspector: actions.openElementInInspectorCommand,
+    highlightDomElement: actions.highlightDomElement,
+    unHighlightDomElement: actions.unHighlightDomElement,
     toggleMapScopes: actions.toggleMapScopes
   }
 )(Scopes);

devtools/client/debugger/new/src/components/SecondaryPanes/tests/__snapshots__/Expressions.spec.js.snap

@@ -18,6 +18,8 @@ exports[`Expressions should always have unique keys 1`] = `
         createObjectClient={[Function]}
         disableWrap={true}
         onDOMNodeClick={[Function]}
+        onDOMNodeMouseOut={[Function]}
+        onDOMNodeMouseOver={[Function]}
         onInspectIconClick={[Function]}
         roots={
           Array [
@@ -58,6 +60,8 @@ exports[`Expressions should always have unique keys 1`] = `
         createObjectClient={[Function]}
         disableWrap={true}
         onDOMNodeClick={[Function]}
+        onDOMNodeMouseOut={[Function]}
+        onDOMNodeMouseOver={[Function]}
         onInspectIconClick={[Function]}
         roots={
           Array [
@@ -132,6 +136,8 @@ exports[`Expressions should render 1`] = `
         createObjectClient={[Function]}
         disableWrap={true}
         onDOMNodeClick={[Function]}
+        onDOMNodeMouseOut={[Function]}
+        onDOMNodeMouseOver={[Function]}
         onInspectIconClick={[Function]}
         roots={
           Array [
@@ -172,6 +178,8 @@ exports[`Expressions should render 1`] = `
         createObjectClient={[Function]}
         disableWrap={true}
         onDOMNodeClick={[Function]}
+        onDOMNodeMouseOut={[Function]}
+        onDOMNodeMouseOver={[Function]}
         onInspectIconClick={[Function]}
         roots={
           Array [

devtools/client/debugger/new/src/main.development.js

@@ -25,6 +25,10 @@ bootstrap(React, ReactDOM).then(connection => {
     openWorkerToolbox: worker => alert(worker.url),
     openElementInInspector: grip =>
       alert(`Opening node in Inspector: ${grip.class}`),
-    openConsoleAndEvaluate: input => alert(`console.log: ${input}`)
+    openConsoleAndEvaluate: input => alert(`console.log: ${input}`),
+    highlightDomElement: (grip: Object) =>
+      console.log("highlighting dom element"),
+    unHighlightDomElement: (grip: Object) =>
+      console.log("unhighlighting dom element")
   });
 });

devtools/client/debugger/new/test/mochitest/browser_dbg-inspector-integration.js

@@ -17,13 +17,28 @@ function waitForInspectorPanelChange(dbg) {
 }
 
 add_task(async function() {
-  const dbg = await initDebugger("doc-script-switching.html");
+  // Ensures the end panel is wide enough to show the inspector icon
+  await pushPref("devtools.debugger.end-panel-size", 600);
 
-  await addExpression(dbg, "window.document.body.firstChild");
+  const dbg = await initDebugger("doc-script-switching.html");
+  const { toolbox } = dbg;
+
+  await addExpression(dbg, "window.document.querySelector('button')");
 
   await waitForElement(dbg, "openInspector");
-  findElement(dbg, "openInspector").click();
 
+  const inspectorNode = findElement(dbg, "openInspector");
+
+  // Ensure hovering over button highlights the node in content pane
+  const view = inspectorNode.ownerDocument.defaultView;
+  const onNodeHighlight = toolbox.target.once("inspector")
+    .then(inspector => inspector.highlighter.once("node-highlight"));
+  EventUtils.synthesizeMouseAtCenter(inspectorNode, {type: "mousemove"}, view);
+  const nodeFront = await onNodeHighlight;
+  is(nodeFront.displayName, "button", "The correct node was highlighted");
+
+  // Ensure panel changes when button is clicked
+  inspectorNode.click();
   await waitForInspectorPanelChange(dbg);
 });
 

devtools/client/locales/en-US/netmonitor.properties

@@ -917,7 +917,7 @@ netmonitor.trackingResource.tooltip=This URL matches a known tracker and it woul
 netmonitor.context.copy=Copy
 
 # LOCALIZATION NOTE (netmonitor.context.copy.accesskey): This is the access key
-# for the copy sub-menu displayed in the context menu for a request
+# for the copy menu/sub-menu displayed in the context menu for a request
 netmonitor.context.copy.accesskey=C
 
 # LOCALIZATION NOTE (netmonitor.context.copyUrl): This is the label displayed
@@ -994,6 +994,14 @@ netmonitor.context.saveImageAs=Save Image As
 # for the Copy Image As Data URI menu item displayed in the context menu for a request
 netmonitor.context.saveImageAs.accesskey=v
 
+# LOCALIZATION NOTE (netmonitor.context.copyAll): This is the label displayed
+# on the context menu that copies all data
+netmonitor.context.copyAll=Copy All
+
+# LOCALIZATION NOTE (netmonitor.context.copyAll.accesskey): This is the access key
+# for the Copy All menu item displayed in the context menu for a properties view panel
+netmonitor.context.copyAll.accesskey=A
+
 # LOCALIZATION NOTE (netmonitor.context.copyAllAsHar): This is the label displayed
 # on the context menu that copies all as HAR format
 netmonitor.context.copyAllAsHar=Copy All As HAR

devtools/client/netmonitor/src/components/PropertiesView.js

@@ -15,6 +15,7 @@ const { FILTER_SEARCH_DELAY } = require("../constants");
 
 // Components
 const TreeViewClass = require("devtools/client/shared/components/tree/TreeView");
+const PropertiesViewContextMenu = require("../widgets/PropertiesViewContextMenu");
 const TreeView = createFactory(TreeViewClass);
 
 loader.lazyGetter(this, "SearchBox", function() {
@@ -155,6 +156,23 @@ class PropertiesView extends Component {
     return TreeRow(props);
   }
 
+  onContextMenuRow(member, evt) {
+    evt.preventDefault();
+
+    const { object } = member;
+
+    // Select the right clicked row
+    this.selectRow(evt.currentTarget);
+
+    // if data exists and can be copied, then show the contextmenu
+    if (typeof (object) === "object") {
+      if (!this.contextMenu) {
+        this.contextMenu = new PropertiesViewContextMenu({});
+      }
+      this.contextMenu.open(evt, { member, object: this.props.object });
+    }
+  }
+
   renderValueWithRep(props) {
     const { member } = props;
 
@@ -240,6 +258,7 @@ class PropertiesView extends Component {
             renderRow: renderRow || this.renderRowWithExtras,
             renderValue: renderValue || this.renderValueWithRep,
             openLink,
+            onContextMenuRow: this.onContextMenuRow,
           }),
         ),
       )

devtools/client/netmonitor/src/widgets/PropertiesViewContextMenu.js

@@ -0,0 +1,65 @@
+/* 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 { L10N } = require("../utils/l10n");
+
+loader.lazyRequireGetter(this, "copyString", "devtools/shared/platform/clipboard", true);
+loader.lazyRequireGetter(this, "showMenu", "devtools/client/shared/components/menu/utils", true);
+
+class PropertiesViewContextMenu {
+  constructor(props) {
+    this.props = props;
+  }
+
+  /**
+   * Handle the context menu opening.
+   * @param {*} event open event
+   * @param {*} member member of the right-clicked row
+   * @param {*} object the whole data object
+   */
+  open(event = {}, { member, object }) {
+    const menu = [];
+
+    menu.push({
+      id: "properties-view-context-menu-copy",
+      label: L10N.getStr("netmonitor.context.copy"),
+      accesskey: L10N.getStr("netmonitor.context.copy.accesskey"),
+      click: () => this.copySelected(member),
+    });
+
+    menu.push({
+      id: "properties-view-context-menu-copyall",
+      label: L10N.getStr("netmonitor.context.copyAll"),
+      accesskey: L10N.getStr("netmonitor.context.copyAll.accesskey"),
+      click: () => this.copyAll(object),
+    });
+
+    showMenu(menu, {
+      screenX: event.screenX,
+      screenY: event.screenY,
+    });
+  }
+
+  copyAll(data) {
+    try {
+      copyString(JSON.stringify(data));
+    } catch (error) {}
+  }
+
+  copySelected({ object, hasChildren }) {
+    if (hasChildren) {
+      // If has children, copy the data as JSON
+      try {
+        copyString(JSON.stringify({ [object.name]: object.value }));
+      } catch (error) {}
+    } else {
+      // Copy the data as key-value format
+      copyString(`${object.name}: ${object.value}`);
+    }
+  }
+}
+
+module.exports = PropertiesViewContextMenu;

devtools/client/netmonitor/src/widgets/moz.build

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'PropertiesViewContextMenu.js',
     'RequestListContextMenu.js',
     'RequestListHeaderContextMenu.js',
     'WaterfallBackground.js',

devtools/client/netmonitor/test/browser.ini

@@ -103,6 +103,8 @@ subsuite = clipboard
 subsuite = clipboard
 [browser_net_copy_url.js]
 subsuite = clipboard
+[browser_net_propertiesview-copy.js]
+subsuite = clipboard
 [browser_net_copy_params.js]
 subsuite = clipboard
 skip-if = (verify && !debug && (os == 'mac')) # bug 1328915, disable linux32 debug devtools for timeouts

devtools/client/netmonitor/test/browser_net_propertiesview-copy.js

@@ -0,0 +1,120 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Test if response JSON in PropertiesView can be copied
+ */
+
+add_task(async function() {
+  const { tab, monitor } = await initNetMonitor(JSON_BASIC_URL + "?name=nogrip");
+  info("Starting test... ");
+
+  const { document, store, windowRequire } = monitor.panelWin;
+  const Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+
+  store.dispatch(Actions.batchEnable(false));
+
+  await performRequests(monitor, tab, 1);
+
+  const onResponsePanelReady = waitForDOM(document, "#response-panel .treeTable");
+  store.dispatch(Actions.toggleNetworkDetails());
+  EventUtils.sendMouseEvent({ type: "click" },
+    document.querySelector("#response-tab"));
+  await onResponsePanelReady;
+
+  const responsePanel = document.querySelector("#response-panel");
+
+  const objectRow = responsePanel.querySelectorAll(".objectRow")[1];
+  const stringRow = responsePanel.querySelectorAll(".stringRow")[0];
+
+  /* Test for copy an object */
+  EventUtils.sendMouseEvent({ type: "contextmenu" },
+    objectRow);
+  await waitForClipboardPromise(function setup() {
+    monitor.panelWin.parent.document
+      .querySelector("#properties-view-context-menu-copy").click();
+  }, `{"obj":{"type":"string"}}`);
+
+  /* Test for copy all */
+  EventUtils.sendMouseEvent({ type: "contextmenu" },
+    objectRow);
+  await waitForClipboardPromise(function setup() {
+    monitor.panelWin.parent.document
+      .querySelector("#properties-view-context-menu-copyall").click();
+  }, `{"JSON":{"obj":{"type":"string"}},` +
+    `"Response payload":{"EDITOR_CONFIG":{"text":` +
+    `"{\\"obj\\": {\\"type\\": \\"string\\" }}","mode":"application/json"}}}`);
+
+  /* Test for copy a single row */
+  EventUtils.sendMouseEvent({ type: "contextmenu" },
+    stringRow);
+  await waitForClipboardPromise(function setup() {
+    monitor.panelWin.parent.document
+      .querySelector("#properties-view-context-menu-copy").click();
+  }, "type: string");
+
+  await teardown(monitor);
+});
+
+/**
+ * Test if response/request Cookies in PropertiesView can be copied
+ */
+
+add_task(async function() {
+  const { tab, monitor } = await initNetMonitor(SIMPLE_UNSORTED_COOKIES_SJS);
+  info("Starting test... ");
+
+  const { document, store, windowRequire } = monitor.panelWin;
+  const Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+
+  store.dispatch(Actions.batchEnable(false));
+
+  tab.linkedBrowser.reload();
+
+  let wait = waitForNetworkEvents(monitor, 1);
+  await wait;
+
+  wait = waitForDOM(document, ".headers-overview");
+  EventUtils.sendMouseEvent({ type: "mousedown" },
+    document.querySelectorAll(".request-list-item")[0]);
+  await wait;
+
+  EventUtils.sendMouseEvent({ type: "mousedown" },
+    document.querySelectorAll(".request-list-item")[0]);
+  EventUtils.sendMouseEvent({ type: "click" },
+    document.querySelector("#cookies-tab"));
+
+  const cookiesPanel = document.querySelector("#cookies-panel");
+
+  const objectRows = cookiesPanel.querySelectorAll(".objectRow:not(.tree-section)");
+  const stringRows = cookiesPanel.querySelectorAll(".stringRow");
+
+  const expectedResponseCookies = [
+    { bob: { httpOnly: true, value: "true" } },
+    { foo: { httpOnly: true, value: "bar"  } },
+    { tom: { httpOnly: true, value: "cool" } }];
+  for (let i = 0; i < objectRows.length; i++) {
+    const cur = objectRows[i];
+    EventUtils.sendMouseEvent({ type: "contextmenu" },
+      cur);
+    await waitForClipboardPromise(function setup() {
+      monitor.panelWin.parent.document
+        .querySelector("#properties-view-context-menu-copy").click();
+    }, JSON.stringify(expectedResponseCookies[i]));
+  }
+
+  const expectedRequestCookies = ["bob: true", "foo: bar", "tom: cool"];
+  for (let i = 0; i < expectedRequestCookies.length; i++) {
+    const cur = stringRows[objectRows.length + i];
+    EventUtils.sendMouseEvent({ type: "contextmenu" },
+      cur);
+    await waitForClipboardPromise(function setup() {
+      monitor.panelWin.parent.document
+        .querySelector("#properties-view-context-menu-copy").click();
+    }, expectedRequestCookies[i]);
+  }
+
+  await teardown(monitor);
+});

devtools/client/shared/components/tree/TreeView.js

@@ -127,6 +127,8 @@ define(function(require, exports, module) {
         onSort: PropTypes.func,
         // Custom row click callback
         onClickRow: PropTypes.func,
+        // Row context menu event handler
+        onContextMenuRow: PropTypes.func,
         // Tree context menu event handler
         onContextMenuTree: PropTypes.func,
         // A header is displayed if set to true
@@ -368,6 +370,13 @@ define(function(require, exports, module) {
       this.selectRow(event.currentTarget);
     }
 
+    onContextMenu(member, event) {
+      const onContextMenuRow = this.props.onContextMenuRow;
+      if (onContextMenuRow) {
+        onContextMenuRow.call(this, member, event);
+      }
+    }
+
     getSelectedRow() {
       if (!this.state.selected || this.rows.length === 0) {
         return null;
@@ -539,6 +548,7 @@ define(function(require, exports, module) {
           id: member.path,
           ref: row => row && this.rows.push(row),
           onClick: this.onClickRow.bind(this, member.path),
+          onContextMenu: this.onContextMenu.bind(this, member),
         });
 
         // Render single row.

dom/base/Document.cpp

@@ -9163,15 +9163,13 @@ nsresult Document::GetStateObject(nsIVariant** aState) {
   // current state object.
 
   if (!mStateObjectCached && mStateObjectContainer) {
-    AutoJSContext cx;
-    nsIGlobalObject* sgo = GetScopeObject();
-    NS_ENSURE_TRUE(sgo, NS_ERROR_UNEXPECTED);
-    JS::Rooted<JSObject*> global(cx, sgo->GetGlobalJSObject());
-    NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
-    JSAutoRealm ar(cx, global);
-
+    AutoJSAPI jsapi;
+    // Init with null is "OK" in the sense that it will just fail.
+    if (!jsapi.Init(GetScopeObject())) {
+      return NS_ERROR_UNEXPECTED;
+    }
     mStateObjectContainer->DeserializeToVariant(
-        cx, getter_AddRefs(mStateObjectCached));
+        jsapi.cx(), getter_AddRefs(mStateObjectCached));
   }
 
   NS_IF_ADDREF(*aState = mStateObjectCached);

dom/base/nsGlobalWindowInner.cpp

@@ -4537,9 +4537,9 @@ void nsGlobalWindowInner::FireOfflineStatusEventIfChanged() {
 }
 
 nsGlobalWindowInner::SlowScriptResponse
-nsGlobalWindowInner::ShowSlowScriptDialog(const nsString& aAddonId) {
+nsGlobalWindowInner::ShowSlowScriptDialog(JSContext* aCx,
+                                          const nsString& aAddonId) {
   nsresult rv;
-  AutoJSContext cx;
 
   if (Preferences::GetBool("dom.always_stop_slow_scripts")) {
     return KillSlowScript;
@@ -4549,7 +4549,7 @@ nsGlobalWindowInner::ShowSlowScriptDialog(const nsString& aAddonId) {
   // (since that spins the event loop). In that (rare) case, we just kill the
   // script and report a warning.
   if (!nsContentUtils::IsSafeToRunScript()) {
-    JS_ReportWarningASCII(cx, "A long running script was terminated");
+    JS_ReportWarningASCII(aCx, "A long running script was terminated");
     return KillSlowScript;
   }
 
@@ -4568,7 +4568,7 @@ nsGlobalWindowInner::ShowSlowScriptDialog(const nsString& aAddonId) {
   // minified scripts which is more common in Web content that is loaded in the
   // content process.
   unsigned* linenop = XRE_IsParentProcess() ? &lineno : nullptr;
-  bool hasFrame = JS::DescribeScriptedCaller(cx, &filename, linenop);
+  bool hasFrame = JS::DescribeScriptedCaller(aCx, &filename, linenop);
 
   // Record the slow script event if we haven't done so already for this inner
   // window (which represents a particular page to the user).
@@ -4737,7 +4737,7 @@ nsGlobalWindowInner::ShowSlowScriptDialog(const nsString& aAddonId) {
   int32_t buttonPressed = 0;  // In case the user exits dialog by clicking X.
   {
     // Null out the operation callback while we're re-entering JS here.
-    AutoDisableJSInterruptCallback disabler(cx);
+    AutoDisableJSInterruptCallback disabler(aCx);
 
     // Open the dialog.
     rv = prompt->ConfirmEx(
@@ -4758,7 +4758,7 @@ nsGlobalWindowInner::ShowSlowScriptDialog(const nsString& aAddonId) {
     return NS_SUCCEEDED(rv) ? ContinueSlowScript : KillSlowScript;
   }
 
-  JS_ClearPendingException(cx);
+  JS_ClearPendingException(aCx);
 
   if (checkboxValue && isAddonScript) return KillScriptGlobal;
   return KillSlowScript;

dom/base/nsGlobalWindowInner.h

@@ -467,7 +467,8 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
     KillSlowScript,
     KillScriptGlobal
   };
-  SlowScriptResponse ShowSlowScriptDialog(const nsString& aAddonId);
+  SlowScriptResponse ShowSlowScriptDialog(JSContext* aCx,
+                                          const nsString& aAddonId);
 
   // Inner windows only.
   void AddGamepad(uint32_t aIndex, mozilla::dom::Gamepad* aGamepad);

dom/base/nsJSEnvironment.cpp

@@ -654,7 +654,7 @@ nsresult nsJSContext::SetProperty(JS::Handle<JSObject*> aTarget,
   JS::RootedVector<JS::Value> args(cx);
 
   JS::Rooted<JSObject*> global(cx, GetWindowProxy());
-  nsresult rv = ConvertSupportsTojsvals(aArgs, global, &args);
+  nsresult rv = ConvertSupportsTojsvals(cx, aArgs, global, &args);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // got the arguments, now attach them.
@@ -675,7 +675,7 @@ nsresult nsJSContext::SetProperty(JS::Handle<JSObject*> aTarget,
 }
 
 nsresult nsJSContext::ConvertSupportsTojsvals(
-    nsISupports* aArgs, JS::Handle<JSObject*> aScope,
+    JSContext* aCx, nsISupports* aArgs, JS::Handle<JSObject*> aScope,
     JS::MutableHandleVector<JS::Value> aArgsOut) {
   nsresult rv = NS_OK;
 
@@ -697,7 +697,6 @@ nsresult nsJSContext::ConvertSupportsTojsvals(
 
   nsIXPConnect* xpc = nsContentUtils::XPConnect();
   NS_ENSURE_TRUE(xpc, NS_ERROR_UNEXPECTED);
-  AutoJSContext cx;
 
   if (!aArgs) return NS_OK;
   uint32_t argCount;
@@ -730,12 +729,12 @@ nsresult nsJSContext::ConvertSupportsTojsvals(
       }
       nsCOMPtr<nsIVariant> variant(do_QueryInterface(arg));
       if (variant != nullptr) {
-        rv = xpc->VariantToJS(cx, aScope, variant, thisVal);
+        rv = xpc->VariantToJS(aCx, aScope, variant, thisVal);
       } else {
         // And finally, support the nsISupportsPrimitives supplied
         // by the AppShell.  It generally will pass only strings, but
         // as we have code for handling all, we may as well use it.
-        rv = AddSupportsPrimitiveTojsvals(arg, thisVal.address());
+        rv = AddSupportsPrimitiveTojsvals(aCx, arg, thisVal.address());
         if (rv == NS_ERROR_NO_INTERFACE) {
           // something else - probably an event object or similar -
           // just wrap it.
@@ -746,15 +745,15 @@ nsresult nsJSContext::ConvertSupportsTojsvals(
           NS_ASSERTION(prim == nullptr,
                        "Don't pass nsISupportsPrimitives - use nsIVariant!");
 #endif
-          JSAutoRealm ar(cx, aScope);
-          rv = nsContentUtils::WrapNative(cx, arg, thisVal);
+          JSAutoRealm ar(aCx, aScope);
+          rv = nsContentUtils::WrapNative(aCx, arg, thisVal);
         }
       }
     }
   } else {
     nsCOMPtr<nsIVariant> variant = do_QueryInterface(aArgs);
     if (variant) {
-      rv = xpc->VariantToJS(cx, aScope, variant, aArgsOut[0]);
+      rv = xpc->VariantToJS(aCx, aScope, variant, aArgsOut[0]);
     } else {
       NS_ERROR("Not an array, not an interface?");
       rv = NS_ERROR_UNEXPECTED;
@@ -764,14 +763,14 @@ nsresult nsJSContext::ConvertSupportsTojsvals(
 }
 
 // This really should go into xpconnect somewhere...
-nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
+nsresult nsJSContext::AddSupportsPrimitiveTojsvals(JSContext* aCx,
+                                                   nsISupports* aArg,
                                                    JS::Value* aArgv) {
   MOZ_ASSERT(aArg, "Empty arg");
 
   nsCOMPtr<nsISupportsPrimitive> argPrimitive(do_QueryInterface(aArg));
   if (!argPrimitive) return NS_ERROR_NO_INTERFACE;
 
-  AutoJSContext cx;
   uint16_t type;
   argPrimitive->GetType(&type);
 
@@ -784,7 +783,7 @@ nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
 
       p->GetData(data);
 
-      JSString* str = ::JS_NewStringCopyN(cx, data.get(), data.Length());
+      JSString* str = ::JS_NewStringCopyN(aCx, data.get(), data.Length());
       NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
       aArgv->setString(str);
@@ -801,7 +800,7 @@ nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
 
       // cast is probably safe since wchar_t and char16_t are expected
       // to be equivalent; both unsigned 16-bit entities
-      JSString* str = ::JS_NewUCStringCopyN(cx, data.get(), data.Length());
+      JSString* str = ::JS_NewUCStringCopyN(aCx, data.get(), data.Length());
       NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
       aArgv->setString(str);
@@ -863,7 +862,7 @@ nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
 
       p->GetData(&data);
 
-      JSString* str = ::JS_NewStringCopyN(cx, &data, 1);
+      JSString* str = ::JS_NewStringCopyN(aCx, &data, 1);
       NS_ENSURE_TRUE(str, NS_ERROR_OUT_OF_MEMORY);
 
       aArgv->setString(str);
@@ -931,10 +930,10 @@ nsresult nsJSContext::AddSupportsPrimitiveTojsvals(nsISupports* aArg,
 
       AutoFree iidGuard(iid);  // Free iid upon destruction.
 
-      JS::Rooted<JSObject*> scope(cx, GetWindowProxy());
-      JS::Rooted<JS::Value> v(cx);
-      JSAutoRealm ar(cx, scope);
-      nsresult rv = nsContentUtils::WrapNative(cx, data, iid, &v);
+      JS::Rooted<JSObject*> scope(aCx, GetWindowProxy());
+      JS::Rooted<JS::Value> v(aCx);
+      JSAutoRealm ar(aCx, scope);
+      nsresult rv = nsContentUtils::WrapNative(aCx, data, iid, &v);
       NS_ENSURE_SUCCESS(rv, rv);
 
       *aArgv = v;

dom/base/nsJSEnvironment.h

@@ -134,11 +134,12 @@ class nsJSContext : public nsIScriptContext {
   virtual ~nsJSContext();
 
   // Helper to convert xpcom datatypes to jsvals.
-  nsresult ConvertSupportsTojsvals(nsISupports *aArgs,
+  nsresult ConvertSupportsTojsvals(JSContext *aCx, nsISupports *aArgs,
                                    JS::Handle<JSObject *> aScope,
                                    JS::MutableHandleVector<JS::Value> aArgsOut);
 
-  nsresult AddSupportsPrimitiveTojsvals(nsISupports *aArg, JS::Value *aArgv);
+  nsresult AddSupportsPrimitiveTojsvals(JSContext *aCx, nsISupports *aArg,
+                                        JS::Value *aArgv);
 
  private:
   void Destroy();

dom/events/test/test_bug1264380.html

@@ -13,58 +13,37 @@ function runTests()
 
   let iframe = document.createElement('iframe');
   document.body.appendChild(iframe);
-  iframe.contentDocument.body.innerHTML = '<div id="outer"/>';
+  iframe.contentDocument.body.innerHTML = '<div id="outter"/>';
 
   let iframeDoc = iframe.contentDocument;
   let iframeWin = iframe.contentWindow;
 
-  let shadow = iframeDoc.querySelector('#outer').attachShadow({mode: 'open'});
+  let shadow = iframeDoc.querySelector('#outter').attachShadow({mode: 'open'});
   let target = iframeDoc.createElement('a');
-
-  const TEXT = "Drag me if you can!";
-  let linkText = iframeDoc.createTextNode(TEXT);
+  let linkText = iframeDoc.createTextNode("Drag me if you can!");
   target.appendChild(linkText);
-
-  const URL = "http://www.mozilla.org/";
-  target.href = URL;
+  target.href = "http://www.mozilla.org/";
   shadow.appendChild(target);
 
-  // Some of the drag data we don't actually care about for this test,
-  // so we'll use this comparator function to ignore them.
-  function ignoreFunc(actualData, expectedData) {
-    return true;
+  let dataTransfer;
+  let trapDrag = function(event) {
+    ok(true, "Got dragstart event");
+    dataTransfer = event.dataTransfer;
+    ok(dataTransfer, "DataTransfer object is available.");
+    is(SpecialPowers.wrap(dataTransfer).mozItemCount, 1, "initial link item count");
+    is(dataTransfer.getData("text/uri-list"), "http://www.mozilla.org/", "link text/uri-list");
+    is(dataTransfer.getData("text/plain"), "http://www.mozilla.org/", "link text/plain");
   }
 
-  const EXPECTED_DRAG_DATA = [[{
-    type: "text/x-moz-url",
-    data: "",
-    eqTest: ignoreFunc,
-  }, {
-    type: "text/x-moz-url-data",
-    data: "",
-    eqTest: ignoreFunc,
-  }, {
-    type: "text/x-moz-url-desc",
-    data: "",
-    eqTest: ignoreFunc,
-  }, {
-    type: "text/uri-list",
-    data: URL,
-  }, {
-    type: "text/_moz_htmlinfo",
-    data: "",
-    eqTest: ignoreFunc,
-  }, {
-    type: "text/html",
-    data: "",
-    eqTest: ignoreFunc,
-  }, {
-    type: "text/plain",
-    data: URL,
-  }]];
-
-  let result = synthesizeDragStart(target, EXPECTED_DRAG_DATA, iframeWin);
-  is(result, null, "Should have gotten the expected drag data.");
+  ok(!dragService.getCurrentSession(), "There shouldn't be a drag session!");
+  iframeWin.addEventListener("dragstart", trapDrag, true);
+  synthesizeMouse(target, 2, 2, { type: "mousedown" }, iframeWin);
+  synthesizeMouse(target, 11, 11, { type: "mousemove" }, iframeWin);
+  synthesizeMouse(target, 20, 20, { type: "mousemove" }, iframeWin);
+  iframeWin.removeEventListener("dragstart", trapDrag, true);
+  ok(dragService.getCurrentSession(), "Drag session is available.");
+  dragService.endDragSession(false);
+  ok(!dragService.getCurrentSession(), "There shouldn't be a drag session anymore!");
   SimpleTest.finish();
 }
 

ipc/mscom/AgileReference.cpp

@@ -12,6 +12,11 @@
 #include "mozilla/Move.h"
 #include "mozilla/mscom/Utils.h"
 
+#if defined(MOZILLA_INTERNAL_API)
+#include "nsDebug.h"
+#include "nsPrintfCString.h"
+#endif  // defined(MOZILLA_INTERNAL_API)
+
 #if NTDDI_VERSION < NTDDI_WINBLUE
 
 // Declarations from Windows SDK specific to Windows 8.1
@@ -100,7 +105,13 @@ void AgileReference::Clear() {
   }
 
   DebugOnly<HRESULT> hr = git->RevokeInterfaceFromGlobal(mGitCookie);
+#if defined(MOZILLA_INTERNAL_API)
+  NS_WARNING_ASSERTION(SUCCEEDED(hr), nsPrintfCString(
+      "IGlobalInterfaceTable::RevokeInterfaceFromGlobal failed with HRESULT "
+      "0x%08lX", ((HRESULT)hr)).get());
+#else
   MOZ_ASSERT(SUCCEEDED(hr));
+#endif  // defined(MOZILLA_INTERNAL_API)
   mGitCookie = 0;
 }
 

js/src/tests/jstests.list

@@ -558,6 +558,169 @@ skip script test262/intl402/Intl/getCanonicalLocales/non-iana-canon.js
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1508684
 skip script test262/language/expressions/import.meta/syntax/invalid-assignment-target-update-expr.js
 
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1529772
+skip script test262/language/expressions/class/elements/after-same-line-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/after-same-line-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/after-same-line-static-async-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/after-same-line-static-async-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/after-same-line-static-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/after-same-line-static-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/fields-asi-1.js
+skip script test262/language/expressions/class/elements/fields-asi-2.js
+skip script test262/language/expressions/class/elements/fields-asi-5.js
+skip script test262/language/expressions/class/elements/multiple-definitions-computed-names.js
+skip script test262/language/expressions/class/elements/multiple-definitions-computed-symbol-names.js
+skip script test262/language/expressions/class/elements/multiple-definitions-literal-names-asi.js
+skip script test262/language/expressions/class/elements/multiple-definitions-literal-names.js
+skip script test262/language/expressions/class/elements/multiple-definitions-rs-field-identifier-initializer.js
+skip script test262/language/expressions/class/elements/multiple-definitions-rs-field-identifier.js
+skip script test262/language/expressions/class/elements/multiple-definitions-string-literal-names.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-computed-names.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-computed-symbol-names.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-literal-names-asi.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-literal-names.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-rs-field-identifier-initializer.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-rs-field-identifier.js
+skip script test262/language/expressions/class/elements/multiple-stacked-definitions-string-literal-names.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-computed-names.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-computed-symbol-names.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-literal-names.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-rs-field-identifier-initializer.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-rs-field-identifier.js
+skip script test262/language/expressions/class/elements/new-no-sc-line-method-string-literal-names.js
+skip script test262/language/expressions/class/elements/new-sc-line-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/new-sc-line-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/regular-definitions-computed-names.js
+skip script test262/language/expressions/class/elements/regular-definitions-computed-symbol-names.js
+skip script test262/language/expressions/class/elements/regular-definitions-literal-names-asi.js
+skip script test262/language/expressions/class/elements/regular-definitions-literal-names.js
+skip script test262/language/expressions/class/elements/regular-definitions-rs-field-identifier-initializer.js
+skip script test262/language/expressions/class/elements/regular-definitions-rs-field-identifier.js
+skip script test262/language/expressions/class/elements/regular-definitions-string-literal-names.js
+skip script test262/language/expressions/class/elements/same-line-async-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/same-line-async-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/same-line-gen-literal-names-asi.js
+skip script test262/language/expressions/class/elements/same-line-method-literal-names-asi.js
+skip script test262/language/expressions/class/elements/syntax/valid/grammar-fields-multi-line.js
+skip script test262/language/expressions/class/elements/wrapped-in-sc-literal-names-asi.js
+skip script test262/language/statements/class/classelementname-abrupt-completion.js
+skip script test262/language/statements/class/elements/after-same-line-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/after-same-line-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/after-same-line-static-async-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/after-same-line-static-async-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/after-same-line-static-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/after-same-line-static-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/fields-asi-1.js
+skip script test262/language/statements/class/elements/fields-asi-2.js
+skip script test262/language/statements/class/elements/fields-asi-5.js
+skip script test262/language/statements/class/elements/multiple-definitions-computed-names.js
+skip script test262/language/statements/class/elements/multiple-definitions-computed-symbol-names.js
+skip script test262/language/statements/class/elements/multiple-definitions-literal-names-asi.js
+skip script test262/language/statements/class/elements/multiple-definitions-literal-names.js
+skip script test262/language/statements/class/elements/multiple-definitions-rs-field-identifier-initializer.js
+skip script test262/language/statements/class/elements/multiple-definitions-rs-field-identifier.js
+skip script test262/language/statements/class/elements/multiple-definitions-string-literal-names.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-computed-names.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-computed-symbol-names.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-literal-names-asi.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-literal-names.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-rs-field-identifier-initializer.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-rs-field-identifier.js
+skip script test262/language/statements/class/elements/multiple-stacked-definitions-string-literal-names.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-computed-names.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-computed-symbol-names.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-literal-names.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-rs-field-identifier-initializer.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-rs-field-identifier.js
+skip script test262/language/statements/class/elements/new-no-sc-line-method-string-literal-names.js
+skip script test262/language/statements/class/elements/new-sc-line-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/new-sc-line-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/regular-definitions-computed-names.js
+skip script test262/language/statements/class/elements/regular-definitions-computed-symbol-names.js
+skip script test262/language/statements/class/elements/regular-definitions-literal-names-asi.js
+skip script test262/language/statements/class/elements/regular-definitions-literal-names.js
+skip script test262/language/statements/class/elements/regular-definitions-rs-field-identifier-initializer.js
+skip script test262/language/statements/class/elements/regular-definitions-rs-field-identifier.js
+skip script test262/language/statements/class/elements/regular-definitions-string-literal-names.js
+skip script test262/language/statements/class/elements/same-line-async-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/same-line-async-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/same-line-gen-literal-names-asi.js
+skip script test262/language/statements/class/elements/same-line-method-literal-names-asi.js
+skip script test262/language/statements/class/elements/syntax/valid/grammar-fields-multi-line.js
+skip script test262/language/statements/class/elements/wrapped-in-sc-literal-names-asi.js
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1534721
+skip script test262/language/expressions/class/elements/fields-run-once-on-double-super.js
+skip script test262/language/expressions/class/constructor-this-tdz-during-initializers.js
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1540793
+skip script test262/language/expressions/class/elements/arrow-fnc-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/comp-name-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/derived-cls-direct-eval-err-contains-supercall-1.js
+skip script test262/language/expressions/class/elements/derived-cls-direct-eval-err-contains-supercall-2.js
+skip script test262/language/expressions/class/elements/derived-cls-direct-eval-err-contains-supercall.js
+skip script test262/language/expressions/class/elements/derived-cls-direct-eval-err-contains-superproperty-1.js
+skip script test262/language/expressions/class/elements/derived-cls-direct-eval-err-contains-superproperty-2.js
+skip script test262/language/expressions/class/elements/derived-cls-indirect-eval-err-contains-supercall-1.js
+skip script test262/language/expressions/class/elements/derived-cls-indirect-eval-err-contains-supercall-2.js
+skip script test262/language/expressions/class/elements/derived-cls-indirect-eval-err-contains-supercall.js
+skip script test262/language/expressions/class/elements/derived-cls-indirect-eval-err-contains-superproperty-1.js
+skip script test262/language/expressions/class/elements/derived-cls-indirect-eval-err-contains-superproperty-2.js
+skip script test262/language/expressions/class/elements/direct-eval-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/equality-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/fields-literal-name-propname-constructor.js
+skip script test262/language/expressions/class/elements/fields-string-name-propname-constructor.js
+skip script test262/language/expressions/class/elements/literal-name-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/private-derived-cls-direct-eval-err-contains-supercall-1.js
+skip script test262/language/expressions/class/elements/private-derived-cls-direct-eval-err-contains-supercall-2.js
+skip script test262/language/expressions/class/elements/private-derived-cls-direct-eval-err-contains-supercall.js
+skip script test262/language/expressions/class/elements/private-derived-cls-indirect-eval-err-contains-supercall-1.js
+skip script test262/language/expressions/class/elements/private-derived-cls-indirect-eval-err-contains-supercall-2.js
+skip script test262/language/expressions/class/elements/private-derived-cls-indirect-eval-err-contains-supercall.js
+skip script test262/language/expressions/class/elements/string-literal-name-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/ternary-init-err-contains-arguments.js
+skip script test262/language/expressions/class/elements/typeof-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/arrow-fnc-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/comp-name-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-supercall-1.js
+skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-supercall-2.js
+skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-supercall.js
+skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-1.js
+skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-2.js
+skip script test262/language/statements/class/elements/derived-cls-indirect-eval-err-contains-supercall-1.js
+skip script test262/language/statements/class/elements/derived-cls-indirect-eval-err-contains-supercall-2.js
+skip script test262/language/statements/class/elements/derived-cls-indirect-eval-err-contains-supercall.js
+skip script test262/language/statements/class/elements/derived-cls-indirect-eval-err-contains-superproperty-1.js
+skip script test262/language/statements/class/elements/derived-cls-indirect-eval-err-contains-superproperty-2.js
+skip script test262/language/statements/class/elements/direct-eval-err-contains-arguments.js
+skip script test262/language/statements/class/elements/equality-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/fields-literal-name-propname-constructor.js
+skip script test262/language/statements/class/elements/fields-string-name-propname-constructor.js
+skip script test262/language/statements/class/elements/literal-name-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/private-derived-cls-direct-eval-err-contains-supercall-1.js
+skip script test262/language/statements/class/elements/private-derived-cls-direct-eval-err-contains-supercall-2.js
+skip script test262/language/statements/class/elements/private-derived-cls-direct-eval-err-contains-supercall.js
+skip script test262/language/statements/class/elements/private-derived-cls-indirect-eval-err-contains-supercall-1.js
+skip script test262/language/statements/class/elements/private-derived-cls-indirect-eval-err-contains-supercall-2.js
+skip script test262/language/statements/class/elements/private-derived-cls-indirect-eval-err-contains-supercall.js
+skip script test262/language/statements/class/elements/string-literal-name-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/ternary-init-err-contains-arguments.js
+skip script test262/language/statements/class/elements/typeof-init-err-contains-arguments.js
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1541641
+skip script test262/language/expressions/class/elements/evaluation-error/computed-name-toprimitive-err.js
+skip script test262/language/expressions/class/elements/evaluation-error/computed-name-toprimitive-returns-noncallable.js
+skip script test262/language/expressions/class/elements/evaluation-error/computed-name-toprimitive-returns-nonobject.js
+skip script test262/language/expressions/class/elements/evaluation-error/computed-name-tostring-err.js
+skip script test262/language/expressions/class/elements/evaluation-error/computed-name-valueof-err.js
+skip script test262/language/statements/class/elements/evaluation-error/computed-name-toprimitive-err.js
+skip script test262/language/statements/class/elements/evaluation-error/computed-name-toprimitive-returns-noncallable.js
+skip script test262/language/statements/class/elements/evaluation-error/computed-name-toprimitive-returns-nonobject.js
+skip script test262/language/statements/class/elements/evaluation-error/computed-name-tostring-err.js
+skip script test262/language/statements/class/elements/evaluation-error/computed-name-valueof-err.js
+
 
 ###########################################################
 # Tests disabled due to issues in test262 importer script #

js/src/tests/non262/fields/unimplemented.js

@@ -1,45 +1,57 @@
-// Note: These tests should pass eventually (and this file deleted): this test
-// is just asserting that fields don't crash the engine, even if disabled.
+// Field syntax doesn't crash the engine when fields are disabled.
 
-let source = `class C {
+// Are fields enabled?
+let fieldsEnabled = false;
+try {
+  Function("class C { x; }");
+  fieldsEnabled = true;
+} catch (exc) {
+  assertEq(exc instanceof SyntaxError, true);
+}
+
+// If not, run these tests. (Many other tests cover actual behavior of the
+// feature when enabled.)
+if (!fieldsEnabled) {
+  let source = `class C {
     x
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     x = 0;
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     0 = 0;
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     [0] = 0;
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     "hi" = 0;
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     "hi" = 0;
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     d = function(){};
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
 
-source = `class C {
+  source = `class C {
     d = class D { x = 0; };
-}`;
-assertThrowsInstanceOf(() => Function(source), SyntaxError);
+  }`;
+  assertThrowsInstanceOf(() => Function(source), SyntaxError);
+}
 
 if (typeof reportCompare === "function")
   reportCompare(true, true);

js/xpconnect/src/XPCJSContext.cpp

@@ -700,7 +700,7 @@ bool XPCJSContext::InterruptCallback(JSContext* cx) {
 
   // Show the prompt to the user, and kill if requested.
   nsGlobalWindowInner::SlowScriptResponse response =
-      win->ShowSlowScriptDialog(addonId);
+      win->ShowSlowScriptDialog(cx, addonId);
   if (response == nsGlobalWindowInner::KillSlowScript) {
     if (Preferences::GetBool("dom.global_stop_script", true)) {
       xpc::Scriptability::Get(global).Block();

layout/generic/nsColumnSetFrame.cpp

@@ -284,13 +284,9 @@ static nscoord GetColumnGap(nsColumnSetFrame* aFrame,
 }
 
 /* static */
-nscoord nsColumnSetFrame::ClampUsedColumnWidth(
-    const nsStyleCoord& aColumnWidth) {
-  MOZ_ASSERT(aColumnWidth.GetUnit() == eStyleUnit_Coord,
-             "This should only be called when column-width is a <length>!");
-
+nscoord nsColumnSetFrame::ClampUsedColumnWidth(const Length& aColumnWidth) {
   // Per spec, used values will be clamped to a minimum of 1px.
-  return std::max(CSSPixel::ToAppUnits(1), aColumnWidth.GetCoordValue());
+  return std::max(CSSPixel::ToAppUnits(1), aColumnWidth.ToAppUnits());
 }
 
 nsColumnSetFrame::ReflowConfig nsColumnSetFrame::ChooseColumnStrategy(
@@ -341,8 +337,8 @@ nsColumnSetFrame::ReflowConfig nsColumnSetFrame::ChooseColumnStrategy(
   nscoord colISize;
   // In vertical writing-mode, "column-width" (inline size) will actually be
   // physical height, but its CSS name is still column-width.
-  if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
-    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth);
+  if (colStyle->mColumnWidth.IsLength()) {
+    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth.AsLength());
     NS_ASSERTION(colISize >= 0, "negative column width");
     // Reduce column count if necessary to make columns fit in the
     // available width. Compute max number of columns that fit in
@@ -491,8 +487,8 @@ nscoord nsColumnSetFrame::GetMinISize(gfxContext* aRenderingContext) {
   }
   const nsStyleColumn* colStyle = StyleColumn();
   nscoord colISize;
-  if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
-    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth);
+  if (colStyle->mColumnWidth.IsLength()) {
+    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth.AsLength());
     // As available width reduces to zero, we reduce our number of columns
     // to one, and don't enforce the column width, so just return the min
     // of the child's min-width with any specified column width.
@@ -527,8 +523,8 @@ nscoord nsColumnSetFrame::GetPrefISize(gfxContext* aRenderingContext) {
   nscoord colGap = GetColumnGap(this, NS_UNCONSTRAINEDSIZE);
 
   nscoord colISize;
-  if (colStyle->mColumnWidth.GetUnit() == eStyleUnit_Coord) {
-    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth);
+  if (colStyle->mColumnWidth.IsLength()) {
+    colISize = ClampUsedColumnWidth(colStyle->mColumnWidth.AsLength());
   } else if (mFrames.FirstChild() && !StyleDisplay()->IsContainSize()) {
     // We want to ignore this in the case that we're size contained
     // because our children should not contribute to our

layout/generic/nsColumnSetFrame.h

@@ -218,7 +218,7 @@ class nsColumnSetFrame final : public nsContainerFrame {
       const std::function<void(const nsRect& lineRect)>& aSetLineRect,
       const nsPoint& aPt);
 
-  static nscoord ClampUsedColumnWidth(const nsStyleCoord& aColumnWidth);
+  static nscoord ClampUsedColumnWidth(const mozilla::Length& aColumnWidth);
 };
 
 #endif  // nsColumnSetFrame_h___

layout/generic/nsFrame.cpp

@@ -9086,7 +9086,7 @@ static void ComputeAndIncludeOutlineArea(nsIFrame* aFrame,
   // Keep this code in sync with GetOutlineInnerRect in nsCSSRendering.cpp.
   SetOrUpdateRectValuedProperty(aFrame, nsIFrame::OutlineInnerRectProperty(),
                                 innerRect);
-  const nscoord offset = outline->mOutlineOffset;
+  const nscoord offset = outline->mOutlineOffset.ToAppUnits();
   nsRect outerRect(innerRect);
   bool useOutlineAuto = false;
   if (nsLayoutUtils::IsOutlineStyleAutoEnabled()) {

layout/generic/nsTextFrame.cpp

@@ -5109,7 +5109,8 @@ void nsDisplayText::RenderToContext(gfxContext* aCtx,
     params.state = nsTextFrame::PaintTextParams::PaintText;
   }
 
-  f->PaintText(params, *this, mOpacity);
+  f->PaintText(params, mVisIStartEdge, mVisIEndEdge, ToReferenceFrame(),
+               IsSelected(), mOpacity);
 
   if (willClip) {
     aCtx->PopClip();
@@ -6771,7 +6772,10 @@ void nsTextFrame::PaintShadows(nsCSSShadowArray* aShadow,
 }
 
 void nsTextFrame::PaintText(const PaintTextParams& aParams,
-                            const nsCharClipDisplayItem& aItem,
+                            const nscoord aVisIStartEdge,
+                            const nscoord aVisIEndEdge,
+                            const nsPoint& aToReferenceFrame,
+                            const bool aIsSelected,
                             float aOpacity /* = 1.0f */) {
   // Don't pass in the rendering context here, because we need a
   // *reference* context and rendering context might have some transform
@@ -6782,11 +6786,9 @@ void nsTextFrame::PaintText(const PaintTextParams& aParams,
 
   PropertyProvider provider(this, iter, nsTextFrame::eInflated, mFontMetrics);
 
-  const bool isSelected = aItem.IsSelected();
-
   // Trim trailing whitespace, unless we're painting a selection highlight,
   // which should include trailing spaces if present (bug 1146754).
-  provider.InitializeForDisplay(!isSelected);
+  provider.InitializeForDisplay(!aIsSelected);
 
   const bool reversed = mTextRun->IsInlineReversed();
   const bool verticalRun = mTextRun->IsVertical();
@@ -6815,9 +6817,9 @@ void nsTextFrame::PaintText(const PaintTextParams& aParams,
   uint32_t startOffset = range.start;
   uint32_t maxLength = range.Length();
   nscoord snappedStartEdge, snappedEndEdge;
-  if (!MeasureCharClippedText(provider, aItem.mVisIStartEdge,
-                              aItem.mVisIEndEdge, &startOffset, &maxLength,
-                              &snappedStartEdge, &snappedEndEdge)) {
+  if (!MeasureCharClippedText(provider, aVisIStartEdge, aVisIEndEdge,
+                              &startOffset, &maxLength, &snappedStartEdge,
+                              &snappedEndEdge)) {
     return;
   }
   if (verticalRun) {
@@ -6825,13 +6827,13 @@ void nsTextFrame::PaintText(const PaintTextParams& aParams,
   } else {
     textBaselinePt.x += reversed ? -snappedEndEdge : snappedStartEdge;
   }
-  nsCharClipDisplayItem::ClipEdges clipEdges(aItem, snappedStartEdge,
-                                             snappedEndEdge);
+  nsCharClipDisplayItem::ClipEdges clipEdges(this, aToReferenceFrame,
+                                             snappedStartEdge, snappedEndEdge);
   nsTextPaintStyle textPaintStyle(this);
   textPaintStyle.SetResolveColors(!aParams.callbacks);
 
   // Fork off to the (slower) paint-with-selection path if necessary.
-  if (isSelected) {
+  if (aIsSelected) {
     MOZ_ASSERT(aOpacity == 1.0f, "We don't support opacity with selections!");
     gfxSkipCharsIterator tmp(provider.GetStart());
     Range contentRange(

layout/generic/nsTextFrame.h

@@ -456,8 +456,9 @@ class nsTextFrame : public nsFrame {
   // to generate paths rather than paint the frame's text by passing a callback
   // object.  The private DrawText() is what applies the text to a graphics
   // context.
-  void PaintText(const PaintTextParams& aParams,
-                 const nsCharClipDisplayItem& aItem, float aOpacity = 1.0f);
+  void PaintText(const PaintTextParams& aParams, const nscoord aVisIStartEdge,
+                 const nscoord aVisIEndEdge, const nsPoint& aToReferenceFrame,
+                 const bool aIsSelected, float aOpacity = 1.0f);
   // helper: paint text frame when we're impacted by at least one selection.
   // Return false if the text was not painted and we should continue with
   // the fast path.

layout/generic/test/test_bug470212.html

@@ -26,11 +26,6 @@ function doShiftDrag(){
     // Drag canvas element starts with a mouse down event, combine with shift
     // key, follows by two mouse move events.
 
-    window.addEventListener("dragstart", e => {
-      e.preventDefault();
-      e.stopPropagation();
-    });
-
     // Press on left-top corner of the canvas element.
     wu.sendMouseEvent('mousedown',  canvasRect.left, canvasRect.top, 0, 1, 4);
     // Move to the center of this cavas element.

layout/painting/nsCSSRendering.cpp

@@ -981,7 +981,7 @@ Maybe<nsCSSBorderRenderer> nsCSSRendering::CreateBorderRendererForOutline(
   } else {
     innerRect = GetOutlineInnerRect(aForFrame) + aBorderArea.TopLeft();
   }
-  nscoord offset = ourOutline->mOutlineOffset;
+  nscoord offset = ourOutline->mOutlineOffset.ToAppUnits();
   innerRect.Inflate(offset);
   // If the dirty rect is completely inside the border area (e.g., only the
   // content is being painted), then we can skip out now

layout/painting/nsDisplayItemTypesList.h

@@ -66,8 +66,6 @@ DECLARE_DISPLAY_ITEM_TYPE(FILTER, TYPE_RENDERS_NO_IMAGES)
 DECLARE_DISPLAY_ITEM_TYPE(SVG_OUTER_SVG, TYPE_RENDERS_NO_IMAGES)
 DECLARE_DISPLAY_ITEM_TYPE(SVG_GEOMETRY, TYPE_IS_CONTENTFUL)
 DECLARE_DISPLAY_ITEM_TYPE(SVG_TEXT, TYPE_IS_CONTENTFUL)
-DECLARE_DISPLAY_ITEM_TYPE(SVG_CHAR_CLIP,
-                          TYPE_RENDERS_NO_IMAGES | TYPE_IS_CONTENTFUL)
 DECLARE_DISPLAY_ITEM_TYPE(SVG_WRAPPER, 0)
 DECLARE_DISPLAY_ITEM_TYPE(FOREIGN_OBJECT, TYPE_IS_CONTENTFUL)
 DECLARE_DISPLAY_ITEM_TYPE(TABLE_CELL_BACKGROUND, 0)

layout/painting/nsDisplayList.cpp

@@ -3177,8 +3177,7 @@ nsDisplayItem::nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
     : nsDisplayItem(aBuilder, aFrame, aBuilder->CurrentActiveScrolledRoot()) {}
 
 nsDisplayItem::nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
-                             const ActiveScrolledRoot* aActiveScrolledRoot,
-                             bool aAnonymous)
+                             const ActiveScrolledRoot* aActiveScrolledRoot)
     : mFrame(aFrame),
       mActiveScrolledRoot(aActiveScrolledRoot),
       mAnimatedGeometryRoot(nullptr),
@@ -3193,7 +3192,7 @@ nsDisplayItem::nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
 #endif
 {
   MOZ_COUNT_CTOR(nsDisplayItem);
-  if (aBuilder->IsRetainingDisplayList() && !aAnonymous) {
+  if (aBuilder->IsRetainingDisplayList()) {
     mFrame->AddDisplayItem(this);
   }
   mReferenceFrame = aBuilder->FindReferenceFrameFor(aFrame, &mToReferenceFrame);
@@ -4987,7 +4986,7 @@ bool nsDisplayOutline::IsInvisibleInRect(const nsRect& aRect) const {
   nsRect borderBox(ToReferenceFrame(), mFrame->GetSize());
   if (borderBox.Contains(aRect) &&
       !nsLayoutUtils::HasNonZeroCorner(outline->mOutlineRadius)) {
-    if (outline->mOutlineOffset >= 0) {
+    if (outline->mOutlineOffset._0 >= 0.0f) {
       // aRect is entirely inside the border-rect, and the outline isn't
       // rendered inside the border-rect, so the outline is not visible.
       return true;
@@ -5629,18 +5628,15 @@ bool nsDisplayBoxShadowInner::ComputeVisibility(nsDisplayListBuilder* aBuilder,
 }
 
 nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder,
-                                     nsIFrame* aFrame, nsDisplayList* aList,
-                                     bool aAnonymous)
+                                     nsIFrame* aFrame, nsDisplayList* aList)
     : nsDisplayWrapList(aBuilder, aFrame, aList,
-                        aBuilder->CurrentActiveScrolledRoot(), false, 0,
-                        aAnonymous) {}
+                        aBuilder->CurrentActiveScrolledRoot(), false, 0) {}
 
 nsDisplayWrapList::nsDisplayWrapList(
     nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayList* aList,
     const ActiveScrolledRoot* aActiveScrolledRoot, bool aClearClipChain,
-    uint32_t aIndex, bool aAnonymous)
-    : nsDisplayHitTestInfoItem(aBuilder, aFrame, aActiveScrolledRoot,
-                               aAnonymous),
+    uint32_t aIndex)
+    : nsDisplayHitTestInfoItem(aBuilder, aFrame, aActiveScrolledRoot),
       mFrameActiveScrolledRoot(aBuilder->CurrentActiveScrolledRoot()),
       mOverrideZIndex(0),
       mIndex(aIndex),
@@ -5683,10 +5679,9 @@ nsDisplayWrapList::nsDisplayWrapList(
 }
 
 nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder,
-                                     nsIFrame* aFrame, nsDisplayItem* aItem,
-                                     bool aAnonymous)
-    : nsDisplayHitTestInfoItem(
-          aBuilder, aFrame, aBuilder->CurrentActiveScrolledRoot(), aAnonymous),
+                                     nsIFrame* aFrame, nsDisplayItem* aItem)
+    : nsDisplayHitTestInfoItem(aBuilder, aFrame,
+                               aBuilder->CurrentActiveScrolledRoot()),
       mOverrideZIndex(0),
       mIndex(0),
       mHasZIndexOverride(false) {
@@ -8746,11 +8741,10 @@ void nsDisplayTransform::WriteDebugInfo(std::stringstream& aStream) {
 nsDisplayPerspective::nsDisplayPerspective(nsDisplayListBuilder* aBuilder,
                                            nsIFrame* aFrame,
                                            nsDisplayList* aList)
-    : nsDisplayHitTestInfoItem(aBuilder, aFrame),
-      mList(aBuilder, aFrame, aList, true) {
-  MOZ_ASSERT(mList.GetChildren()->Count() == 1);
-  MOZ_ASSERT(mList.GetChildren()->GetTop()->GetType() ==
-             DisplayItemType::TYPE_TRANSFORM);
+    : nsDisplayHitTestInfoItem(aBuilder, aFrame) {
+  mList.AppendToTop(aList);
+  MOZ_ASSERT(mList.Count() == 1);
+  MOZ_ASSERT(mList.GetTop()->GetType() == DisplayItemType::TYPE_TRANSFORM);
   mAnimatedGeometryRoot = aBuilder->FindAnimatedGeometryRootFor(
       mFrame->GetContainingBlock(nsIFrame::SKIP_SCROLLED_FRAME));
 }
@@ -8768,7 +8762,7 @@ already_AddRefed<Layer> nsDisplayPerspective::BuildLayer(
   /*
    * ClipListToRange can remove our child after we were created.
    */
-  if (!mList.GetChildren()->GetTop()) {
+  if (!GetChildren()->GetTop()) {
     return nullptr;
   }
 
@@ -8777,7 +8771,7 @@ already_AddRefed<Layer> nsDisplayPerspective::BuildLayer(
    * frame. Append a translation to the reference frame coordinates.
    */
   nsDisplayTransform* transform =
-      static_cast<nsDisplayTransform*>(mList.GetChildren()->GetTop());
+      static_cast<nsDisplayTransform*>(GetChildren()->GetTop());
 
   Point3D newOrigin =
       Point3D(NSAppUnitsToFloatPixels(transform->ToReferenceFrame().x,
@@ -8791,8 +8785,8 @@ already_AddRefed<Layer> nsDisplayPerspective::BuildLayer(
 
   RefPtr<ContainerLayer> container =
       aManager->GetLayerBuilder()->BuildContainerLayerFor(
-          aBuilder, aManager, mFrame, this, mList.GetChildren(),
-          aContainerParameters, &perspectiveMatrix, 0);
+          aBuilder, aManager, mFrame, this, GetChildren(), aContainerParameters,
+          &perspectiveMatrix, 0);
 
   if (!container) {
     return nullptr;
@@ -8815,6 +8809,16 @@ LayerState nsDisplayPerspective::GetLayerState(
   return LAYER_ACTIVE_FORCE;
 }
 
+nsRegion nsDisplayPerspective::GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
+                                               bool* aSnap) const {
+  if (!GetChildren()->GetTop()) {
+    *aSnap = false;
+    return nsRegion();
+  }
+
+  return GetChildren()->GetTop()->GetOpaqueRegion(aBuilder, aSnap);
+}
+
 bool nsDisplayPerspective::CreateWebRenderCommands(
     mozilla::wr::DisplayListBuilder& aBuilder,
     mozilla::wr::IpcResourceUpdateQueue& aResources,
@@ -8829,7 +8833,7 @@ bool nsDisplayPerspective::CreateWebRenderCommands(
   /*
    * ClipListToRange can remove our child after we were created.
    */
-  if (!mList.GetChildren()->GetTop()) {
+  if (!GetChildren()->GetTop()) {
     return false;
   }
 
@@ -8838,7 +8842,7 @@ bool nsDisplayPerspective::CreateWebRenderCommands(
    * frame. Append a translation to the reference frame coordinates.
    */
   nsDisplayTransform* transform =
-      static_cast<nsDisplayTransform*>(mList.GetChildren()->GetTop());
+      static_cast<nsDisplayTransform*>(GetChildren()->GetTop());
 
   Point3D newOrigin =
       Point3D(NSAppUnitsToFloatPixels(transform->ToReferenceFrame().x,
@@ -8894,8 +8898,10 @@ bool nsDisplayPerspective::CreateWebRenderCommands(
   StackingContextHelper sc(aSc, GetActiveScrolledRoot(), mFrame, this, aBuilder,
                            params);
 
-  return mList.CreateWebRenderCommands(aBuilder, aResources, sc, aManager,
-                                       aDisplayListBuilder);
+  aManager->CommandBuilder().CreateWebRenderCommandsFromDisplayList(
+      GetChildren(), this, aDisplayListBuilder, sc, aBuilder, aResources);
+
+  return true;
 }
 
 nsDisplayItemGeometry* nsCharClipDisplayItem::AllocateGeometry(

layout/painting/nsDisplayList.h

@@ -2160,35 +2160,7 @@ class nsDisplayItem : public nsDisplayItemLink {
   // need to count constructors and destructors.
   nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame);
   nsDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
-                const ActiveScrolledRoot* aActiveScrolledRoot,
-                bool aAnonymous = false);
-
-  /**
-   * This constructor is only used in rare cases when we need to construct
-   * temporary items.
-   */
-  explicit nsDisplayItem(nsIFrame* aFrame)
-      : mFrame(aFrame),
-        mClipChain(nullptr),
-        mClip(nullptr),
-        mActiveScrolledRoot(nullptr),
-        mReferenceFrame(nullptr),
-        mAnimatedGeometryRoot(nullptr),
-        mForceNotVisible(false),
-        mDisableSubpixelAA(false),
-        mReusedItem(false),
-        mBackfaceIsHidden(mFrame->BackfaceIsHidden()),
-        mCombines3DTransformWithAncestors(
-            mFrame->Combines3DTransformWithAncestors()),
-        mPaintRectValid(false),
-        mCanBeReused(true)
-#ifdef MOZ_DUMP_PAINTING
-        ,
-        mPainted(false)
-#endif
-  {
-    MOZ_COUNT_CTOR(nsDisplayItem);
-  }
+                const ActiveScrolledRoot* aActiveScrolledRoot);
 
   nsDisplayItem() = delete;
 
@@ -3753,9 +3725,8 @@ class nsDisplayHitTestInfoItem : public nsDisplayItem {
       : nsDisplayItem(aBuilder, aFrame) {}
 
   nsDisplayHitTestInfoItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
-                           const ActiveScrolledRoot* aActiveScrolledRoot,
-                           bool aAnonymous = false)
-      : nsDisplayItem(aBuilder, aFrame, aActiveScrolledRoot, aAnonymous) {}
+                           const ActiveScrolledRoot* aActiveScrolledRoot)
+      : nsDisplayItem(aBuilder, aFrame, aActiveScrolledRoot) {}
 
   nsDisplayHitTestInfoItem(nsDisplayListBuilder* aBuilder,
                            const nsDisplayHitTestInfoItem& aOther)
@@ -5164,14 +5135,16 @@ class nsDisplayWrapList : public nsDisplayHitTestInfoItem {
    * Takes all the items from aList and puts them in our list.
    */
   nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
-                    nsDisplayList* aList, bool aAnonymous = false);
+                    nsDisplayList* aList);
+
+  nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
+                    nsDisplayItem* aItem);
+
   nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                     nsDisplayList* aList,
                     const ActiveScrolledRoot* aActiveScrolledRoot,
-                    bool aClearClipChain = false, uint32_t aIndex = 0,
-                    bool aAnonymous = false);
-  nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
-                    nsDisplayItem* aItem, bool aAnonymous = false);
+                    bool aClearClipChain = false, uint32_t aIndex = 0);
+
   nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
       : nsDisplayHitTestInfoItem(aBuilder, aFrame),
         mFrameActiveScrolledRoot(aBuilder->CurrentActiveScrolledRoot()),
@@ -6995,17 +6968,20 @@ class nsDisplayPerspective : public nsDisplayHitTestInfoItem {
 
   NS_DISPLAY_DECL_NAME("nsDisplayPerspective", TYPE_PERSPECTIVE)
 
+  void Destroy(nsDisplayListBuilder* aBuilder) override {
+    mList.DeleteAll(aBuilder);
+    nsDisplayHitTestInfoItem::Destroy(aBuilder);
+  }
+
   void HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                HitTestState* aState, nsTArray<nsIFrame*>* aOutFrames) override {
-    return mList.HitTest(aBuilder, aRect, aState, aOutFrames);
+    return GetChildren()->HitTest(aBuilder, aRect, aState, aOutFrames);
   }
 
   nsRect GetBounds(nsDisplayListBuilder* aBuilder, bool* aSnap) const override {
-    return mList.GetBounds(aBuilder, aSnap);
-  }
-
-  void UpdateBounds(nsDisplayListBuilder* aBuilder) override {
-    mList.UpdateBounds(aBuilder);
+    *aSnap = false;
+    return GetChildren()->GetClippedBoundsWithRespectToASR(aBuilder,
+                                                           mActiveScrolledRoot);
   }
 
   void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder,
@@ -7013,14 +6989,7 @@ class nsDisplayPerspective : public nsDisplayHitTestInfoItem {
                                  nsRegion* aInvalidRegion) const override {}
 
   nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
-                           bool* aSnap) const override {
-    return mList.GetOpaqueRegion(aBuilder, aSnap);
-  }
-
-  mozilla::Maybe<nscolor> IsUniform(
-      nsDisplayListBuilder* aBuilder) const override {
-    return mList.IsUniform(aBuilder);
-  }
+                           bool* aSnap) const override;
 
   LayerState GetLayerState(
       nsDisplayListBuilder* aBuilder, LayerManager* aManager,
@@ -7036,50 +7005,26 @@ class nsDisplayPerspective : public nsDisplayHitTestInfoItem {
       nsDisplayListBuilder* aBuilder, LayerManager* aManager,
       const ContainerLayerParameters& aContainerParameters) override;
 
-  bool ComputeVisibility(nsDisplayListBuilder* aBuilder,
-                         nsRegion* aVisibleRegion) override {
-    mList.RecomputeVisibility(aBuilder, aVisibleRegion);
-    return true;
-  }
-
   RetainedDisplayList* GetSameCoordinateSystemChildren() const override {
-    return mList.GetChildren();
+    return &mList;
   }
 
-  RetainedDisplayList* GetChildren() const override {
-    return mList.GetChildren();
-  }
-
-  void SetActiveScrolledRoot(
-      const ActiveScrolledRoot* aActiveScrolledRoot) override {
-    nsDisplayHitTestInfoItem::SetActiveScrolledRoot(aActiveScrolledRoot);
-    mList.SetActiveScrolledRoot(aActiveScrolledRoot);
-  }
+  RetainedDisplayList* GetChildren() const override { return &mList; }
 
   nsRect GetComponentAlphaBounds(
       nsDisplayListBuilder* aBuilder) const override {
-    return mList.GetComponentAlphaBounds(aBuilder);
+    return GetChildren()->GetComponentAlphaBounds(aBuilder);
   }
 
   void DoUpdateBoundsPreserves3D(nsDisplayListBuilder* aBuilder) override {
-    if (mList.GetChildren()->GetTop()) {
-      static_cast<nsDisplayTransform*>(mList.GetChildren()->GetTop())
+    if (GetChildren()->GetTop()) {
+      static_cast<nsDisplayTransform*>(GetChildren()->GetTop())
           ->DoUpdateBoundsPreserves3D(aBuilder);
     }
   }
 
-  void Destroy(nsDisplayListBuilder* aBuilder) override {
-    mList.GetChildren()->DeleteAll(aBuilder);
-    nsDisplayItem::Destroy(aBuilder);
-  }
-
-  void RemoveFrame(nsIFrame* aFrame) override {
-    nsDisplayItem::RemoveFrame(aFrame);
-    mList.RemoveFrame(aFrame);
-  }
-
  private:
-  nsDisplayWrapList mList;
+  mutable RetainedDisplayList mList;
 };
 
 /**
@@ -7099,9 +7044,6 @@ class nsCharClipDisplayItem : public nsDisplayItem {
   nsCharClipDisplayItem(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
       : nsDisplayItem(aBuilder, aFrame), mVisIStartEdge(0), mVisIEndEdge(0) {}
 
-  explicit nsCharClipDisplayItem(nsIFrame* aFrame)
-      : nsDisplayItem(aFrame), mVisIStartEdge(0), mVisIEndEdge(0) {}
-
   void RestoreState() override { nsDisplayItem::RestoreState(); }
 
   nsDisplayItemGeometry* AllocateGeometry(
@@ -7112,11 +7054,10 @@ class nsCharClipDisplayItem : public nsDisplayItem {
                                  nsRegion* aInvalidRegion) const override;
 
   struct ClipEdges {
-    ClipEdges(const nsDisplayItem& aItem, nscoord aVisIStartEdge,
-              nscoord aVisIEndEdge) {
-      nsRect r =
-          aItem.Frame()->GetScrollableOverflowRect() + aItem.ToReferenceFrame();
-      if (aItem.Frame()->GetWritingMode().IsVertical()) {
+    ClipEdges(const nsIFrame* aFrame, const nsPoint& aToReferenceFrame,
+              nscoord aVisIStartEdge, nscoord aVisIEndEdge) {
+      nsRect r = aFrame->GetScrollableOverflowRect() + aToReferenceFrame;
+      if (aFrame->GetWritingMode().IsVertical()) {
         mVisIStart = aVisIStartEdge > 0 ? r.y + aVisIStartEdge : nscoord_MIN;
         mVisIEnd = aVisIEndEdge > 0
                        ? std::max(r.YMost() - aVisIEndEdge, mVisIStart)
@@ -7139,14 +7080,8 @@ class nsCharClipDisplayItem : public nsDisplayItem {
     nscoord mVisIEnd;
   };
 
-  ClipEdges Edges() const {
-    return ClipEdges(*this, mVisIStartEdge, mVisIEndEdge);
-  }
-
   static nsCharClipDisplayItem* CheckCast(nsDisplayItem* aItem) {
-    DisplayItemType t = aItem->GetType();
-    return (t == DisplayItemType::TYPE_TEXT ||
-            t == DisplayItemType::TYPE_SVG_CHAR_CLIP)
+    return (aItem->GetType() == DisplayItemType::TYPE_TEXT)
                ? static_cast<nsCharClipDisplayItem*>(aItem)
                : nullptr;
   }

layout/style/ServoCSSPropList.mako.py

@@ -76,7 +76,6 @@ LONGHANDS_NOT_SERIALIZED_WITH_SERVO = [
     "column-count",
     "column-gap",
     "column-rule-width",
-    "column-width",
     "display",
     "fill",
     "filter",

layout/style/nsComputedDOMStyle.cpp

@@ -1065,15 +1065,6 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetColumnCount() {
   return val.forget();
 }
 
-already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetColumnWidth() {
-  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
-
-  // XXX fix the auto case. When we actually have a column frame, I think
-  // we should return the computed column width.
-  SetValueToCoord(val, StyleColumn()->mColumnWidth, true);
-  return val.forget();
-}
-
 already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetColumnRuleWidth() {
   RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
   val->SetAppUnits(StyleColumn()->GetComputedColumnRuleWidth());

layout/style/nsComputedDOMStyle.h

@@ -331,7 +331,6 @@ class nsComputedDOMStyle final : public nsDOMCSSDeclaration,
 
   /* Column properties */
   already_AddRefed<CSSValue> DoGetColumnCount();
-  already_AddRefed<CSSValue> DoGetColumnWidth();
   already_AddRefed<CSSValue> DoGetColumnRuleWidth();
 
   /* CSS Transitions */

layout/style/nsStyleCoord.h

@@ -44,6 +44,10 @@ using LengthPercentageOrAuto = StyleLengthPercentageOrAuto;
 using NonNegativeLengthPercentage = StyleNonNegativeLengthPercentage;
 using NonNegativeLengthPercentageOrAuto =
     StyleNonNegativeLengthPercentageOrAuto;
+using Length = StyleLength;
+using LengthOrAuto = StyleLengthOrAuto;
+using NonNegativeLength = StyleNonNegativeLength;
+using NonNegativeLengthOrAuto = StyleNonNegativeLengthOrAuto;
 using BorderRadius = StyleBorderRadius;
 
 bool StyleCSSPixelLength::IsZero() const { return _0 == 0.0f; }
@@ -193,6 +197,16 @@ IMPL_LENGTHPERCENTAGE_FORWARDS(LengthPercentageOrAuto)
 IMPL_LENGTHPERCENTAGE_FORWARDS(StyleSize)
 IMPL_LENGTHPERCENTAGE_FORWARDS(StyleMaxSize)
 
+template <>
+inline bool LengthOrAuto::IsLength() const {
+  return IsLengthPercentage();
+}
+
+template <>
+inline const Length& LengthOrAuto::AsLength() const {
+  return AsLengthPercentage();
+}
+
 template <>
 inline bool StyleFlexBasis::IsAuto() const {
   return IsSize() && AsSize().IsAuto();

layout/style/nsStyleStruct.cpp

@@ -405,7 +405,7 @@ nsChangeHint nsStyleBorder::CalcDifference(
 nsStyleOutline::nsStyleOutline(const Document& aDocument)
     : mOutlineRadius(ZeroBorderRadius()),
       mOutlineWidth(kMediumBorderWidth),
-      mOutlineOffset(0),
+      mOutlineOffset({0.0f}),
       mOutlineColor(StyleColor::CurrentColor()),
       mOutlineStyle(StyleOutlineStyle::BorderStyle(StyleBorderStyle::None)),
       mActualOutlineWidth(0),
@@ -588,7 +588,7 @@ nsChangeHint nsStyleXUL::CalcDifference(const nsStyleXUL& aNewData) const {
 /* static */ const uint32_t nsStyleColumn::kColumnCountAuto;
 
 nsStyleColumn::nsStyleColumn(const Document& aDocument)
-    : mColumnWidth(eStyleUnit_Auto),
+    : mColumnWidth(LengthOrAuto::Auto()),
       mColumnRuleColor(StyleColor::CurrentColor()),
       mColumnRuleStyle(StyleBorderStyle::None),
       mColumnRuleWidth(kMediumBorderWidth),
@@ -612,8 +612,7 @@ nsStyleColumn::nsStyleColumn(const nsStyleColumn& aSource)
 
 nsChangeHint nsStyleColumn::CalcDifference(
     const nsStyleColumn& aNewData) const {
-  if ((mColumnWidth.GetUnit() == eStyleUnit_Auto) !=
-          (aNewData.mColumnWidth.GetUnit() == eStyleUnit_Auto) ||
+  if (mColumnWidth.IsAuto() != aNewData.mColumnWidth.IsAuto() ||
       mColumnCount != aNewData.mColumnCount ||
       mColumnSpan != aNewData.mColumnSpan) {
     // We force column count changes to do a reframe, because it's tricky to

layout/style/nsStyleStruct.h

@@ -1054,7 +1054,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleOutline {
   // style struct resolution reasons that we do nsStyleBorder::mBorder;
   // see that field's comment.)
   nscoord mOutlineWidth;
-  nscoord mOutlineOffset;
+  mozilla::Length mOutlineOffset;
   mozilla::StyleColor mOutlineColor;
   mozilla::StyleOutlineStyle mOutlineStyle;
 
@@ -2608,7 +2608,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn {
   static const uint32_t kColumnCountAuto = 0;
 
   uint32_t mColumnCount = kColumnCountAuto;
-  nsStyleCoord mColumnWidth;  // coord, auto
+  mozilla::NonNegativeLengthOrAuto mColumnWidth;
 
   mozilla::StyleColor mColumnRuleColor;
   mozilla::StyleBorderStyle mColumnRuleStyle;  // StyleborderStyle::*
@@ -2620,8 +2620,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn {
   }
 
   bool IsColumnContainerStyle() const {
-    return (mColumnCount != kColumnCountAuto ||
-            mColumnWidth.GetUnit() != eStyleUnit_Auto);
+    return mColumnCount != kColumnCountAuto || !mColumnWidth.IsAuto();
   }
 
   bool IsColumnSpanStyle() const {

layout/svg/SVGTextFrame.cpp

@@ -557,13 +557,10 @@ struct TextRenderedRun {
    * GetTransformFromRunUserSpaceToUserSpace should be used.
    *
    * @param aContext The context to use for unit conversions.
-   * @param aItem The nsCharClipDisplayItem that holds the amount of clipping
-   *   from the left and right edges of the text frame for this rendered run.
-   *   An appropriate nsCharClipDisplayItem can be obtained by constructing an
-   *   SVGCharClipDisplayItem for the TextRenderedRun.
    */
   gfxMatrix GetTransformFromUserSpaceForPainting(
-      nsPresContext* aContext, const nsCharClipDisplayItem& aItem) const;
+      nsPresContext* aContext, const nscoord aVisIStartEdge,
+      const nscoord aVisIEndEdge) const;
 
   /**
    * Returns the transform that converts from "run user space" to a <text>
@@ -745,7 +742,8 @@ struct TextRenderedRun {
 };
 
 gfxMatrix TextRenderedRun::GetTransformFromUserSpaceForPainting(
-    nsPresContext* aContext, const nsCharClipDisplayItem& aItem) const {
+    nsPresContext* aContext, const nscoord aVisIStartEdge,
+    const nscoord aVisIEndEdge) const {
   // We transform to device pixels positioned such that painting the text frame
   // at (0,0) with aItem will result in the text being in the right place.
 
@@ -770,13 +768,14 @@ gfxMatrix TextRenderedRun::GetTransformFromUserSpaceForPainting(
 
   // Translation to get the text frame in the right place.
   nsPoint t;
+
   if (IsVertical()) {
     t = nsPoint(-mBaseline, IsRightToLeft()
-                                ? -mFrame->GetRect().height + aItem.mVisIEndEdge
-                                : -aItem.mVisIStartEdge);
+                                ? -mFrame->GetRect().height + aVisIEndEdge
+                                : -aVisIStartEdge);
   } else {
-    t = nsPoint(IsRightToLeft() ? -mFrame->GetRect().width + aItem.mVisIEndEdge
-                                : -aItem.mVisIStartEdge,
+    t = nsPoint(IsRightToLeft() ? -mFrame->GetRect().width + aVisIEndEdge
+                                : -aVisIStartEdge,
                 -mBaseline);
   }
   m.PreTranslate(AppUnitsToGfxUnits(t, aContext));
@@ -2513,23 +2512,6 @@ bool CharIterator::MatchesFilter() const {
          IsClusterAndLigatureGroupStart();
 }
 
-// -----------------------------------------------------------------------------
-// nsCharClipDisplayItem
-
-/**
- * An nsCharClipDisplayItem that obtains its left and right clip edges from a
- * TextRenderedRun object.
- */
-class SVGCharClipDisplayItem final : public nsCharClipDisplayItem {
- public:
-  explicit SVGCharClipDisplayItem(const TextRenderedRun& aRun)
-      : nsCharClipDisplayItem(aRun.mFrame) {
-    aRun.GetClipEdges(mVisIStartEdge, mVisIEndEdge);
-  }
-
-  NS_DISPLAY_DECL_NAME("SVGCharClip", TYPE_SVG_CHAR_CLIP)
-};
-
 // -----------------------------------------------------------------------------
 // SVGTextDrawPathCallbacks
 
@@ -3355,10 +3337,6 @@ void SVGTextFrame::PaintSVG(gfxContext& aContext, const gfxMatrix& aTransform,
   while (run.mFrame) {
     nsTextFrame* frame = run.mFrame;
 
-    // Determine how much of the left and right edges of the text frame we
-    // need to ignore.
-    SVGCharClipDisplayItem item(run);
-
     RefPtr<SVGContextPaintImpl> contextPaint = new SVGContextPaintImpl();
     DrawMode drawMode = contextPaint->Init(&aDrawTarget, initialMatrix, frame,
                                            outerContextPaint, aImgParams);
@@ -3369,11 +3347,14 @@ void SVGTextFrame::PaintSVG(gfxContext& aContext, const gfxMatrix& aTransform,
       nsSVGUtils::SetupStrokeGeometry(frame, &aContext, outerContextPaint);
     }
 
+    nscoord startEdge, endEdge;
+    run.GetClipEdges(startEdge, endEdge);
+
     // Set up the transform for painting the text frame for the substring
     // indicated by the run.
-    gfxMatrix runTransform =
-        run.GetTransformFromUserSpaceForPainting(presContext, item) *
-        currentMatrix;
+    gfxMatrix runTransform = run.GetTransformFromUserSpaceForPainting(
+                                 presContext, startEdge, endEdge) *
+                             currentMatrix;
     aContext.SetMatrixDouble(runTransform);
 
     if (drawMode != DrawMode(0)) {
@@ -3383,14 +3364,17 @@ void SVGTextFrame::PaintSVG(gfxContext& aContext, const gfxMatrix& aTransform,
       params.dirtyRect = LayoutDevicePixel::FromAppUnits(
           frame->GetVisualOverflowRect(), auPerDevPx);
       params.contextPaint = contextPaint;
+
+      const bool isSelected = frame->IsSelected();
+
       if (ShouldRenderAsPath(frame, paintSVGGlyphs)) {
         SVGTextDrawPathCallbacks callbacks(this, aContext, frame,
                                            matrixForPaintServers, aImgParams,
                                            paintSVGGlyphs);
         params.callbacks = &callbacks;
-        frame->PaintText(params, item);
+        frame->PaintText(params, startEdge, endEdge, nsPoint(), isSelected);
       } else {
-        frame->PaintText(params, item);
+        frame->PaintText(params, startEdge, endEdge, nsPoint(), isSelected);
       }
     }
 

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java

@@ -1793,7 +1793,7 @@ public class GeckoSession implements Parcelable {
          *
          * @param value The serialized SessionState in String form.
          * @return A new SessionState instance.
-         * @throws JSONException
+         * @throws JSONException if the value is not a valid json
          */
         public static @NonNull SessionState fromString(final @NonNull String value) throws JSONException {
             return new SessionState(GeckoBundle.fromJSONObject(new JSONObject(value)));

netwerk/url-classifier/UrlClassifierSkipListService.jsm

@@ -75,7 +75,7 @@ class Feature {
       entries.push(entry);
     }
 
-    let entriesAsString = entries.join(",");
+    let entriesAsString = entries.join(",").toLowerCase();
     if (observer) {
       observer.onSkipListUpdate(entriesAsString);
     } else {

python/mozbuild/mozbuild/action/test_archive.py

@@ -404,6 +404,36 @@ ARCHIVE_FILES = {
             'base': 'testing',
             'pattern': 'mozharness/**',
         },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing/mozbase/manifestparser',
+            'pattern': 'manifestparser/**',
+            'dest': 'mozharness',
+        },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing/mozbase/mozfile',
+            'pattern': 'mozfile/**',
+            'dest': 'mozharness',
+        },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing/mozbase/mozinfo',
+            'pattern': 'mozinfo/**',
+            'dest': 'mozharness',
+        },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing/mozbase/mozprocess',
+            'pattern': 'mozprocess/**',
+            'dest': 'mozharness',
+        },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'third_party/python/six',
+            'pattern': 'six.py',
+            'dest': 'mozharness',
+        },
     ],
     'reftest': [
         {

security/sandbox/mac/Sandbox.mm

@@ -291,6 +291,10 @@ bool StartMacSandbox(MacSandboxInfo const &aInfo, std::string &aErrorMessage) {
     params.push_back(aInfo.shouldLog ? "TRUE" : "FALSE");
     params.push_back("APP_PATH");
     params.push_back(aInfo.appPath.c_str());
+    if (!aInfo.crashServerPort.empty()) {
+      params.push_back("CRASH_PORT");
+      params.push_back(aInfo.crashServerPort.c_str());
+    }
   } else if (aInfo.type == MacSandboxType_Plugin) {
     profile = const_cast<char *>(SandboxPolicyGMP);
     params.push_back("SHOULD_LOG");

security/sandbox/mac/SandboxPolicyUtility.h

@@ -13,6 +13,7 @@ static const char SandboxPolicyUtility[] = R"SANDBOX_LITERAL(
 
   (define should-log (param "SHOULD_LOG"))
   (define app-path (param "APP_PATH"))
+  (define crashPort (param "CRASH_PORT"))
 
   (define (moz-deny feature)
     (if (string=? should-log "TRUE")
@@ -41,6 +42,9 @@ static const char SandboxPolicyUtility[] = R"SANDBOX_LITERAL(
       (subpath "/usr/lib")
       (subpath app-path)))
 
+  (if (string? crashPort)
+    (allow mach-lookup (global-name crashPort)))
+
   (allow signal (target self))
   (allow sysctl-read)
   (allow file-read*

servo/components/style/properties/gecko.mako.rs

@@ -1204,13 +1204,7 @@ impl Clone for ${style_struct.gecko_struct_name} {
 
     # Types used with predefined_type()-defined properties that we can auto-generate.
     predefined_types = {
-        "length::LengthOrAuto": impl_style_coord,
-        "length::LengthOrNormal": impl_style_coord,
-        "length::NonNegativeLengthOrAuto": impl_style_coord,
         "length::NonNegativeLengthPercentageOrNormal": impl_style_coord,
-        "Length": impl_absolute_length,
-        "LengthOrNormal": impl_style_coord,
-        "LengthPercentageOrAuto": impl_style_coord,
         "MozScriptMinSize": impl_absolute_length,
         "RGBAColor": impl_rgba_color,
         "SVGLength": impl_svg_length,

servo/components/style/values/computed/length.rs

@@ -710,9 +710,6 @@ pub type NonNegativeLengthOrAuto = generics::GenericLengthPercentageOrAuto<NonNe
 /// Either a computed `<length>` or a `<number>` value.
 pub type LengthOrNumber = GenericLengthOrNumber<Length, Number>;
 
-/// Either a computed `<length>` or the `normal` keyword.
-pub type LengthOrNormal = Either<Length, Normal>;
-
 /// A wrapper of Length, whose value must be >= 0.
 pub type NonNegativeLength = NonNegative<Length>;
 
@@ -783,9 +780,6 @@ impl From<NonNegativeLength> for Au {
     }
 }
 
-/// Either a computed NonNegativeLength or the `normal` keyword.
-pub type NonNegativeLengthOrNormal = Either<NonNegativeLength, Normal>;
-
 /// Either a computed NonNegativeLengthPercentage or the `normal` keyword.
 pub type NonNegativeLengthPercentageOrNormal = Either<NonNegativeLengthPercentage, Normal>;
 

servo/components/style/values/specified/length.rs

@@ -956,9 +956,6 @@ impl NonNegativeLengthPercentageOrAuto {
 /// A wrapper of LengthPercentage, whose value must be >= 0.
 pub type NonNegativeLengthPercentage = NonNegative<LengthPercentage>;
 
-/// Either a computed NonNegativeLength or the `normal` keyword.
-pub type NonNegativeLengthOrNormal = Either<NonNegativeLength, Normal>;
-
 /// Either a NonNegativeLengthPercentage or the `normal` keyword.
 pub type NonNegativeLengthPercentageOrNormal = Either<NonNegativeLengthPercentage, Normal>;
 
@@ -998,9 +995,6 @@ impl NonNegativeLengthPercentage {
     }
 }
 
-/// Either a `<length>` or the `normal` keyword.
-pub type LengthOrNormal = Either<Length, Normal>;
-
 /// Either a `<length>` or the `auto` keyword.
 ///
 /// Note that we use LengthPercentage just for convenience, since it pretty much

servo/ports/geckolib/cbindgen.toml

@@ -82,6 +82,8 @@ include = [
   "LengthPercentageOrAuto",
   "LineHeight",
   "NonNegativeLengthPercentageOrAuto",
+  "LengthOrAuto",
+  "NonNegativeLengthOrAuto",
   "Rect",
   "IntersectionObserverRootMargin",
   "Size",
@@ -199,6 +201,10 @@ renaming_overrides_prefixing = true
   inline float ToPercentage() const;
   inline bool HasPercent() const;
   inline bool HasLengthAndPercentage() const;
+
+  // Just some convenient aliases for LengthOrAuto, to avoid confusing naming.
+  inline bool IsLength() const;
+  inline const StyleLength& AsLength() const;
 """
 
 "GenericSize" = """

taskcluster/scripts/builder/build-linux.sh

@@ -88,7 +88,7 @@ export TOOLTOOL_CACHE
 
 config_path_cmds=""
 for path in ${MOZHARNESS_CONFIG_PATHS}; do
-    config_path_cmds="${config_path_cmds} --extra-config-path ${WORKSPACE}/build/src/${path}"
+    config_path_cmds="${config_path_cmds} --extra-config-path ${GECKO_PATH}/${path}"
 done
 
 # support multiple, space delimited, config files
@@ -117,7 +117,7 @@ fi
 
 cd /builds/worker
 
-python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
+$GECKO_PATH/mach python $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
   ${config_path_cmds} \
   ${config_cmds} \
   $debug_flag \

taskcluster/scripts/builder/repackage.sh

@@ -92,7 +92,7 @@ fi
 
 cd /builds/worker
 
-python2.7 $WORKSPACE/build/src/testing/${MOZHARNESS_SCRIPT} \
+$GECKO_PATH/mach python $GECKO_PATH/testing/${MOZHARNESS_SCRIPT} \
   ${config_path_cmds} \
   ${config_cmds} \
   $actions \

taskcluster/scripts/tester/test-linux.sh

@@ -19,6 +19,7 @@ fi
 
 # Inputs, with defaults
 
+: GECKO_PATH                    ${GECKO_PATH}
 : MOZHARNESS_PATH               ${MOZHARNESS_PATH}
 : MOZHARNESS_URL                ${MOZHARNESS_URL}
 : MOZHARNESS_SCRIPT             ${MOZHARNESS_SCRIPT}
@@ -183,16 +184,20 @@ if [ -n "$MOZHARNESS_OPTIONS" ]; then
     done
 fi
 
+# Use |mach python| if a source checkout exists so in-tree packages are
+# available.
+[[ -d "${GECKO_PATH}" ]] && python="${GECKO_PATH}/mach python" || python="python2.7"
+
+# Save the computed mozharness command to a binary which is useful for
+# interactive mode.
 mozharness_bin="$HOME/bin/run-mozharness"
 mkdir -p $(dirname $mozharness_bin)
 
-# Save the computed mozharness command to a binary which is useful
-# for interactive mode.
 echo -e "#!/usr/bin/env bash
 # Some mozharness scripts assume base_work_dir is in
 # the current working directory, see bug 1279237
 cd "$WORKSPACE"
-cmd=\"python2.7 ${MOZHARNESS_PATH}/scripts/${MOZHARNESS_SCRIPT} ${config_cmds} ${options} ${@} \${@}\"
+cmd=\"${python} ${MOZHARNESS_PATH}/scripts/${MOZHARNESS_SCRIPT} ${config_cmds} ${options} ${@} \${@}\"
 echo \"Running: \${cmd}\"
 exec \${cmd}" > ${mozharness_bin}
 chmod +x ${mozharness_bin}

taskcluster/taskgraph/transforms/job/mozharness.py

@@ -300,16 +300,19 @@ def mozharness_on_generic_worker(config, job, taskdesc):
             "Task generation for mozharness build jobs currently only supported on Windows"
         )
 
-    mh_command = [r'c:\mozilla-build\python\python.exe']
-    mh_command.append('\\'.join([r'.\build\src\testing', run['script'].replace('/', '\\')]))
+    gecko = env['GECKO_PATH'].replace('.', '%cd%')
+    mh_command = [
+            'c:/mozilla-build/python/python.exe',
+            '{}/mach'.format(gecko), 'python',
+    ]
+    mh_command.append('/'.join([gecko, 'testing', run['script']]))
 
     if 'config-paths' in run:
         for path in run['config-paths']:
-            mh_command.append(r'--extra-config-path '
-                              r'.\build\src\{}'.format(path.replace('/', '\\')))
+            mh_command.append('--extra-config-path {}/{}'.format(gecko, path))
 
     for cfg in run['config']:
-        mh_command.append('--config ' + cfg.replace('/', '\\'))
+        mh_command.append('--config ' + cfg)
     if run['use-magic-mh-args']:
         mh_command.append('--branch ' + config.params['project'])
     mh_command.append(r'--work-dir %cd:Z:=z:%\build')

testing/mozharness/manifestparser/__init__.py

@@ -1,8 +0,0 @@
-# flake8: noqa
-# 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/.
-
-from .manifestparser import *
-from .expression import *
-from .ini import *

testing/mozharness/manifestparser/cli.py

@@ -1,247 +0,0 @@
-#!/usr/bin/env python
-# 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/.
-
-"""
-Mozilla universal manifest parser
-"""
-
-from optparse import OptionParser
-import os
-import sys
-
-from .manifestparser import (
-    convert,
-    ManifestParser,
-)
-
-
-class ParserError(Exception):
-    """error for exceptions while parsing the command line"""
-
-
-def parse_args(_args):
-    """
-    parse and return:
-    --keys=value (or --key value)
-    -tags
-    args
-    """
-
-    # return values
-    _dict = {}
-    tags = []
-    args = []
-
-    # parse the arguments
-    key = None
-    for arg in _args:
-        if arg.startswith('---'):
-            raise ParserError("arguments should start with '-' or '--' only")
-        elif arg.startswith('--'):
-            if key:
-                raise ParserError("Key %s still open" % key)
-            key = arg[2:]
-            if '=' in key:
-                key, value = key.split('=', 1)
-                _dict[key] = value
-                key = None
-                continue
-        elif arg.startswith('-'):
-            if key:
-                raise ParserError("Key %s still open" % key)
-            tags.append(arg[1:])
-            continue
-        else:
-            if key:
-                _dict[key] = arg
-                continue
-            args.append(arg)
-
-    # return values
-    return (_dict, tags, args)
-
-
-class CLICommand(object):
-    usage = '%prog [options] command'
-
-    def __init__(self, parser):
-        self._parser = parser  # master parser
-
-    def parser(self):
-        return OptionParser(usage=self.usage, description=self.__doc__,
-                            add_help_option=False)
-
-
-class Copy(CLICommand):
-    usage = '%prog [options] copy manifest directory -tag1 -tag2 --key1=value1 --key2=value2 ...'
-
-    def __call__(self, options, args):
-        # parse the arguments
-        try:
-            kwargs, tags, args = parse_args(args)
-        except ParserError, e:
-            self._parser.error(e.message)
-
-        # make sure we have some manifests, otherwise it will
-        # be quite boring
-        if not len(args) == 2:
-            HelpCLI(self._parser)(options, ['copy'])
-            return
-
-        # read the manifests
-        # TODO: should probably ensure these exist here
-        manifests = ManifestParser()
-        manifests.read(args[0])
-
-        # print the resultant query
-        manifests.copy(args[1], None, *tags, **kwargs)
-
-
-class CreateCLI(CLICommand):
-    """
-    create a manifest from a list of directories
-    """
-    usage = '%prog [options] create directory <directory> <...>'
-
-    def parser(self):
-        parser = CLICommand.parser(self)
-        parser.add_option('-p', '--pattern', dest='pattern',
-                          help="glob pattern for files")
-        parser.add_option('-i', '--ignore', dest='ignore',
-                          default=[], action='append',
-                          help='directories to ignore')
-        parser.add_option('-w', '--in-place', dest='in_place',
-                          help='Write .ini files in place; filename to write to')
-        return parser
-
-    def __call__(self, _options, args):
-        parser = self.parser()
-        options, args = parser.parse_args(args)
-
-        # need some directories
-        if not len(args):
-            parser.print_usage()
-            return
-
-        # add the directories to the manifest
-        for arg in args:
-            assert os.path.exists(arg)
-            assert os.path.isdir(arg)
-            manifest = convert(args, pattern=options.pattern, ignore=options.ignore,
-                               write=options.in_place)
-        if manifest:
-            print manifest
-
-
-class WriteCLI(CLICommand):
-    """
-    write a manifest based on a query
-    """
-    usage = '%prog [options] write manifest <manifest> -tag1 -tag2 --key1=value1 --key2=value2 ...'
-
-    def __call__(self, options, args):
-
-        # parse the arguments
-        try:
-            kwargs, tags, args = parse_args(args)
-        except ParserError, e:
-            self._parser.error(e.message)
-
-        # make sure we have some manifests, otherwise it will
-        # be quite boring
-        if not args:
-            HelpCLI(self._parser)(options, ['write'])
-            return
-
-        # read the manifests
-        # TODO: should probably ensure these exist here
-        manifests = ManifestParser()
-        manifests.read(*args)
-
-        # print the resultant query
-        manifests.write(global_tags=tags, global_kwargs=kwargs)
-
-
-class HelpCLI(CLICommand):
-    """
-    get help on a command
-    """
-    usage = '%prog [options] help [command]'
-
-    def __call__(self, options, args):
-        if len(args) == 1 and args[0] in commands:
-            commands[args[0]](self._parser).parser().print_help()
-        else:
-            self._parser.print_help()
-            print '\nCommands:'
-            for command in sorted(commands):
-                print '  %s : %s' % (command, commands[command].__doc__.strip())
-
-
-class UpdateCLI(CLICommand):
-    """
-    update the tests as listed in a manifest from a directory
-    """
-    usage = '%prog [options] update manifest directory -tag1 -tag2 --key1=value1 --key2=value2 ...'
-
-    def __call__(self, options, args):
-        # parse the arguments
-        try:
-            kwargs, tags, args = parse_args(args)
-        except ParserError, e:
-            self._parser.error(e.message)
-
-        # make sure we have some manifests, otherwise it will
-        # be quite boring
-        if not len(args) == 2:
-            HelpCLI(self._parser)(options, ['update'])
-            return
-
-        # read the manifests
-        # TODO: should probably ensure these exist here
-        manifests = ManifestParser()
-        manifests.read(args[0])
-
-        # print the resultant query
-        manifests.update(args[1], None, *tags, **kwargs)
-
-
-# command -> class mapping
-commands = {'create': CreateCLI,
-            'help': HelpCLI,
-            'update': UpdateCLI,
-            'write': WriteCLI}
-
-
-def main(args=sys.argv[1:]):
-    """console_script entry point"""
-
-    # set up an option parser
-    usage = '%prog [options] [command] ...'
-    description = "%s. Use `help` to display commands" % __doc__.strip()
-    parser = OptionParser(usage=usage, description=description)
-    parser.add_option('-s', '--strict', dest='strict',
-                      action='store_true', default=False,
-                      help='adhere strictly to errors')
-    parser.disable_interspersed_args()
-
-    options, args = parser.parse_args(args)
-
-    if not args:
-        HelpCLI(parser)(options, args)
-        parser.exit()
-
-    # get the command
-    command = args[0]
-    if command not in commands:
-        parser.error("Command must be one of %s (you gave '%s')" %
-                     (', '.join(sorted(commands.keys())), command))
-
-    handler = commands[command](parser)
-    handler(options, args[1:])
-
-
-if __name__ == '__main__':
-    main()

testing/mozharness/manifestparser/expression.py

@@ -1,325 +0,0 @@
-# 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/.
-
-import re
-import sys
-import traceback
-
-__all__ = ['parse', 'ParseError', 'ExpressionParser']
-
-# expr.py
-# from:
-# http://k0s.org/mozilla/hg/expressionparser
-# http://hg.mozilla.org/users/tmielczarek_mozilla.com/expressionparser
-
-# Implements a top-down parser/evaluator for simple boolean expressions.
-# ideas taken from http://effbot.org/zone/simple-top-down-parsing.htm
-#
-# Rough grammar:
-# expr := literal
-#       | '(' expr ')'
-#       | expr '&&' expr
-#       | expr '||' expr
-#       | expr '==' expr
-#       | expr '!=' expr
-#       | expr '<' expr
-#       | expr '>' expr
-#       | expr '<=' expr
-#       | expr '>=' expr
-# literal := BOOL
-#          | INT
-#          | STRING
-#          | IDENT
-# BOOL   := true|false
-# INT    := [0-9]+
-# STRING := "[^"]*"
-# IDENT  := [A-Za-z_]\w*
-
-# Identifiers take their values from a mapping dictionary passed as the second
-# argument.
-
-# Glossary (see above URL for details):
-# - nud: null denotation
-# - led: left detonation
-# - lbp: left binding power
-# - rbp: right binding power
-
-
-class ident_token(object):
-
-    def __init__(self, scanner, value):
-        self.value = value
-
-    def nud(self, parser):
-        # identifiers take their value from the value mappings passed
-        # to the parser
-        return parser.value(self.value)
-
-
-class literal_token(object):
-
-    def __init__(self, scanner, value):
-        self.value = value
-
-    def nud(self, parser):
-        return self.value
-
-
-class eq_op_token(object):
-    "=="
-
-    def led(self, parser, left):
-        return left == parser.expression(self.lbp)
-
-
-class neq_op_token(object):
-    "!="
-
-    def led(self, parser, left):
-        return left != parser.expression(self.lbp)
-
-
-class lt_op_token(object):
-    "<"
-
-    def led(self, parser, left):
-        return left < parser.expression(self.lbp)
-
-
-class gt_op_token(object):
-    ">"
-
-    def led(self, parser, left):
-        return left > parser.expression(self.lbp)
-
-
-class le_op_token(object):
-    "<="
-
-    def led(self, parser, left):
-        return left <= parser.expression(self.lbp)
-
-
-class ge_op_token(object):
-    ">="
-
-    def led(self, parser, left):
-        return left >= parser.expression(self.lbp)
-
-
-class not_op_token(object):
-    "!"
-
-    def nud(self, parser):
-        return not parser.expression(100)
-
-
-class and_op_token(object):
-    "&&"
-
-    def led(self, parser, left):
-        right = parser.expression(self.lbp)
-        return left and right
-
-
-class or_op_token(object):
-    "||"
-
-    def led(self, parser, left):
-        right = parser.expression(self.lbp)
-        return left or right
-
-
-class lparen_token(object):
-    "("
-
-    def nud(self, parser):
-        expr = parser.expression()
-        parser.advance(rparen_token)
-        return expr
-
-
-class rparen_token(object):
-    ")"
-
-
-class end_token(object):
-    """always ends parsing"""
-
-# derived literal tokens
-
-
-class bool_token(literal_token):
-
-    def __init__(self, scanner, value):
-        value = {'true': True, 'false': False}[value]
-        literal_token.__init__(self, scanner, value)
-
-
-class int_token(literal_token):
-
-    def __init__(self, scanner, value):
-        literal_token.__init__(self, scanner, int(value))
-
-
-class string_token(literal_token):
-
-    def __init__(self, scanner, value):
-        literal_token.__init__(self, scanner, value[1:-1])
-
-
-precedence = [(end_token, rparen_token),
-              (or_op_token,),
-              (and_op_token,),
-              (lt_op_token, gt_op_token, le_op_token, ge_op_token,
-               eq_op_token, neq_op_token),
-              (lparen_token,),
-              ]
-for index, rank in enumerate(precedence):
-    for token in rank:
-        token.lbp = index  # lbp = lowest left binding power
-
-
-class ParseError(Exception):
-    """error parsing conditional expression"""
-
-
-class ExpressionParser(object):
-    """
-    A parser for a simple expression language.
-
-    The expression language can be described as follows::
-
-        EXPRESSION ::= LITERAL | '(' EXPRESSION ')' | '!' EXPRESSION | EXPRESSION OP EXPRESSION
-        OP ::= '==' | '!=' | '<' | '>' | '<=' | '>=' | '&&' | '||'
-        LITERAL ::= BOOL | INT | IDENT | STRING
-        BOOL ::= 'true' | 'false'
-        INT ::= [0-9]+
-        IDENT ::= [a-zA-Z_]\w*
-        STRING ::= '"' [^\"] '"' | ''' [^\'] '''
-
-    At its core, expressions consist of booleans, integers, identifiers and.
-    strings. Booleans are one of *true* or *false*. Integers are a series
-    of digits. Identifiers are a series of English letters and underscores.
-    Strings are a pair of matching quote characters (single or double) with
-    zero or more characters inside.
-
-    Expressions can be combined with operators: the equals (==) and not
-    equals (!=) operators compare two expressions and produce a boolean. The
-    and (&&) and or (||) operators take two expressions and produce the logical
-    AND or OR value of them, respectively. An expression can also be prefixed
-    with the not (!) operator, which produces its logical negation.
-
-    Finally, any expression may be contained within parentheses for grouping.
-
-    Identifiers take their values from the mapping provided.
-    """
-
-    scanner = None
-
-    def __init__(self, text, valuemapping, strict=False):
-        """
-        Initialize the parser
-        :param text: The expression to parse as a string.
-        :param valuemapping: A dict mapping identifier names to values.
-        :param strict: If true, referencing an identifier that was not
-                       provided in :valuemapping: will raise an error.
-        """
-        self.text = text
-        self.valuemapping = valuemapping
-        self.strict = strict
-
-    def _tokenize(self):
-        """
-        Lex the input text into tokens and yield them in sequence.
-        """
-        if not ExpressionParser.scanner:
-            ExpressionParser.scanner = re.Scanner([
-                # Note: keep these in sync with the class docstring above.
-                (r"true|false", bool_token),
-                (r"[a-zA-Z_]\w*", ident_token),
-                (r"[0-9]+", int_token),
-                (r'("[^"]*")|(\'[^\']*\')', string_token),
-                (r"==", eq_op_token()),
-                (r"!=", neq_op_token()),
-                (r"<=", le_op_token()),
-                (r">=", ge_op_token()),
-                (r"<", lt_op_token()),
-                (r">", gt_op_token()),
-                (r"\|\|", or_op_token()),
-                (r"!", not_op_token()),
-                (r"&&", and_op_token()),
-                (r"\(", lparen_token()),
-                (r"\)", rparen_token()),
-                (r"\s+", None),  # skip whitespace
-            ])
-        tokens, remainder = ExpressionParser.scanner.scan(self.text)
-        for t in tokens:
-            yield t
-        yield end_token()
-
-    def value(self, ident):
-        """
-        Look up the value of |ident| in the value mapping passed in the
-        constructor.
-        """
-        if self.strict:
-            return self.valuemapping[ident]
-        else:
-            return self.valuemapping.get(ident, None)
-
-    def advance(self, expected):
-        """
-        Assert that the next token is an instance of |expected|, and advance
-        to the next token.
-        """
-        if not isinstance(self.token, expected):
-            raise Exception("Unexpected token!")
-        self.token = self.iter.next()
-
-    def expression(self, rbp=0):
-        """
-        Parse and return the value of an expression until a token with
-        right binding power greater than rbp is encountered.
-        """
-        t = self.token
-        self.token = self.iter.next()
-        left = t.nud(self)
-        while rbp < self.token.lbp:
-            t = self.token
-            self.token = self.iter.next()
-            left = t.led(self, left)
-        return left
-
-    def parse(self):
-        """
-        Parse and return the value of the expression in the text
-        passed to the constructor. Raises a ParseError if the expression
-        could not be parsed.
-        """
-        try:
-            self.iter = self._tokenize()
-            self.token = self.iter.next()
-            return self.expression()
-        except:
-            extype, ex, tb = sys.exc_info()
-            formatted = ''.join(traceback.format_exception_only(extype, ex))
-            raise ParseError("could not parse: "
-                             "%s\nexception: %svariables: %s" % (self.text,
-                                                                 formatted,
-                                                                 self.valuemapping)), None, tb
-
-    __call__ = parse
-
-
-def parse(text, **values):
-    """
-    Parse and evaluate a boolean expression.
-    :param text: The expression to parse, as a string.
-    :param values: A dict containing a name to value mapping for identifiers
-                   referenced in *text*.
-    :rtype: the final value of the expression.
-    :raises: :py:exc::ParseError: will be raised if parsing fails.
-    """
-    return ExpressionParser(text, values).parse()

testing/mozharness/manifestparser/filters.py

@@ -1,421 +0,0 @@
-# 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/.
-
-"""
-A filter is a callable that accepts an iterable of test objects and a
-dictionary of values, and returns a new iterable of test objects. It is
-possible to define custom filters if the built-in ones are not enough.
-"""
-
-from collections import defaultdict, MutableSequence
-import itertools
-import os
-
-from .expression import (
-    parse,
-    ParseError,
-)
-
-
-# built-in filters
-
-def skip_if(tests, values):
-    """
-    Sets disabled on all tests containing the `skip-if` tag and whose condition
-    is True. This filter is added by default.
-    """
-    tag = 'skip-if'
-    for test in tests:
-        if tag in test and parse(test[tag], **values):
-            test.setdefault('disabled', '{}: {}'.format(tag, test[tag]))
-        yield test
-
-
-def run_if(tests, values):
-    """
-    Sets disabled on all tests containing the `run-if` tag and whose condition
-    is False. This filter is added by default.
-    """
-    tag = 'run-if'
-    for test in tests:
-        if tag in test and not parse(test[tag], **values):
-            test.setdefault('disabled', '{}: {}'.format(tag, test[tag]))
-        yield test
-
-
-def fail_if(tests, values):
-    """
-    Sets expected to 'fail' on all tests containing the `fail-if` tag and whose
-    condition is True. This filter is added by default.
-    """
-    tag = 'fail-if'
-    for test in tests:
-        if tag in test and parse(test[tag], **values):
-            test['expected'] = 'fail'
-        yield test
-
-
-def enabled(tests, values):
-    """
-    Removes all tests containing the `disabled` key. This filter can be
-    added by passing `disabled=False` into `active_tests`.
-    """
-    for test in tests:
-        if 'disabled' not in test:
-            yield test
-
-
-def exists(tests, values):
-    """
-    Removes all tests that do not exist on the file system. This filter is
-    added by default, but can be removed by passing `exists=False` into
-    `active_tests`.
-    """
-    for test in tests:
-        if os.path.exists(test['path']):
-            yield test
-
-
-# built-in instance filters
-
-class InstanceFilter(object):
-    """
-    Generally only one instance of a class filter should be applied at a time.
-    Two instances of `InstanceFilter` are considered equal if they have the
-    same class name. This ensures only a single instance is ever added to
-    `filterlist`. This class also formats filters' __str__ method for easier
-    debugging.
-    """
-    unique = True
-
-    def __init__(self, *args, **kwargs):
-        self.fmt_args = ', '.join(itertools.chain(
-            [str(a) for a in args],
-            ['{}={}'.format(k, v) for k, v in kwargs.iteritems()]))
-
-    def __eq__(self, other):
-        if self.unique:
-            return self.__class__ == other.__class__
-        return self.__hash__() == other.__hash__()
-
-    def __str__(self):
-        return "{}({})".format(self.__class__.__name__, self.fmt_args)
-
-
-class subsuite(InstanceFilter):
-    """
-    If `name` is None, removes all tests that have a `subsuite` key.
-    Otherwise removes all tests that do not have a subsuite matching `name`.
-
-    It is possible to specify conditional subsuite keys using:
-       subsuite = foo,condition
-
-    where 'foo' is the subsuite name, and 'condition' is the same type of
-    condition used for skip-if.  If the condition doesn't evaluate to true,
-    the subsuite designation will be removed from the test.
-
-    :param name: The name of the subsuite to run (default None)
-    """
-
-    def __init__(self, name=None):
-        InstanceFilter.__init__(self, name=name)
-        self.name = name
-
-    def __call__(self, tests, values):
-        # Look for conditional subsuites, and replace them with the subsuite
-        # itself (if the condition is true), or nothing.
-        for test in tests:
-            subsuite = test.get('subsuite', '')
-            if ',' in subsuite:
-                try:
-                    subsuite, cond = subsuite.split(',')
-                except ValueError:
-                    raise ParseError("subsuite condition can't contain commas")
-                matched = parse(cond, **values)
-                if matched:
-                    test['subsuite'] = subsuite
-                else:
-                    test['subsuite'] = ''
-
-            # Filter on current subsuite
-            if self.name is None:
-                if not test.get('subsuite'):
-                    yield test
-            else:
-                if test.get('subsuite', '') == self.name:
-                    yield test
-
-
-class chunk_by_slice(InstanceFilter):
-    """
-    Basic chunking algorithm that splits tests evenly across total chunks.
-
-    :param this_chunk: the current chunk, 1 <= this_chunk <= total_chunks
-    :param total_chunks: the total number of chunks
-    :param disabled: Whether to include disabled tests in the chunking
-                     algorithm. If False, each chunk contains an equal number
-                     of non-disabled tests. If True, each chunk contains an
-                     equal number of tests (default False)
-    """
-
-    def __init__(self, this_chunk, total_chunks, disabled=False):
-        assert 1 <= this_chunk <= total_chunks
-        InstanceFilter.__init__(self, this_chunk, total_chunks,
-                                disabled=disabled)
-        self.this_chunk = this_chunk
-        self.total_chunks = total_chunks
-        self.disabled = disabled
-
-    def __call__(self, tests, values):
-        tests = list(tests)
-        if self.disabled:
-            chunk_tests = tests[:]
-        else:
-            chunk_tests = [t for t in tests if 'disabled' not in t]
-
-        tests_per_chunk = float(len(chunk_tests)) / self.total_chunks
-        start = int(round((self.this_chunk - 1) * tests_per_chunk))
-        end = int(round(self.this_chunk * tests_per_chunk))
-
-        if not self.disabled:
-            # map start and end back onto original list of tests. Disabled
-            # tests will still be included in the returned list, but each
-            # chunk will contain an equal number of enabled tests.
-            if self.this_chunk == 1:
-                start = 0
-            elif start < len(chunk_tests):
-                start = tests.index(chunk_tests[start])
-
-            if self.this_chunk == self.total_chunks:
-                end = len(tests)
-            elif end < len(chunk_tests):
-                end = tests.index(chunk_tests[end])
-        return (t for t in tests[start:end])
-
-
-class chunk_by_dir(InstanceFilter):
-    """
-    Basic chunking algorithm that splits directories of tests evenly at a
-    given depth.
-
-    For example, a depth of 2 means all test directories two path nodes away
-    from the base are gathered, then split evenly across the total number of
-    chunks. The number of tests in each of the directories is not taken into
-    account (so chunks will not contain an even number of tests). All test
-    paths must be relative to the same root (typically the root of the source
-    repository).
-
-    :param this_chunk: the current chunk, 1 <= this_chunk <= total_chunks
-    :param total_chunks: the total number of chunks
-    :param depth: the minimum depth of a subdirectory before it will be
-                  considered unique
-    """
-
-    def __init__(self, this_chunk, total_chunks, depth):
-        InstanceFilter.__init__(self, this_chunk, total_chunks, depth)
-        self.this_chunk = this_chunk
-        self.total_chunks = total_chunks
-        self.depth = depth
-
-    def __call__(self, tests, values):
-        tests_by_dir = defaultdict(list)
-        ordered_dirs = []
-        for test in tests:
-            path = test['relpath']
-
-            if path.startswith(os.sep):
-                path = path[1:]
-
-            dirs = path.split(os.sep)
-            dirs = dirs[:min(self.depth, len(dirs) - 1)]
-            path = os.sep.join(dirs)
-
-            # don't count directories that only have disabled tests in them,
-            # but still yield disabled tests that are alongside enabled tests
-            if path not in ordered_dirs and 'disabled' not in test:
-                ordered_dirs.append(path)
-            tests_by_dir[path].append(test)
-
-        tests_per_chunk = float(len(ordered_dirs)) / self.total_chunks
-        start = int(round((self.this_chunk - 1) * tests_per_chunk))
-        end = int(round(self.this_chunk * tests_per_chunk))
-
-        for i in range(start, end):
-            for test in tests_by_dir.pop(ordered_dirs[i]):
-                yield test
-
-        # find directories that only contain disabled tests. They still need to
-        # be yielded for reporting purposes. Put them all in chunk 1 for
-        # simplicity.
-        if self.this_chunk == 1:
-            disabled_dirs = [v for k, v in tests_by_dir.iteritems()
-                             if k not in ordered_dirs]
-            for disabled_test in itertools.chain(*disabled_dirs):
-                yield disabled_test
-
-
-class chunk_by_runtime(InstanceFilter):
-    """
-    Chunking algorithm that attempts to group tests into chunks based on their
-    average runtimes. It keeps manifests of tests together and pairs slow
-    running manifests with fast ones.
-
-    :param this_chunk: the current chunk, 1 <= this_chunk <= total_chunks
-    :param total_chunks: the total number of chunks
-    :param runtimes: dictionary of test runtime data, of the form
-                     {<test path>: <average runtime>}
-    :param default_runtime: value in seconds to assign tests that don't exist
-                            in the runtimes file
-    """
-
-    def __init__(self, this_chunk, total_chunks, runtimes, default_runtime=0):
-        InstanceFilter.__init__(self, this_chunk, total_chunks, runtimes,
-                                default_runtime=default_runtime)
-        self.this_chunk = this_chunk
-        self.total_chunks = total_chunks
-
-        # defaultdict(lambda:<int>) assigns all non-existent keys the value of
-        # <int>. This means all tests we encounter that don't exist in the
-        # runtimes file will be assigned `default_runtime`.
-        self.runtimes = defaultdict(lambda: default_runtime)
-        self.runtimes.update(runtimes)
-
-    def __call__(self, tests, values):
-        tests = list(tests)
-        manifests = set(t['manifest'] for t in tests)
-
-        def total_runtime(tests):
-            return sum(self.runtimes[t['relpath']] for t in tests
-                       if 'disabled' not in t)
-
-        tests_by_manifest = []
-        for manifest in manifests:
-            mtests = [t for t in tests if t['manifest'] == manifest]
-            tests_by_manifest.append((total_runtime(mtests), mtests))
-        tests_by_manifest.sort(reverse=True)
-
-        tests_by_chunk = [[0, []] for i in range(self.total_chunks)]
-        for runtime, batch in tests_by_manifest:
-            # sort first by runtime, then by number of tests in case of a tie.
-            # This guarantees the chunk with the fastest runtime will always
-            # get the next batch of tests.
-            tests_by_chunk.sort(key=lambda x: (x[0], len(x[1])))
-            tests_by_chunk[0][0] += runtime
-            tests_by_chunk[0][1].extend(batch)
-
-        return (t for t in tests_by_chunk[self.this_chunk - 1][1])
-
-
-class tags(InstanceFilter):
-    """
-    Removes tests that don't contain any of the given tags. This overrides
-    InstanceFilter's __eq__ method, so multiple instances can be added.
-    Multiple tag filters is equivalent to joining tags with the AND operator.
-
-    To define a tag in a manifest, add a `tags` attribute to a test or DEFAULT
-    section. Tests can have multiple tags, in which case they should be
-    whitespace delimited. For example:
-
-    [test_foobar.html]
-    tags = foo bar
-
-    :param tags: A tag or list of tags to filter tests on
-    """
-    unique = False
-
-    def __init__(self, tags):
-        InstanceFilter.__init__(self, tags)
-        if isinstance(tags, basestring):
-            tags = [tags]
-        self.tags = tags
-
-    def __call__(self, tests, values):
-        for test in tests:
-            if 'tags' not in test:
-                continue
-
-            test_tags = [t.strip() for t in test['tags'].split()]
-            if any(t in self.tags for t in test_tags):
-                yield test
-
-
-class pathprefix(InstanceFilter):
-    """
-    Removes tests that don't start with any of the given test paths.
-
-    :param paths: A list of test paths to filter on
-    """
-
-    def __init__(self, paths):
-        InstanceFilter.__init__(self, paths)
-        if isinstance(paths, basestring):
-            paths = [paths]
-        self.paths = paths
-
-    def __call__(self, tests, values):
-        for test in tests:
-            for tp in self.paths:
-                tp = os.path.normpath(tp)
-
-                path = test['relpath']
-                if os.path.isabs(tp):
-                    path = test['path']
-
-                if not os.path.normpath(path).startswith(tp):
-                    continue
-
-                # any test path that points to a single file will be run no
-                # matter what, even if it's disabled
-                if 'disabled' in test and os.path.normpath(test['relpath']) == tp:
-                    del test['disabled']
-                yield test
-                break
-
-
-# filter container
-
-DEFAULT_FILTERS = (
-    skip_if,
-    run_if,
-    fail_if,
-)
-"""
-By default :func:`~.active_tests` will run the :func:`~.skip_if`,
-:func:`~.run_if` and :func:`~.fail_if` filters.
-"""
-
-
-class filterlist(MutableSequence):
-    """
-    A MutableSequence that raises TypeError when adding a non-callable and
-    ValueError if the item is already added.
-    """
-
-    def __init__(self, items=None):
-        self.items = []
-        if items:
-            self.items = list(items)
-
-    def _validate(self, item):
-        if not callable(item):
-            raise TypeError("Filters must be callable!")
-        if item in self:
-            raise ValueError("Filter {} is already applied!".format(item))
-
-    def __getitem__(self, key):
-        return self.items[key]
-
-    def __setitem__(self, key, value):
-        self._validate(value)
-        self.items[key] = value
-
-    def __delitem__(self, key):
-        del self.items[key]
-
-    def __len__(self):
-        return len(self.items)
-
-    def insert(self, index, value):
-        self._validate(value)
-        self.items.insert(index, value)

testing/mozharness/manifestparser/ini.py

@@ -1,171 +0,0 @@
-# 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/.
-
-import os
-import sys
-
-__all__ = ['read_ini', 'combine_fields']
-
-
-class IniParseError(Exception):
-    def __init__(self, fp, linenum, msg):
-        if isinstance(fp, basestring):
-            path = fp
-        elif hasattr(fp, 'name'):
-            path = fp.name
-        else:
-            path = getattr(fp, 'path', 'unknown')
-        msg = "Error parsing manifest file '{}', line {}: {}".format(path, linenum, msg)
-        super(IniParseError, self).__init__(msg)
-
-
-def read_ini(fp, variables=None, default='DEFAULT', defaults_only=False,
-             comments=None, separators=None, strict=True, handle_defaults=True):
-    """
-    read an .ini file and return a list of [(section, values)]
-    - fp : file pointer or path to read
-    - variables : default set of variables
-    - default : name of the section for the default section
-    - defaults_only : if True, return the default section only
-    - comments : characters that if they start a line denote a comment
-    - separators : strings that denote key, value separation in order
-    - strict : whether to be strict about parsing
-    - handle_defaults : whether to incorporate defaults into each section
-    """
-
-    # variables
-    variables = variables or {}
-    comments = comments or ('#',)
-    separators = separators or ('=', ':')
-    sections = []
-    key = value = None
-    section_names = set()
-    if isinstance(fp, basestring):
-        fp = file(fp)
-
-    # read the lines
-    for (linenum, line) in enumerate(fp.read().splitlines(), start=1):
-
-        stripped = line.strip()
-
-        # ignore blank lines
-        if not stripped:
-            # reset key and value to avoid continuation lines
-            key = value = None
-            continue
-
-        # ignore comment lines
-        if any(stripped.startswith(c) for c in comments):
-            continue
-
-        # strip inline comments (borrowed from configparser)
-        comment_start = sys.maxsize
-        inline_prefixes = {p: -1 for p in comments}
-        while comment_start == sys.maxsize and inline_prefixes:
-            next_prefixes = {}
-            for prefix, index in inline_prefixes.items():
-                index = line.find(prefix, index+1)
-                if index == -1:
-                    continue
-                next_prefixes[prefix] = index
-                if index == 0 or (index > 0 and line[index-1].isspace()):
-                    comment_start = min(comment_start, index)
-            inline_prefixes = next_prefixes
-
-        if comment_start != sys.maxsize:
-            stripped = stripped[:comment_start].rstrip()
-
-        # check for a new section
-        if len(stripped) > 2 and stripped[0] == '[' and stripped[-1] == ']':
-            section = stripped[1:-1].strip()
-            key = value = key_indent = None
-
-            # deal with DEFAULT section
-            if section.lower() == default.lower():
-                if strict:
-                    assert default not in section_names
-                section_names.add(default)
-                current_section = variables
-                continue
-
-            if strict:
-                # make sure this section doesn't already exist
-                assert section not in section_names, "Section '%s' already found in '%s'" % (
-                    section, section_names)
-
-            section_names.add(section)
-            current_section = {}
-            sections.append((section, current_section))
-            continue
-
-        # if there aren't any sections yet, something bad happen
-        if not section_names:
-            raise IniParseError(fp, linenum, "Expected a comment or section, "
-                                             "instead found '{}'".format(stripped))
-
-        # continuation line ?
-        line_indent = len(line) - len(line.lstrip(' '))
-        if key and line_indent > key_indent:
-            value = '%s%s%s' % (value, os.linesep, stripped)
-            current_section[key] = value
-            continue
-
-        # (key, value) pair
-        for separator in separators:
-            if separator in stripped:
-                key, value = stripped.split(separator, 1)
-                key = key.strip()
-                value = value.strip()
-                key_indent = line_indent
-
-                if strict:
-                    # make sure this key isn't already in the section or empty
-                    assert key
-                    if current_section is not variables:
-                        assert key not in current_section
-
-                current_section[key] = value
-                break
-        else:
-            # something bad happened!
-            raise IniParseError(fp, linenum, "Unexpected line '{}'".format(stripped))
-
-    # server-root is a special os path declared relative to the manifest file.
-    # inheritance demands we expand it as absolute
-    if 'server-root' in variables:
-        root = os.path.join(os.path.dirname(fp.name),
-                            variables['server-root'])
-        variables['server-root'] = os.path.abspath(root)
-
-    # return the default section only if requested
-    if defaults_only:
-        return [(default, variables)]
-
-    global_vars = variables if handle_defaults else {}
-    sections = [(i, combine_fields(global_vars, j)) for i, j in sections]
-    return sections
-
-
-def combine_fields(global_vars, local_vars):
-    """
-    Combine the given manifest entries according to the semantics of specific fields.
-    This is used to combine manifest level defaults with a per-test definition.
-    """
-    if not global_vars:
-        return local_vars
-    if not local_vars:
-        return global_vars
-    field_patterns = {
-        'skip-if': '(%s) || (%s)',
-        'support-files': '%s %s',
-    }
-    final_mapping = global_vars.copy()
-    for field_name, value in local_vars.items():
-        if field_name not in field_patterns or field_name not in global_vars:
-            final_mapping[field_name] = value
-            continue
-        global_value = global_vars[field_name]
-        pattern = field_patterns[field_name]
-        final_mapping[field_name] = pattern % (global_value, value)
-    return final_mapping

testing/mozharness/manifestparser/manifestparser.py

@@ -1,807 +0,0 @@
-# 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/.
-
-from StringIO import StringIO
-import json
-import fnmatch
-import os
-import shutil
-import sys
-import types
-
-from .ini import read_ini
-from .filters import (
-    DEFAULT_FILTERS,
-    enabled,
-    exists as _exists,
-    filterlist,
-)
-
-__all__ = ['ManifestParser', 'TestManifest', 'convert']
-
-relpath = os.path.relpath
-string = (basestring,)
-
-
-# path normalization
-
-def normalize_path(path):
-    """normalize a relative path"""
-    if sys.platform.startswith('win'):
-        return path.replace('/', os.path.sep)
-    return path
-
-
-def denormalize_path(path):
-    """denormalize a relative path"""
-    if sys.platform.startswith('win'):
-        return path.replace(os.path.sep, '/')
-    return path
-
-
-# objects for parsing manifests
-
-class ManifestParser(object):
-    """read .ini manifests"""
-
-    def __init__(self, manifests=(), defaults=None, strict=True, rootdir=None,
-                 finder=None, handle_defaults=True):
-        """Creates a ManifestParser from the given manifest files.
-
-        :param manifests: An iterable of file paths or file objects corresponding
-                          to manifests. If a file path refers to a manifest file that
-                          does not exist, an IOError is raised.
-        :param defaults: Variables to pre-define in the environment for evaluating
-                         expressions in manifests.
-        :param strict: If False, the provided manifests may contain references to
-                       listed (test) files that do not exist without raising an
-                       IOError during reading, and certain errors in manifests
-                       are not considered fatal. Those errors include duplicate
-                       section names, redefining variables, and defining empty
-                       variables.
-        :param rootdir: The directory used as the basis for conversion to and from
-                        relative paths during manifest reading.
-        :param finder: If provided, this finder object will be used for filesystem
-                       interactions. Finder objects are part of the mozpack package,
-                       documented at
-                       http://firefox-source-docs.mozilla.org/python/mozpack.html#module-mozpack.files
-        :param handle_defaults: If not set, do not propagate manifest defaults to individual
-                                test objects. Callers are expected to manage per-manifest
-                                defaults themselves via the manifest_defaults member
-                                variable in this case.
-        """
-        self._defaults = defaults or {}
-        self._ancestor_defaults = {}
-        self.tests = []
-        self.manifest_defaults = {}
-        self.source_files = set()
-        self.strict = strict
-        self.rootdir = rootdir
-        self.relativeRoot = None
-        self.finder = finder
-        self._handle_defaults = handle_defaults
-        if manifests:
-            self.read(*manifests)
-
-    def path_exists(self, path):
-        if self.finder:
-            return self.finder.get(path) is not None
-        return os.path.exists(path)
-
-    # methods for reading manifests
-
-    def _read(self, root, filename, defaults, defaults_only=False, parentmanifest=None):
-        """
-        Internal recursive method for reading and parsing manifests.
-        Stores all found tests in self.tests
-        :param root: The base path
-        :param filename: File object or string path for the base manifest file
-        :param defaults: Options that apply to all items
-        :param defaults_only: If True will only gather options, not include
-                              tests. Used for upstream parent includes
-                              (default False)
-        :param parentmanifest: Filename of the parent manifest (default None)
-        """
-        def read_file(type):
-            include_file = section.split(type, 1)[-1]
-            include_file = normalize_path(include_file)
-            if not os.path.isabs(include_file):
-                include_file = os.path.join(here, include_file)
-            if not self.path_exists(include_file):
-                message = "Included file '%s' does not exist" % include_file
-                if self.strict:
-                    raise IOError(message)
-                else:
-                    sys.stderr.write("%s\n" % message)
-                    return
-            return include_file
-
-        # get directory of this file if not file-like object
-        if isinstance(filename, string):
-            # If we're using mercurial as our filesystem via a finder
-            # during manifest reading, the getcwd() calls that happen
-            # with abspath calls will not be meaningful, so absolute
-            # paths are required.
-            if self.finder:
-                assert os.path.isabs(filename)
-            filename = os.path.abspath(filename)
-            self.source_files.add(filename)
-            if self.finder:
-                fp = self.finder.get(filename)
-            else:
-                fp = open(filename)
-            here = os.path.dirname(filename)
-        else:
-            fp = filename
-            filename = here = None
-        defaults['here'] = here
-
-        # Rootdir is needed for relative path calculation. Precompute it for
-        # the microoptimization used below.
-        if self.rootdir is None:
-            rootdir = ""
-        else:
-            assert os.path.isabs(self.rootdir)
-            rootdir = self.rootdir + os.path.sep
-
-        # read the configuration
-        sections = read_ini(fp=fp, variables=defaults, strict=self.strict,
-                            handle_defaults=self._handle_defaults)
-        self.manifest_defaults[filename] = defaults
-
-        parent_section_found = False
-
-        # get the tests
-        for section, data in sections:
-            # In case of defaults only, no other section than parent: has to
-            # be processed.
-            if defaults_only and not section.startswith('parent:'):
-                continue
-
-            # read the parent manifest if specified
-            if section.startswith('parent:'):
-                parent_section_found = True
-
-                include_file = read_file('parent:')
-                if include_file:
-                    self._read(root, include_file, {}, True)
-                continue
-
-            # a file to include
-            # TODO: keep track of included file structure:
-            # self.manifests = {'manifest.ini': 'relative/path.ini'}
-            if section.startswith('include:'):
-                include_file = read_file('include:')
-                if include_file:
-                    include_defaults = data.copy()
-                    self._read(root, include_file, include_defaults, parentmanifest=filename)
-                continue
-
-            # otherwise an item
-            # apply ancestor defaults, while maintaining current file priority
-            data = dict(self._ancestor_defaults.items() + data.items())
-
-            test = data
-            test['name'] = section
-
-            # Will be None if the manifest being read is a file-like object.
-            test['manifest'] = filename
-
-            # determine the path
-            path = test.get('path', section)
-            _relpath = path
-            if '://' not in path:  # don't futz with URLs
-                path = normalize_path(path)
-                if here and not os.path.isabs(path):
-                    # Profiling indicates 25% of manifest parsing is spent
-                    # in this call to normpath, but almost all calls return
-                    # their argument unmodified, so we avoid the call if
-                    # '..' if not present in the path.
-                    path = os.path.join(here, path)
-                    if '..' in path:
-                        path = os.path.normpath(path)
-
-                # Microoptimization, because relpath is quite expensive.
-                # We know that rootdir is an absolute path or empty. If path
-                # starts with rootdir, then path is also absolute and the tail
-                # of the path is the relative path (possibly non-normalized,
-                # when here is unknown).
-                # For this to work rootdir needs to be terminated with a path
-                # separator, so that references to sibling directories with
-                # a common prefix don't get misscomputed (e.g. /root and
-                # /rootbeer/file).
-                # When the rootdir is unknown, the relpath needs to be left
-                # unchanged. We use an empty string as rootdir in that case,
-                # which leaves relpath unchanged after slicing.
-                if path.startswith(rootdir):
-                    _relpath = path[len(rootdir):]
-                else:
-                    _relpath = relpath(path, rootdir)
-
-            test['path'] = path
-            test['relpath'] = _relpath
-
-            if parentmanifest is not None:
-                # If a test was included by a parent manifest we may need to
-                # indicate that in the test object for the sake of identifying
-                # a test, particularly in the case a test file is included by
-                # multiple manifests.
-                test['ancestor-manifest'] = parentmanifest
-
-            # append the item
-            self.tests.append(test)
-
-        # if no parent: section was found for defaults-only, only read the
-        # defaults section of the manifest without interpreting variables
-        if defaults_only and not parent_section_found:
-            sections = read_ini(fp=fp, variables=defaults, defaults_only=True,
-                                strict=self.strict)
-            (section, self._ancestor_defaults) = sections[0]
-
-    def read(self, *filenames, **defaults):
-        """
-        read and add manifests from file paths or file-like objects
-
-        filenames -- file paths or file-like objects to read as manifests
-        defaults -- default variables
-        """
-
-        # ensure all files exist
-        missing = [filename for filename in filenames
-                   if isinstance(filename, string) and not self.path_exists(filename)]
-        if missing:
-            raise IOError('Missing files: %s' % ', '.join(missing))
-
-        # default variables
-        _defaults = defaults.copy() or self._defaults.copy()
-        _defaults.setdefault('here', None)
-
-        # process each file
-        for filename in filenames:
-            # set the per file defaults
-            defaults = _defaults.copy()
-            here = None
-            if isinstance(filename, string):
-                here = os.path.dirname(os.path.abspath(filename))
-                defaults['here'] = here  # directory of master .ini file
-
-            if self.rootdir is None:
-                # set the root directory
-                # == the directory of the first manifest given
-                self.rootdir = here
-
-            self._read(here, filename, defaults)
-
-    # methods for querying manifests
-
-    def query(self, *checks, **kw):
-        """
-        general query function for tests
-        - checks : callable conditions to test if the test fulfills the query
-        """
-        tests = kw.get('tests', None)
-        if tests is None:
-            tests = self.tests
-        retval = []
-        for test in tests:
-            for check in checks:
-                if not check(test):
-                    break
-            else:
-                retval.append(test)
-        return retval
-
-    def get(self, _key=None, inverse=False, tags=None, tests=None, **kwargs):
-        # TODO: pass a dict instead of kwargs since you might hav
-        # e.g. 'inverse' as a key in the dict
-
-        # TODO: tags should just be part of kwargs with None values
-        # (None == any is kinda weird, but probably still better)
-
-        # fix up tags
-        if tags:
-            tags = set(tags)
-        else:
-            tags = set()
-
-        # make some check functions
-        if inverse:
-            def has_tags(test):
-                return not tags.intersection(test.keys())
-
-            def dict_query(test):
-                for key, value in kwargs.items():
-                    if test.get(key) == value:
-                        return False
-                return True
-        else:
-            def has_tags(test):
-                return tags.issubset(test.keys())
-
-            def dict_query(test):
-                for key, value in kwargs.items():
-                    if test.get(key) != value:
-                        return False
-                return True
-
-        # query the tests
-        tests = self.query(has_tags, dict_query, tests=tests)
-
-        # if a key is given, return only a list of that key
-        # useful for keys like 'name' or 'path'
-        if _key:
-            return [test[_key] for test in tests]
-
-        # return the tests
-        return tests
-
-    def manifests(self, tests=None):
-        """
-        return manifests in order in which they appear in the tests
-        """
-        if tests is None:
-            # Make sure to return all the manifests, even ones without tests.
-            return self.manifest_defaults.keys()
-
-        manifests = []
-        for test in tests:
-            manifest = test.get('manifest')
-            if not manifest:
-                continue
-            if manifest not in manifests:
-                manifests.append(manifest)
-        return manifests
-
-    def paths(self):
-        return [i['path'] for i in self.tests]
-
-    # methods for auditing
-
-    def missing(self, tests=None):
-        """
-        return list of tests that do not exist on the filesystem
-        """
-        if tests is None:
-            tests = self.tests
-        existing = list(_exists(tests, {}))
-        return [t for t in tests if t not in existing]
-
-    def check_missing(self, tests=None):
-        missing = self.missing(tests=tests)
-        if missing:
-            missing_paths = [test['path'] for test in missing]
-            if self.strict:
-                raise IOError("Strict mode enabled, test paths must exist. "
-                              "The following test(s) are missing: %s" %
-                              json.dumps(missing_paths, indent=2))
-            print >> sys.stderr, "Warning: The following test(s) are missing: %s" % \
-                json.dumps(missing_paths, indent=2)
-        return missing
-
-    def verifyDirectory(self, directories, pattern=None, extensions=None):
-        """
-        checks what is on the filesystem vs what is in a manifest
-        returns a 2-tuple of sets:
-        (missing_from_filesystem, missing_from_manifest)
-        """
-
-        files = set([])
-        if isinstance(directories, basestring):
-            directories = [directories]
-
-        # get files in directories
-        for directory in directories:
-            for dirpath, dirnames, filenames in os.walk(directory, topdown=True):
-
-                # only add files that match a pattern
-                if pattern:
-                    filenames = fnmatch.filter(filenames, pattern)
-
-                # only add files that have one of the extensions
-                if extensions:
-                    filenames = [filename for filename in filenames
-                                 if os.path.splitext(filename)[-1] in extensions]
-
-                files.update([os.path.join(dirpath, filename) for filename in filenames])
-
-        paths = set(self.paths())
-        missing_from_filesystem = paths.difference(files)
-        missing_from_manifest = files.difference(paths)
-        return (missing_from_filesystem, missing_from_manifest)
-
-    # methods for output
-
-    def write(self, fp=sys.stdout, rootdir=None,
-              global_tags=None, global_kwargs=None,
-              local_tags=None, local_kwargs=None):
-        """
-        write a manifest given a query
-        global and local options will be munged to do the query
-        globals will be written to the top of the file
-        locals (if given) will be written per test
-        """
-
-        # open file if `fp` given as string
-        close = False
-        if isinstance(fp, string):
-            fp = file(fp, 'w')
-            close = True
-
-        # root directory
-        if rootdir is None:
-            rootdir = self.rootdir
-
-        # sanitize input
-        global_tags = global_tags or set()
-        local_tags = local_tags or set()
-        global_kwargs = global_kwargs or {}
-        local_kwargs = local_kwargs or {}
-
-        # create the query
-        tags = set([])
-        tags.update(global_tags)
-        tags.update(local_tags)
-        kwargs = {}
-        kwargs.update(global_kwargs)
-        kwargs.update(local_kwargs)
-
-        # get matching tests
-        tests = self.get(tags=tags, **kwargs)
-
-        # print the .ini manifest
-        if global_tags or global_kwargs:
-            print >> fp, '[DEFAULT]'
-            for tag in global_tags:
-                print >> fp, '%s =' % tag
-            for key, value in global_kwargs.items():
-                print >> fp, '%s = %s' % (key, value)
-            print >> fp
-
-        for test in tests:
-            test = test.copy()  # don't overwrite
-
-            path = test['name']
-            if not os.path.isabs(path):
-                path = test['path']
-                if self.rootdir:
-                    path = relpath(test['path'], self.rootdir)
-                path = denormalize_path(path)
-            print >> fp, '[%s]' % path
-
-            # reserved keywords:
-            reserved = ['path', 'name', 'here', 'manifest', 'relpath', 'ancestor-manifest']
-            for key in sorted(test.keys()):
-                if key in reserved:
-                    continue
-                if key in global_kwargs:
-                    continue
-                if key in global_tags and not test[key]:
-                    continue
-                print >> fp, '%s = %s' % (key, test[key])
-            print >> fp
-
-        if close:
-            # close the created file
-            fp.close()
-
-    def __str__(self):
-        fp = StringIO()
-        self.write(fp=fp)
-        value = fp.getvalue()
-        return value
-
-    def copy(self, directory, rootdir=None, *tags, **kwargs):
-        """
-        copy the manifests and associated tests
-        - directory : directory to copy to
-        - rootdir : root directory to copy to (if not given from manifests)
-        - tags : keywords the tests must have
-        - kwargs : key, values the tests must match
-        """
-        # XXX note that copy does *not* filter the tests out of the
-        # resulting manifest; it just stupidly copies them over.
-        # ideally, it would reread the manifests and filter out the
-        # tests that don't match *tags and **kwargs
-
-        # destination
-        if not os.path.exists(directory):
-            os.path.makedirs(directory)
-        else:
-            # sanity check
-            assert os.path.isdir(directory)
-
-        # tests to copy
-        tests = self.get(tags=tags, **kwargs)
-        if not tests:
-            return  # nothing to do!
-
-        # root directory
-        if rootdir is None:
-            rootdir = self.rootdir
-
-        # copy the manifests + tests
-        manifests = [relpath(manifest, rootdir) for manifest in self.manifests()]
-        for manifest in manifests:
-            destination = os.path.join(directory, manifest)
-            dirname = os.path.dirname(destination)
-            if not os.path.exists(dirname):
-                os.makedirs(dirname)
-            else:
-                # sanity check
-                assert os.path.isdir(dirname)
-            shutil.copy(os.path.join(rootdir, manifest), destination)
-
-        missing = self.check_missing(tests)
-        tests = [test for test in tests if test not in missing]
-        for test in tests:
-            if os.path.isabs(test['name']):
-                continue
-            source = test['path']
-            destination = os.path.join(directory, relpath(test['path'], rootdir))
-            shutil.copy(source, destination)
-            # TODO: ensure that all of the tests are below the from_dir
-
-    def update(self, from_dir, rootdir=None, *tags, **kwargs):
-        """
-        update the tests as listed in a manifest from a directory
-        - from_dir : directory where the tests live
-        - rootdir : root directory to copy to (if not given from manifests)
-        - tags : keys the tests must have
-        - kwargs : key, values the tests must match
-        """
-
-        # get the tests
-        tests = self.get(tags=tags, **kwargs)
-
-        # get the root directory
-        if not rootdir:
-            rootdir = self.rootdir
-
-        # copy them!
-        for test in tests:
-            if not os.path.isabs(test['name']):
-                _relpath = relpath(test['path'], rootdir)
-                source = os.path.join(from_dir, _relpath)
-                if not os.path.exists(source):
-                    message = "Missing test: '%s' does not exist!"
-                    if self.strict:
-                        raise IOError(message)
-                    print >> sys.stderr, message + " Skipping."
-                    continue
-                destination = os.path.join(rootdir, _relpath)
-                shutil.copy(source, destination)
-
-    # directory importers
-
-    @classmethod
-    def _walk_directories(cls, directories, callback, pattern=None, ignore=()):
-        """
-        internal function to import directories
-        """
-
-        if isinstance(pattern, basestring):
-            patterns = [pattern]
-        else:
-            patterns = pattern
-        ignore = set(ignore)
-
-        if not patterns:
-            def accept_filename(filename):
-                return True
-        else:
-            def accept_filename(filename):
-                for pattern in patterns:
-                    if fnmatch.fnmatch(filename, pattern):
-                        return True
-
-        if not ignore:
-            def accept_dirname(dirname):
-                return True
-        else:
-            def accept_dirname(dirname):
-                return dirname not in ignore
-
-        rootdirectories = directories[:]
-        seen_directories = set()
-        for rootdirectory in rootdirectories:
-            # let's recurse directories using list
-            directories = [os.path.realpath(rootdirectory)]
-            while directories:
-                directory = directories.pop(0)
-                if directory in seen_directories:
-                    # eliminate possible infinite recursion due to
-                    # symbolic links
-                    continue
-                seen_directories.add(directory)
-
-                files = []
-                subdirs = []
-                for name in sorted(os.listdir(directory)):
-                    path = os.path.join(directory, name)
-                    if os.path.isfile(path):
-                        # os.path.isfile follow symbolic links, we don't
-                        # need to handle them here.
-                        if accept_filename(name):
-                            files.append(name)
-                        continue
-                    elif os.path.islink(path):
-                        # eliminate symbolic links
-                        path = os.path.realpath(path)
-
-                    # we must have a directory here
-                    if accept_dirname(name):
-                        subdirs.append(name)
-                        # this subdir is added for recursion
-                        directories.insert(0, path)
-
-                # here we got all subdirs and files filtered, we can
-                # call the callback function if directory is not empty
-                if subdirs or files:
-                    callback(rootdirectory, directory, subdirs, files)
-
-    @classmethod
-    def populate_directory_manifests(cls, directories, filename, pattern=None, ignore=(),
-                                     overwrite=False):
-        """
-        walks directories and writes manifests of name `filename` in-place;
-        returns `cls` instance populated with the given manifests
-
-        filename -- filename of manifests to write
-        pattern -- shell pattern (glob) or patterns of filenames to match
-        ignore -- directory names to ignore
-        overwrite -- whether to overwrite existing files of given name
-        """
-
-        manifest_dict = {}
-
-        if os.path.basename(filename) != filename:
-            raise IOError("filename should not include directory name")
-
-        # no need to hit directories more than once
-        _directories = directories
-        directories = []
-        for directory in _directories:
-            if directory not in directories:
-                directories.append(directory)
-
-        def callback(directory, dirpath, dirnames, filenames):
-            """write a manifest for each directory"""
-
-            manifest_path = os.path.join(dirpath, filename)
-            if (dirnames or filenames) and not (os.path.exists(manifest_path) and overwrite):
-                with file(manifest_path, 'w') as manifest:
-                    for dirname in dirnames:
-                        print >> manifest, '[include:%s]' % os.path.join(dirname, filename)
-                    for _filename in filenames:
-                        print >> manifest, '[%s]' % _filename
-
-                # add to list of manifests
-                manifest_dict.setdefault(directory, manifest_path)
-
-        # walk the directories to gather files
-        cls._walk_directories(directories, callback, pattern=pattern, ignore=ignore)
-        # get manifests
-        manifests = [manifest_dict[directory] for directory in _directories]
-
-        # create a `cls` instance with the manifests
-        return cls(manifests=manifests)
-
-    @classmethod
-    def from_directories(cls, directories, pattern=None, ignore=(), write=None, relative_to=None):
-        """
-        convert directories to a simple manifest; returns ManifestParser instance
-
-        pattern -- shell pattern (glob) or patterns of filenames to match
-        ignore -- directory names to ignore
-        write -- filename or file-like object of manifests to write;
-                 if `None` then a StringIO instance will be created
-        relative_to -- write paths relative to this path;
-                       if false then the paths are absolute
-        """
-
-        # determine output
-        opened_manifest_file = None  # name of opened manifest file
-        absolute = not relative_to  # whether to output absolute path names as names
-        if isinstance(write, string):
-            opened_manifest_file = write
-            write = file(write, 'w')
-        if write is None:
-            write = StringIO()
-
-        # walk the directories, generating manifests
-        def callback(directory, dirpath, dirnames, filenames):
-
-            # absolute paths
-            filenames = [os.path.join(dirpath, filename)
-                         for filename in filenames]
-            # ensure new manifest isn't added
-            filenames = [filename for filename in filenames
-                         if filename != opened_manifest_file]
-            # normalize paths
-            if not absolute and relative_to:
-                filenames = [relpath(filename, relative_to)
-                             for filename in filenames]
-
-            # write to manifest
-            print >> write, '\n'.join(['[%s]' % denormalize_path(filename)
-                                       for filename in filenames])
-
-        cls._walk_directories(directories, callback, pattern=pattern, ignore=ignore)
-
-        if opened_manifest_file:
-            # close file
-            write.close()
-            manifests = [opened_manifest_file]
-        else:
-            # manifests/write is a file-like object;
-            # rewind buffer
-            write.flush()
-            write.seek(0)
-            manifests = [write]
-
-        # make a ManifestParser instance
-        return cls(manifests=manifests)
-
-
-convert = ManifestParser.from_directories
-
-
-class TestManifest(ManifestParser):
-    """
-    apply logic to manifests;  this is your integration layer :)
-    specific harnesses may subclass from this if they need more logic
-    """
-
-    def __init__(self, *args, **kwargs):
-        ManifestParser.__init__(self, *args, **kwargs)
-        self.filters = filterlist(DEFAULT_FILTERS)
-        self.last_used_filters = []
-
-    def active_tests(self, exists=True, disabled=True, filters=None, **values):
-        """
-        Run all applied filters on the set of tests.
-
-        :param exists: filter out non-existing tests (default True)
-        :param disabled: whether to return disabled tests (default True)
-        :param values: keys and values to filter on (e.g. `os = linux mac`)
-        :param filters: list of filters to apply to the tests
-        :returns: list of test objects that were not filtered out
-        """
-        tests = [i.copy() for i in self.tests]  # shallow copy
-
-        # mark all tests as passing
-        for test in tests:
-            test['expected'] = test.get('expected', 'pass')
-
-        # make a copy so original doesn't get modified
-        fltrs = self.filters[:]
-        if exists:
-            if self.strict:
-                self.check_missing(tests)
-            else:
-                fltrs.append(_exists)
-
-        if not disabled:
-            fltrs.append(enabled)
-
-        if filters:
-            fltrs += filters
-
-        self.last_used_filters = fltrs[:]
-        for fn in fltrs:
-            tests = fn(tests, values)
-        return list(tests)
-
-    def test_paths(self):
-        return [test['path'] for test in self.active_tests()]
-
-    def fmt_filters(self, filters=None):
-        filters = filters or self.last_used_filters
-        names = []
-        for f in filters:
-            if isinstance(f, types.FunctionType):
-                names.append(f.__name__)
-            else:
-                names.append(str(f))
-        return ', '.join(names)

testing/mozharness/mozfile/__init__.py

@@ -1,5 +0,0 @@
-# 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/.
-
-from mozfile import *  # noqa

testing/mozharness/mozfile/mozfile.py

@@ -1,373 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# 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/.
-
-from contextlib import contextmanager
-import os
-import shutil
-import stat
-import tarfile
-import tempfile
-import urlparse
-import urllib2
-import zipfile
-import time
-
-__all__ = ['extract_tarball',
-           'extract_zip',
-           'extract',
-           'is_url',
-           'load',
-           'remove',
-           'rmtree',
-           'tree',
-           'NamedTemporaryFile',
-           'TemporaryDirectory']
-
-try:
-    WindowsError
-except NameError:
-    WindowsError = None  # so we can unconditionally catch it later...
-
-
-# utilities for extracting archives
-
-def extract_tarball(src, dest):
-    """extract a .tar file"""
-
-    with tarfile.open(src) as bundle:
-        namelist = []
-
-        for m in bundle:
-            bundle.extract(m, path=dest)
-            namelist.append(m.name)
-
-    return namelist
-
-
-def extract_zip(src, dest):
-    """extract a zip file"""
-
-    if isinstance(src, zipfile.ZipFile):
-        bundle = src
-    else:
-        try:
-            bundle = zipfile.ZipFile(src)
-        except Exception:
-            print "src: %s" % src
-            raise
-
-    namelist = bundle.namelist()
-
-    for name in namelist:
-        filename = os.path.realpath(os.path.join(dest, name))
-        if name.endswith('/'):
-            if not os.path.isdir(filename):
-                os.makedirs(filename)
-        else:
-            path = os.path.dirname(filename)
-            if not os.path.isdir(path):
-                os.makedirs(path)
-            _dest = open(filename, 'wb')
-            _dest.write(bundle.read(name))
-            _dest.close()
-        mode = bundle.getinfo(name).external_attr >> 16 & 0x1FF
-        os.chmod(filename, mode)
-    bundle.close()
-    return namelist
-
-
-def extract(src, dest=None):
-    """
-    Takes in a tar or zip file and extracts it to dest
-
-    If dest is not specified, extracts to os.path.dirname(src)
-
-    Returns the list of top level files that were extracted
-    """
-
-    assert os.path.exists(src), "'%s' does not exist" % src
-
-    if dest is None:
-        dest = os.path.dirname(src)
-    elif not os.path.isdir(dest):
-        os.makedirs(dest)
-    assert not os.path.isfile(dest), "dest cannot be a file"
-
-    if zipfile.is_zipfile(src):
-        namelist = extract_zip(src, dest)
-    elif tarfile.is_tarfile(src):
-        namelist = extract_tarball(src, dest)
-    else:
-        raise Exception("mozfile.extract: no archive format found for '%s'" %
-                        src)
-
-    # namelist returns paths with forward slashes even in windows
-    top_level_files = [os.path.join(dest, name.rstrip('/')) for name in namelist
-                       if len(name.rstrip('/').split('/')) == 1]
-
-    # namelist doesn't include folders, append these to the list
-    for name in namelist:
-        index = name.find('/')
-        if index != -1:
-            root = os.path.join(dest, name[:index])
-            if root not in top_level_files:
-                top_level_files.append(root)
-
-    return top_level_files
-
-
-# utilities for removal of files and directories
-
-def rmtree(dir):
-    """Deprecated wrapper method to remove a directory tree.
-
-    Ensure to update your code to use mozfile.remove() directly
-
-    :param dir: directory to be removed
-    """
-
-    return remove(dir)
-
-
-def remove(path):
-    """Removes the specified file, link, or directory tree
-
-    This is a replacement for shutil.rmtree that works better under
-    windows.
-
-    :param path: path to be removed
-    """
-
-    def _call_with_windows_retry(func, path, retry_max=5, retry_delay=0.5):
-        """
-        It's possible to see spurious errors on Windows due to various things
-        keeping a handle to the directory open (explorer, virus scanners, etc)
-        So we try a few times if it fails with a known error.
-        """
-        retry_count = 0
-        while True:
-            try:
-                func(path)
-                break
-            except WindowsError as e:
-                # Error   5 == Access is denied
-                # Error  32 == The process cannot access the file because it is
-                #              being used by another process
-                # Error 145 == The directory is not empty
-
-                if retry_count == retry_max or e.winerror not in [5, 32, 145]:
-                    raise
-                retry_count += 1
-
-                print 'Retrying to remove "%s" because it is in use.' % path
-                time.sleep(retry_delay)
-
-    if not os.path.exists(path):
-        return
-
-    path_stats = os.stat(path)
-
-    if os.path.isfile(path) or os.path.islink(path):
-        # Verify the file or link is read/write for the current user
-        os.chmod(path, path_stats.st_mode | stat.S_IRUSR | stat.S_IWUSR)
-        _call_with_windows_retry(os.remove, path)
-
-    elif os.path.isdir(path):
-        # Verify the directory is read/write/execute for the current user
-        os.chmod(path, path_stats.st_mode | stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
-        _call_with_windows_retry(shutil.rmtree, path)
-
-
-def depth(directory):
-    """returns the integer depth of a directory or path relative to '/' """
-
-    directory = os.path.abspath(directory)
-    level = 0
-    while True:
-        directory, remainder = os.path.split(directory)
-        level += 1
-        if not remainder:
-            break
-    return level
-
-
-# ASCII delimeters
-ascii_delimeters = {
-    'vertical_line': '|',
-    'item_marker': '+',
-    'last_child': '\\'
-    }
-
-# unicode delimiters
-unicode_delimeters = {
-    'vertical_line': '│',
-    'item_marker': '├',
-    'last_child': '└'
-    }
-
-
-def tree(directory,
-         item_marker=unicode_delimeters['item_marker'],
-         vertical_line=unicode_delimeters['vertical_line'],
-         last_child=unicode_delimeters['last_child'],
-         sort_key=lambda x: x.lower()):
-    """
-    display tree directory structure for `directory`
-    """
-
-    retval = []
-    indent = []
-    last = {}
-    top = depth(directory)
-
-    for dirpath, dirnames, filenames in os.walk(directory, topdown=True):
-
-        abspath = os.path.abspath(dirpath)
-        basename = os.path.basename(abspath)
-        parent = os.path.dirname(abspath)
-        level = depth(abspath) - top
-
-        # sort articles of interest
-        for resource in (dirnames, filenames):
-            resource[:] = sorted(resource, key=sort_key)
-
-        files_end = item_marker
-
-        if level > len(indent):
-            indent.append(vertical_line)
-        indent = indent[:level]
-
-        if dirnames:
-            files_end = item_marker
-            last[abspath] = dirnames[-1]
-        else:
-            files_end = last_child
-
-        if last.get(parent) == os.path.basename(abspath):
-            # last directory of parent
-            dirpath_mark = last_child
-            indent[-1] = ' '
-        elif not indent:
-            dirpath_mark = ''
-        else:
-            dirpath_mark = item_marker
-
-        # append the directory and piece of tree structure
-        # if the top-level entry directory, print as passed
-        retval.append('%s%s%s' % (''.join(indent[:-1]),
-                      dirpath_mark, basename if retval else directory))
-        # add the files
-        if filenames:
-            last_file = filenames[-1]
-            retval.extend([('%s%s%s' % (''.join(indent),
-                          files_end if filename == last_file else item_marker, filename))
-                          for index, filename in enumerate(filenames)])
-
-    return '\n'.join(retval)
-
-
-# utilities for temporary resources
-
-class NamedTemporaryFile(object):
-    """
-    Like tempfile.NamedTemporaryFile except it works on Windows
-    in the case where you open the created file a second time.
-
-    This behaves very similarly to tempfile.NamedTemporaryFile but may
-    not behave exactly the same. For example, this function does not
-    prevent fd inheritance by children.
-
-    Example usage:
-
-    with NamedTemporaryFile() as fh:
-        fh.write(b'foobar')
-
-        print('Filename: %s' % fh.name)
-
-    see https://bugzilla.mozilla.org/show_bug.cgi?id=821362
-    """
-    def __init__(self, mode='w+b', bufsize=-1, suffix='', prefix='tmp',
-                 dir=None, delete=True):
-
-        fd, path = tempfile.mkstemp(suffix, prefix, dir, 't' in mode)
-        os.close(fd)
-
-        self.file = open(path, mode)
-        self._path = path
-        self._delete = delete
-        self._unlinked = False
-
-    def __getattr__(self, k):
-        return getattr(self.__dict__['file'], k)
-
-    def __iter__(self):
-        return self.__dict__['file']
-
-    def __enter__(self):
-        self.file.__enter__()
-        return self
-
-    def __exit__(self, exc, value, tb):
-        self.file.__exit__(exc, value, tb)
-        if self.__dict__['_delete']:
-            os.unlink(self.__dict__['_path'])
-            self._unlinked = True
-
-    def __del__(self):
-        if self.__dict__['_unlinked']:
-            return
-        self.file.__exit__(None, None, None)
-        if self.__dict__['_delete']:
-            os.unlink(self.__dict__['_path'])
-
-
-@contextmanager
-def TemporaryDirectory():
-    """
-    create a temporary directory using tempfile.mkdtemp, and then clean it up.
-
-    Example usage:
-    with TemporaryDirectory() as tmp:
-       open(os.path.join(tmp, "a_temp_file"), "w").write("data")
-
-    """
-    tempdir = tempfile.mkdtemp()
-    try:
-        yield tempdir
-    finally:
-        shutil.rmtree(tempdir)
-
-
-# utilities dealing with URLs
-
-def is_url(thing):
-    """
-    Return True if thing looks like a URL.
-    """
-
-    parsed = urlparse.urlparse(thing)
-    if 'scheme' in parsed:
-        return len(parsed.scheme) >= 2
-    else:
-        return len(parsed[0]) >= 2
-
-
-def load(resource):
-    """
-    open a file or URL for reading.  If the passed resource string is not a URL,
-    or begins with 'file://', return a ``file``.  Otherwise, return the
-    result of urllib2.urlopen()
-    """
-
-    # handle file URLs separately due to python stdlib limitations
-    if resource.startswith('file://'):
-        resource = resource[len('file://'):]
-
-    if not is_url(resource):
-        # if no scheme is given, it is a file path
-        return file(resource)
-
-    return urllib2.urlopen(resource)

testing/mozharness/mozinfo/__init__.py

@@ -1,57 +0,0 @@
-# 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/.
-
-"""
-interface to transform introspected system information to a format palatable to
-Mozilla
-
-Module variables:
-
-.. attribute:: bits
-
-   32 or 64
-
-.. attribute:: isBsd
-
-   Returns ``True`` if the operating system is BSD
-
-.. attribute:: isLinux
-
-   Returns ``True`` if the operating system is Linux
-
-.. attribute:: isMac
-
-   Returns ``True`` if the operating system is Mac
-
-.. attribute:: isWin
-
-   Returns ``True`` if the operating system is Windows
-
-.. attribute:: os
-
-   Operating system [``'win'``, ``'mac'``, ``'linux'``, ...]
-
-.. attribute:: processor
-
-   Processor architecture [``'x86'``, ``'x86_64'``, ``'ppc'``, ...]
-
-.. attribute:: version
-
-   Operating system version string. For windows, the service pack information is also included
-
-.. attribute:: info
-
-   Returns information identifying the current system.
-
-   * :attr:`bits`
-   * :attr:`os`
-   * :attr:`processor`
-   * :attr:`version`
-
-"""
-
-import mozinfo
-from mozinfo import *  # noqa
-
-__all__ = mozinfo.__all__

testing/mozharness/mozinfo/mozinfo.py

@@ -1,312 +0,0 @@
-#!/usr/bin/env python
-
-# 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/.
-
-# TODO: it might be a good idea of adding a system name (e.g. 'Ubuntu' for
-# linux) to the information; I certainly wouldn't want anyone parsing this
-# information and having behaviour depend on it
-
-from __future__ import absolute_import, print_function
-
-import os
-import platform
-import re
-import sys
-from .string_version import StringVersion
-from ctypes.util import find_library
-
-# keep a copy of the os module since updating globals overrides this
-_os = os
-
-
-class unknown(object):
-    """marker class for unknown information"""
-
-    def __nonzero__(self):
-        return False
-
-    def __str__(self):
-        return 'UNKNOWN'
-
-
-unknown = unknown()  # singleton
-
-
-def get_windows_version():
-    import ctypes
-
-    class OSVERSIONINFOEXW(ctypes.Structure):
-        _fields_ = [('dwOSVersionInfoSize', ctypes.c_ulong),
-                    ('dwMajorVersion', ctypes.c_ulong),
-                    ('dwMinorVersion', ctypes.c_ulong),
-                    ('dwBuildNumber', ctypes.c_ulong),
-                    ('dwPlatformId', ctypes.c_ulong),
-                    ('szCSDVersion', ctypes.c_wchar * 128),
-                    ('wServicePackMajor', ctypes.c_ushort),
-                    ('wServicePackMinor', ctypes.c_ushort),
-                    ('wSuiteMask', ctypes.c_ushort),
-                    ('wProductType', ctypes.c_byte),
-                    ('wReserved', ctypes.c_byte)]
-
-    os_version = OSVERSIONINFOEXW()
-    os_version.dwOSVersionInfoSize = ctypes.sizeof(os_version)
-    retcode = ctypes.windll.Ntdll.RtlGetVersion(ctypes.byref(os_version))
-    if retcode != 0:
-        raise OSError
-
-    return os_version.dwMajorVersion, os_version.dwMinorVersion, os_version.dwBuildNumber
-
-
-# get system information
-info = {'os': unknown,
-        'processor': unknown,
-        'version': unknown,
-        'os_version': unknown,
-        'bits': unknown,
-        'has_sandbox': unknown,
-        'webrender': bool(os.environ.get("MOZ_WEBRENDER", False))}
-(system, node, release, version, machine, processor) = platform.uname()
-(bits, linkage) = platform.architecture()
-
-# get os information and related data
-if system in ["Microsoft", "Windows"]:
-    info['os'] = 'win'
-    # There is a Python bug on Windows to determine platform values
-    # http://bugs.python.org/issue7860
-    if "PROCESSOR_ARCHITEW6432" in os.environ:
-        processor = os.environ.get("PROCESSOR_ARCHITEW6432", processor)
-    else:
-        processor = os.environ.get('PROCESSOR_ARCHITECTURE', processor)
-    system = os.environ.get("OS", system).replace('_', ' ')
-    (major, minor, _, _, service_pack) = os.sys.getwindowsversion()
-    info['service_pack'] = service_pack
-    if major >= 6 and minor >= 2:
-        # On windows >= 8.1 the system call that getwindowsversion uses has
-        # been frozen to always return the same values. In this case we call
-        # the RtlGetVersion API directly, which still provides meaningful
-        # values, at least for now.
-        major, minor, build_number = get_windows_version()
-        version = "%d.%d.%d" % (major, minor, build_number)
-
-    os_version = "%d.%d" % (major, minor)
-elif system.startswith(('MINGW', 'MSYS_NT')):
-    # windows/mingw python build (msys)
-    info['os'] = 'win'
-    os_version = version = unknown
-elif system == "Linux":
-    if hasattr(platform, "linux_distribution"):
-        (distro, os_version, codename) = platform.linux_distribution()
-    else:
-        (distro, os_version, codename) = platform.dist()
-    if not processor:
-        processor = machine
-    version = "%s %s" % (distro, os_version)
-
-    # Bug in Python 2's `platform` library:
-    # It will return a triple of empty strings if the distribution is not supported.
-    # It works on Python 3. If we don't have an OS version,
-    # the unit tests fail to run.
-    if not distro and not os_version and not codename:
-        distro = 'lfs'
-        version = release
-        os_version = release
-
-    info['os'] = 'linux'
-    info['linux_distro'] = distro
-elif system in ['DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD']:
-    info['os'] = 'bsd'
-    version = os_version = sys.platform
-elif system == "Darwin":
-    (release, versioninfo, machine) = platform.mac_ver()
-    version = "OS X %s" % release
-    versionNums = release.split('.')[:2]
-    os_version = "%s.%s" % (versionNums[0], versionNums[1])
-    info['os'] = 'mac'
-elif sys.platform in ('solaris', 'sunos5'):
-    info['os'] = 'unix'
-    os_version = version = sys.platform
-else:
-    os_version = version = unknown
-
-info['version'] = version
-info['os_version'] = StringVersion(os_version)
-
-# processor type and bits
-if processor in ["i386", "i686"]:
-    if bits == "32bit":
-        processor = "x86"
-    elif bits == "64bit":
-        processor = "x86_64"
-elif processor.upper() == "AMD64":
-    bits = "64bit"
-    processor = "x86_64"
-elif processor == "Power Macintosh":
-    processor = "ppc"
-bits = re.search('(\d+)bit', bits).group(1)
-info.update({'processor': processor,
-             'bits': int(bits),
-             })
-
-if info['os'] == 'linux':
-    import ctypes
-    import errno
-    PR_SET_SECCOMP = 22
-    SECCOMP_MODE_FILTER = 2
-    ctypes.CDLL(find_library("c"), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0)
-    info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT
-else:
-    info['has_sandbox'] = True
-
-# standard value of choices, for easy inspection
-choices = {'os': ['linux', 'bsd', 'win', 'mac', 'unix'],
-           'bits': [32, 64],
-           'processor': ['x86', 'x86_64', 'ppc']}
-
-
-def sanitize(info):
-    """Do some sanitization of input values, primarily
-    to handle universal Mac builds."""
-    if "processor" in info and info["processor"] == "universal-x86-x86_64":
-        # If we're running on OS X 10.6 or newer, assume 64-bit
-        if release[:4] >= "10.6":  # Note this is a string comparison
-            info["processor"] = "x86_64"
-            info["bits"] = 64
-        else:
-            info["processor"] = "x86"
-            info["bits"] = 32
-
-# method for updating information
-
-
-def update(new_info):
-    """
-    Update the info.
-
-    :param new_info: Either a dict containing the new info or a path/url
-                     to a json file containing the new info.
-    """
-
-    PY3 = sys.version_info[0] == 3
-    if PY3:
-        string_types = str,
-    else:
-        string_types = basestring,
-    if isinstance(new_info, string_types):
-        # lazy import
-        import mozfile
-        import json
-        f = mozfile.load(new_info)
-        new_info = json.loads(f.read())
-        f.close()
-
-    info.update(new_info)
-    sanitize(info)
-    globals().update(info)
-
-    # convenience data for os access
-    for os_name in choices['os']:
-        globals()['is' + os_name.title()] = info['os'] == os_name
-    # unix is special
-    if isLinux or isBsd:  # noqa
-        globals()['isUnix'] = True
-
-
-def find_and_update_from_json(*dirs):
-    """
-    Find a mozinfo.json file, load it, and update the info with the
-    contents.
-
-    :param dirs: Directories in which to look for the file. They will be
-                 searched after first looking in the root of the objdir
-                 if the current script is being run from a Mozilla objdir.
-
-    Returns the full path to mozinfo.json if it was found, or None otherwise.
-    """
-    # First, see if we're in an objdir
-    try:
-        from mozbuild.base import MozbuildObject, BuildEnvironmentNotFoundException
-        from mozbuild.mozconfig import MozconfigFindException
-        build = MozbuildObject.from_environment()
-        json_path = _os.path.join(build.topobjdir, "mozinfo.json")
-        if _os.path.isfile(json_path):
-            update(json_path)
-            return json_path
-    except ImportError:
-        pass
-    except (BuildEnvironmentNotFoundException, MozconfigFindException):
-        pass
-
-    for d in dirs:
-        d = _os.path.abspath(d)
-        json_path = _os.path.join(d, "mozinfo.json")
-        if _os.path.isfile(json_path):
-            update(json_path)
-            return json_path
-
-    return None
-
-
-def output_to_file(path):
-    import json
-    with open(path, 'w') as f:
-        f.write(json.dumps(info))
-
-
-update({})
-
-# exports
-__all__ = list(info.keys())
-__all__ += ['is' + os_name.title() for os_name in choices['os']]
-__all__ += [
-    'info',
-    'unknown',
-    'main',
-    'choices',
-    'update',
-    'find_and_update_from_json',
-    'output_to_file',
-    'StringVersion',
-]
-
-
-def main(args=None):
-
-    # parse the command line
-    from optparse import OptionParser
-    parser = OptionParser(description=__doc__)
-    for key in choices:
-        parser.add_option('--%s' % key, dest=key,
-                          action='store_true', default=False,
-                          help="display choices for %s" % key)
-    options, args = parser.parse_args()
-
-    # args are JSON blobs to override info
-    if args:
-        # lazy import
-        import json
-        for arg in args:
-            if _os.path.exists(arg):
-                string = open(arg).read()
-            else:
-                string = arg
-            update(json.loads(string))
-
-    # print out choices if requested
-    flag = False
-    for key, value in options.__dict__.items():
-        if value is True:
-            print('%s choices: %s' % (key, ' '.join([str(choice)
-                                                     for choice in choices[key]])))
-            flag = True
-    if flag:
-        return
-
-    # otherwise, print out all info
-    for key, value in info.items():
-        print('%s: %s' % (key, value))
-
-
-if __name__ == '__main__':
-    main()

testing/mozharness/mozinfo/string_version.py

@@ -1,45 +0,0 @@
-# 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/.
-
-from __future__ import absolute_import
-
-from distutils.version import LooseVersion
-
-
-class StringVersion(str):
-    """
-    A string version that can be compared with comparison operators.
-    """
-
-    def __init__(self, vstring):
-        str.__init__(self, vstring)
-        self.version = LooseVersion(vstring)
-
-    def __repr__(self):
-        return "StringVersion ('%s')" % self
-
-    def __to_version(self, other):
-        if not isinstance(other, StringVersion):
-            other = StringVersion(other)
-        return other.version
-
-    # rich comparison methods
-
-    def __lt__(self, other):
-        return self.version < self.__to_version(other)
-
-    def __le__(self, other):
-        return self.version <= self.__to_version(other)
-
-    def __eq__(self, other):
-        return self.version == self.__to_version(other)
-
-    def __ne__(self, other):
-        return self.version != self.__to_version(other)
-
-    def __gt__(self, other):
-        return self.version > self.__to_version(other)
-
-    def __ge__(self, other):
-        return self.version >= self.__to_version(other)

testing/mozharness/mozprocess/__init__.py

@@ -1,8 +0,0 @@
-# flake8: noqa
-# 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/.
-
-from __future__ import absolute_import
-
-from .processhandler import *

testing/mozharness/mozprocess/qijo.py

@@ -1,167 +0,0 @@
-# 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/.
-
-from __future__ import absolute_import
-
-from ctypes import (
-    c_void_p,
-    POINTER,
-    sizeof,
-    Structure,
-    windll,
-    WinError,
-    WINFUNCTYPE,
-    addressof,
-    c_size_t,
-    c_ulong
-)
-
-from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LARGE_INTEGER
-
-LPVOID = c_void_p
-LPDWORD = POINTER(DWORD)
-SIZE_T = c_size_t
-ULONG_PTR = POINTER(c_ulong)
-
-# A ULONGLONG is a 64-bit unsigned integer.
-# Thus there are 8 bytes in a ULONGLONG.
-# XXX why not import c_ulonglong ?
-ULONGLONG = BYTE * 8
-
-
-class IO_COUNTERS(Structure):
-    # The IO_COUNTERS struct is 6 ULONGLONGs.
-    # TODO: Replace with non-dummy fields.
-    _fields_ = [('dummy', ULONGLONG * 6)]
-
-
-class JOBOBJECT_BASIC_ACCOUNTING_INFORMATION(Structure):
-    _fields_ = [('TotalUserTime', LARGE_INTEGER),
-                ('TotalKernelTime', LARGE_INTEGER),
-                ('ThisPeriodTotalUserTime', LARGE_INTEGER),
-                ('ThisPeriodTotalKernelTime', LARGE_INTEGER),
-                ('TotalPageFaultCount', DWORD),
-                ('TotalProcesses', DWORD),
-                ('ActiveProcesses', DWORD),
-                ('TotalTerminatedProcesses', DWORD)]
-
-
-class JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION(Structure):
-    _fields_ = [('BasicInfo', JOBOBJECT_BASIC_ACCOUNTING_INFORMATION),
-                ('IoInfo', IO_COUNTERS)]
-
-
-# see http://msdn.microsoft.com/en-us/library/ms684147%28VS.85%29.aspx
-class JOBOBJECT_BASIC_LIMIT_INFORMATION(Structure):
-    _fields_ = [('PerProcessUserTimeLimit', LARGE_INTEGER),
-                ('PerJobUserTimeLimit', LARGE_INTEGER),
-                ('LimitFlags', DWORD),
-                ('MinimumWorkingSetSize', SIZE_T),
-                ('MaximumWorkingSetSize', SIZE_T),
-                ('ActiveProcessLimit', DWORD),
-                ('Affinity', ULONG_PTR),
-                ('PriorityClass', DWORD),
-                ('SchedulingClass', DWORD)
-                ]
-
-
-class JOBOBJECT_ASSOCIATE_COMPLETION_PORT(Structure):
-    _fields_ = [('CompletionKey', c_ulong),
-                ('CompletionPort', HANDLE)]
-
-
-# see http://msdn.microsoft.com/en-us/library/ms684156%28VS.85%29.aspx
-class JOBOBJECT_EXTENDED_LIMIT_INFORMATION(Structure):
-    _fields_ = [('BasicLimitInformation', JOBOBJECT_BASIC_LIMIT_INFORMATION),
-                ('IoInfo', IO_COUNTERS),
-                ('ProcessMemoryLimit', SIZE_T),
-                ('JobMemoryLimit', SIZE_T),
-                ('PeakProcessMemoryUsed', SIZE_T),
-                ('PeakJobMemoryUsed', SIZE_T)]
-
-
-# These numbers below come from:
-# http://msdn.microsoft.com/en-us/library/ms686216%28v=vs.85%29.aspx
-JobObjectAssociateCompletionPortInformation = 7
-JobObjectBasicAndIoAccountingInformation = 8
-JobObjectExtendedLimitInformation = 9
-
-
-class JobObjectInfo(object):
-    mapping = {'JobObjectBasicAndIoAccountingInformation': 8,
-               'JobObjectExtendedLimitInformation': 9,
-               'JobObjectAssociateCompletionPortInformation': 7}
-    structures = {
-        7: JOBOBJECT_ASSOCIATE_COMPLETION_PORT,
-        8: JOBOBJECT_BASIC_AND_IO_ACCOUNTING_INFORMATION,
-        9: JOBOBJECT_EXTENDED_LIMIT_INFORMATION
-    }
-
-    def __init__(self, _class):
-        if isinstance(_class, basestring):
-            assert _class in self.mapping, \
-                'Class should be one of %s; you gave %s' % (self.mapping, _class)
-            _class = self.mapping[_class]
-        assert _class in self.structures, \
-            'Class should be one of %s; you gave %s' % (self.structures, _class)
-        self.code = _class
-        self.info = self.structures[_class]()
-
-
-QueryInformationJobObjectProto = WINFUNCTYPE(
-    BOOL,        # Return type
-    HANDLE,      # hJob
-    DWORD,       # JobObjectInfoClass
-    LPVOID,      # lpJobObjectInfo
-    DWORD,       # cbJobObjectInfoLength
-    LPDWORD      # lpReturnLength
-)
-
-QueryInformationJobObjectFlags = (
-    (1, 'hJob'),
-    (1, 'JobObjectInfoClass'),
-    (1, 'lpJobObjectInfo'),
-    (1, 'cbJobObjectInfoLength'),
-    (1, 'lpReturnLength', None)
-)
-
-_QueryInformationJobObject = QueryInformationJobObjectProto(
-    ('QueryInformationJobObject', windll.kernel32),
-    QueryInformationJobObjectFlags
-)
-
-
-class SubscriptableReadOnlyStruct(object):
-
-    def __init__(self, struct):
-        self._struct = struct
-
-    def _delegate(self, name):
-        result = getattr(self._struct, name)
-        if isinstance(result, Structure):
-            return SubscriptableReadOnlyStruct(result)
-        return result
-
-    def __getitem__(self, name):
-        match = [fname for fname, ftype in self._struct._fields_
-                 if fname == name]
-        if match:
-            return self._delegate(name)
-        raise KeyError(name)
-
-    def __getattr__(self, name):
-        return self._delegate(name)
-
-
-def QueryInformationJobObject(hJob, JobObjectInfoClass):
-    jobinfo = JobObjectInfo(JobObjectInfoClass)
-    result = _QueryInformationJobObject(
-        hJob=hJob,
-        JobObjectInfoClass=jobinfo.code,
-        lpJobObjectInfo=addressof(jobinfo.info),
-        cbJobObjectInfoLength=sizeof(jobinfo.info)
-    )
-    if not result:
-        raise WinError()
-    return SubscriptableReadOnlyStruct(jobinfo.info)

testing/mozharness/mozprocess/winprocess.py

@@ -1,485 +0,0 @@
-# A module to expose various thread/process/job related structures and
-# methods from kernel32
-#
-# The MIT License
-#
-# Copyright (c) 2003-2004 by Peter Astrand <astrand@lysator.liu.se>
-#
-# Additions and modifications written by Benjamin Smedberg
-# <benjamin@smedbergs.us> are Copyright (c) 2006 by the Mozilla Foundation
-# <http://www.mozilla.org/>
-#
-# More Modifications
-# Copyright (c) 2006-2007 by Mike Taylor <bear@code-bear.com>
-# Copyright (c) 2007-2008 by Mikeal Rogers <mikeal@mozilla.com>
-#
-# By obtaining, using, and/or copying this software and/or its
-# associated documentation, you agree that you have read, understood,
-# and will comply with the following terms and conditions:
-#
-# Permission to use, copy, modify, and distribute this software and
-# its associated documentation for any purpose and without fee is
-# hereby granted, provided that the above copyright notice appears in
-# all copies, and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of the
-# author not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-#
-# THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-from __future__ import absolute_import, unicode_literals
-
-import sys
-import subprocess
-
-from ctypes import c_void_p, POINTER, sizeof, Structure, windll, WinError, WINFUNCTYPE, c_ulong
-from ctypes.wintypes import BOOL, BYTE, DWORD, HANDLE, LPCWSTR, LPWSTR, UINT, WORD
-from .qijo import QueryInformationJobObject
-
-LPVOID = c_void_p
-LPBYTE = POINTER(BYTE)
-LPDWORD = POINTER(DWORD)
-LPBOOL = POINTER(BOOL)
-LPULONG = POINTER(c_ulong)
-
-
-def ErrCheckBool(result, func, args):
-    """errcheck function for Windows functions that return a BOOL True
-    on success"""
-    if not result:
-        raise WinError()
-    return args
-
-
-# AutoHANDLE
-
-class AutoHANDLE(HANDLE):
-    """Subclass of HANDLE which will call CloseHandle() on deletion."""
-
-    CloseHandleProto = WINFUNCTYPE(BOOL, HANDLE)
-    CloseHandle = CloseHandleProto(("CloseHandle", windll.kernel32))
-    CloseHandle.errcheck = ErrCheckBool
-
-    def Close(self):
-        if self.value and self.value != HANDLE(-1).value:
-            self.CloseHandle(self)
-            self.value = 0
-
-    def __del__(self):
-        self.Close()
-
-    def __int__(self):
-        return self.value
-
-
-def ErrCheckHandle(result, func, args):
-    """errcheck function for Windows functions that return a HANDLE."""
-    if not result:
-        raise WinError()
-    return AutoHANDLE(result)
-
-# PROCESS_INFORMATION structure
-
-
-class PROCESS_INFORMATION(Structure):
-    _fields_ = [("hProcess", HANDLE),
-                ("hThread", HANDLE),
-                ("dwProcessID", DWORD),
-                ("dwThreadID", DWORD)]
-
-    def __init__(self):
-        Structure.__init__(self)
-
-        self.cb = sizeof(self)
-
-
-LPPROCESS_INFORMATION = POINTER(PROCESS_INFORMATION)
-
-# STARTUPINFO structure
-
-
-class STARTUPINFO(Structure):
-    _fields_ = [("cb", DWORD),
-                ("lpReserved", LPWSTR),
-                ("lpDesktop", LPWSTR),
-                ("lpTitle", LPWSTR),
-                ("dwX", DWORD),
-                ("dwY", DWORD),
-                ("dwXSize", DWORD),
-                ("dwYSize", DWORD),
-                ("dwXCountChars", DWORD),
-                ("dwYCountChars", DWORD),
-                ("dwFillAttribute", DWORD),
-                ("dwFlags", DWORD),
-                ("wShowWindow", WORD),
-                ("cbReserved2", WORD),
-                ("lpReserved2", LPBYTE),
-                ("hStdInput", HANDLE),
-                ("hStdOutput", HANDLE),
-                ("hStdError", HANDLE)
-                ]
-
-
-LPSTARTUPINFO = POINTER(STARTUPINFO)
-
-SW_HIDE = 0
-
-STARTF_USESHOWWINDOW = 0x01
-STARTF_USESIZE = 0x02
-STARTF_USEPOSITION = 0x04
-STARTF_USECOUNTCHARS = 0x08
-STARTF_USEFILLATTRIBUTE = 0x10
-STARTF_RUNFULLSCREEN = 0x20
-STARTF_FORCEONFEEDBACK = 0x40
-STARTF_FORCEOFFFEEDBACK = 0x80
-STARTF_USESTDHANDLES = 0x100
-
-# EnvironmentBlock
-
-
-class EnvironmentBlock:
-    """An object which can be passed as the lpEnv parameter of CreateProcess.
-    It is initialized with a dictionary."""
-
-    def __init__(self, env):
-        if not env:
-            self._as_parameter_ = None
-        else:
-            values = []
-            fs_encoding = sys.getfilesystemencoding() or 'mbcs'
-            for k, v in env.iteritems():
-                if isinstance(k, bytes):
-                    k = k.decode(fs_encoding, 'replace')
-                if isinstance(v, bytes):
-                    v = v.decode(fs_encoding, 'replace')
-                values.append("{}={}".format(k, v))
-            values.append("")
-            self._as_parameter_ = LPCWSTR("\0".join(values))
-
-
-# Error Messages we need to watch for go here
-# See: http://msdn.microsoft.com/en-us/library/ms681388%28v=vs.85%29.aspx
-ERROR_ABANDONED_WAIT_0 = 735
-
-# GetLastError()
-GetLastErrorProto = WINFUNCTYPE(DWORD)  # Return Type
-GetLastErrorFlags = ()
-GetLastError = GetLastErrorProto(("GetLastError", windll.kernel32), GetLastErrorFlags)
-
-# CreateProcess()
-
-CreateProcessProto = WINFUNCTYPE(BOOL,                  # Return type
-                                 LPCWSTR,               # lpApplicationName
-                                 LPWSTR,                # lpCommandLine
-                                 LPVOID,                # lpProcessAttributes
-                                 LPVOID,                # lpThreadAttributes
-                                 BOOL,                  # bInheritHandles
-                                 DWORD,                 # dwCreationFlags
-                                 LPVOID,                # lpEnvironment
-                                 LPCWSTR,               # lpCurrentDirectory
-                                 LPSTARTUPINFO,         # lpStartupInfo
-                                 LPPROCESS_INFORMATION  # lpProcessInformation
-                                 )
-
-CreateProcessFlags = ((1, "lpApplicationName", None),
-                      (1, "lpCommandLine"),
-                      (1, "lpProcessAttributes", None),
-                      (1, "lpThreadAttributes", None),
-                      (1, "bInheritHandles", True),
-                      (1, "dwCreationFlags", 0),
-                      (1, "lpEnvironment", None),
-                      (1, "lpCurrentDirectory", None),
-                      (1, "lpStartupInfo"),
-                      (2, "lpProcessInformation"))
-
-
-def ErrCheckCreateProcess(result, func, args):
-    ErrCheckBool(result, func, args)
-    # return a tuple (hProcess, hThread, dwProcessID, dwThreadID)
-    pi = args[9]
-    return AutoHANDLE(pi.hProcess), AutoHANDLE(pi.hThread), pi.dwProcessID, pi.dwThreadID
-
-
-CreateProcess = CreateProcessProto(("CreateProcessW", windll.kernel32),
-                                   CreateProcessFlags)
-CreateProcess.errcheck = ErrCheckCreateProcess
-
-# flags for CreateProcess
-CREATE_BREAKAWAY_FROM_JOB = 0x01000000
-CREATE_DEFAULT_ERROR_MODE = 0x04000000
-CREATE_NEW_CONSOLE = 0x00000010
-CREATE_NEW_PROCESS_GROUP = 0x00000200
-CREATE_NO_WINDOW = 0x08000000
-CREATE_SUSPENDED = 0x00000004
-CREATE_UNICODE_ENVIRONMENT = 0x00000400
-
-# Flags for IOCompletion ports (some of these would probably be defined if
-# we used the win32 extensions for python, but we don't want to do that if we
-# can help it.
-INVALID_HANDLE_VALUE = HANDLE(-1)  # From winbase.h
-
-# Self Defined Constants for IOPort <--> Job Object communication
-COMPKEY_TERMINATE = c_ulong(0)
-COMPKEY_JOBOBJECT = c_ulong(1)
-
-# flags for job limit information
-# see http://msdn.microsoft.com/en-us/library/ms684147%28VS.85%29.aspx
-JOB_OBJECT_LIMIT_BREAKAWAY_OK = 0x00000800
-JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK = 0x00001000
-
-# Flags for Job Object Completion Port Message IDs from winnt.h
-# See also: http://msdn.microsoft.com/en-us/library/ms684141%28v=vs.85%29.aspx
-JOB_OBJECT_MSG_END_OF_JOB_TIME = 1
-JOB_OBJECT_MSG_END_OF_PROCESS_TIME = 2
-JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT = 3
-JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO = 4
-JOB_OBJECT_MSG_NEW_PROCESS = 6
-JOB_OBJECT_MSG_EXIT_PROCESS = 7
-JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS = 8
-JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT = 9
-JOB_OBJECT_MSG_JOB_MEMORY_LIMIT = 10
-
-# See winbase.h
-DEBUG_ONLY_THIS_PROCESS = 0x00000002
-DEBUG_PROCESS = 0x00000001
-DETACHED_PROCESS = 0x00000008
-
-# GetQueuedCompletionPortStatus -
-# http://msdn.microsoft.com/en-us/library/aa364986%28v=vs.85%29.aspx
-GetQueuedCompletionStatusProto = WINFUNCTYPE(BOOL,         # Return Type
-                                             HANDLE,       # Completion Port
-                                             LPDWORD,      # Msg ID
-                                             LPULONG,      # Completion Key
-                                             # PID Returned from the call (may be null)
-                                             LPULONG,
-                                             DWORD)        # milliseconds to wait
-GetQueuedCompletionStatusFlags = ((1, "CompletionPort", INVALID_HANDLE_VALUE),
-                                  (1, "lpNumberOfBytes", None),
-                                  (1, "lpCompletionKey", None),
-                                  (1, "lpPID", None),
-                                  (1, "dwMilliseconds", 0))
-GetQueuedCompletionStatus = GetQueuedCompletionStatusProto(("GetQueuedCompletionStatus",
-                                                            windll.kernel32),
-                                                           GetQueuedCompletionStatusFlags)
-
-# CreateIOCompletionPort
-# Note that the completion key is just a number, not a pointer.
-CreateIoCompletionPortProto = WINFUNCTYPE(HANDLE,      # Return Type
-                                          HANDLE,      # File Handle
-                                          HANDLE,      # Existing Completion Port
-                                          c_ulong,     # Completion Key
-                                          DWORD)       # Number of Threads
-
-CreateIoCompletionPortFlags = ((1, "FileHandle", INVALID_HANDLE_VALUE),
-                               (1, "ExistingCompletionPort", 0),
-                               (1, "CompletionKey", c_ulong(0)),
-                               (1, "NumberOfConcurrentThreads", 0))
-CreateIoCompletionPort = CreateIoCompletionPortProto(("CreateIoCompletionPort",
-                                                      windll.kernel32),
-                                                     CreateIoCompletionPortFlags)
-CreateIoCompletionPort.errcheck = ErrCheckHandle
-
-# SetInformationJobObject
-SetInformationJobObjectProto = WINFUNCTYPE(BOOL,      # Return Type
-                                           HANDLE,    # Job Handle
-                                           DWORD,     # Type of Class next param is
-                                           LPVOID,    # Job Object Class
-                                           DWORD)     # Job Object Class Length
-
-SetInformationJobObjectProtoFlags = ((1, "hJob", None),
-                                     (1, "JobObjectInfoClass", None),
-                                     (1, "lpJobObjectInfo", None),
-                                     (1, "cbJobObjectInfoLength", 0))
-SetInformationJobObject = SetInformationJobObjectProto(("SetInformationJobObject",
-                                                        windll.kernel32),
-                                                       SetInformationJobObjectProtoFlags)
-SetInformationJobObject.errcheck = ErrCheckBool
-
-# CreateJobObject()
-CreateJobObjectProto = WINFUNCTYPE(HANDLE,             # Return type
-                                   LPVOID,             # lpJobAttributes
-                                   LPCWSTR             # lpName
-                                   )
-
-CreateJobObjectFlags = ((1, "lpJobAttributes", None),
-                        (1, "lpName", None))
-
-CreateJobObject = CreateJobObjectProto(("CreateJobObjectW", windll.kernel32),
-                                       CreateJobObjectFlags)
-CreateJobObject.errcheck = ErrCheckHandle
-
-# AssignProcessToJobObject()
-
-AssignProcessToJobObjectProto = WINFUNCTYPE(BOOL,      # Return type
-                                            HANDLE,    # hJob
-                                            HANDLE     # hProcess
-                                            )
-AssignProcessToJobObjectFlags = ((1, "hJob"),
-                                 (1, "hProcess"))
-AssignProcessToJobObject = AssignProcessToJobObjectProto(
-    ("AssignProcessToJobObject", windll.kernel32),
-    AssignProcessToJobObjectFlags)
-AssignProcessToJobObject.errcheck = ErrCheckBool
-
-# GetCurrentProcess()
-# because os.getPid() is way too easy
-GetCurrentProcessProto = WINFUNCTYPE(HANDLE    # Return type
-                                     )
-GetCurrentProcessFlags = ()
-GetCurrentProcess = GetCurrentProcessProto(
-    ("GetCurrentProcess", windll.kernel32),
-    GetCurrentProcessFlags)
-GetCurrentProcess.errcheck = ErrCheckHandle
-
-# IsProcessInJob()
-try:
-    IsProcessInJobProto = WINFUNCTYPE(BOOL,     # Return type
-                                      HANDLE,   # Process Handle
-                                      HANDLE,   # Job Handle
-                                      LPBOOL      # Result
-                                      )
-    IsProcessInJobFlags = ((1, "ProcessHandle"),
-                           (1, "JobHandle", HANDLE(0)),
-                           (2, "Result"))
-    IsProcessInJob = IsProcessInJobProto(
-        ("IsProcessInJob", windll.kernel32),
-        IsProcessInJobFlags)
-    IsProcessInJob.errcheck = ErrCheckBool
-except AttributeError:
-    # windows 2k doesn't have this API
-    def IsProcessInJob(process):
-        return False
-
-
-# ResumeThread()
-
-def ErrCheckResumeThread(result, func, args):
-    if result == -1:
-        raise WinError()
-
-    return args
-
-
-ResumeThreadProto = WINFUNCTYPE(DWORD,      # Return type
-                                HANDLE      # hThread
-                                )
-ResumeThreadFlags = ((1, "hThread"),)
-ResumeThread = ResumeThreadProto(("ResumeThread", windll.kernel32),
-                                 ResumeThreadFlags)
-ResumeThread.errcheck = ErrCheckResumeThread
-
-# TerminateProcess()
-
-TerminateProcessProto = WINFUNCTYPE(BOOL,    # Return type
-                                    HANDLE,  # hProcess
-                                    UINT     # uExitCode
-                                    )
-TerminateProcessFlags = ((1, "hProcess"),
-                         (1, "uExitCode", 127))
-TerminateProcess = TerminateProcessProto(
-    ("TerminateProcess", windll.kernel32),
-    TerminateProcessFlags)
-TerminateProcess.errcheck = ErrCheckBool
-
-# TerminateJobObject()
-
-TerminateJobObjectProto = WINFUNCTYPE(BOOL,    # Return type
-                                      HANDLE,  # hJob
-                                      UINT     # uExitCode
-                                      )
-TerminateJobObjectFlags = ((1, "hJob"),
-                           (1, "uExitCode", 127))
-TerminateJobObject = TerminateJobObjectProto(
-    ("TerminateJobObject", windll.kernel32),
-    TerminateJobObjectFlags)
-TerminateJobObject.errcheck = ErrCheckBool
-
-# WaitForSingleObject()
-
-WaitForSingleObjectProto = WINFUNCTYPE(DWORD,   # Return type
-                                       HANDLE,  # hHandle
-                                       DWORD,   # dwMilliseconds
-                                       )
-WaitForSingleObjectFlags = ((1, "hHandle"),
-                            (1, "dwMilliseconds", -1))
-WaitForSingleObject = WaitForSingleObjectProto(
-    ("WaitForSingleObject", windll.kernel32),
-    WaitForSingleObjectFlags)
-
-# http://msdn.microsoft.com/en-us/library/ms681381%28v=vs.85%29.aspx
-INFINITE = -1
-WAIT_TIMEOUT = 0x0102
-WAIT_OBJECT_0 = 0x0
-WAIT_ABANDONED = 0x0080
-
-# http://msdn.microsoft.com/en-us/library/ms683189%28VS.85%29.aspx
-STILL_ACTIVE = 259
-
-# Used when we terminate a process.
-ERROR_CONTROL_C_EXIT = 0x23c
-
-# GetExitCodeProcess()
-
-GetExitCodeProcessProto = WINFUNCTYPE(BOOL,     # Return type
-                                      HANDLE,   # hProcess
-                                      LPDWORD,  # lpExitCode
-                                      )
-GetExitCodeProcessFlags = ((1, "hProcess"),
-                           (2, "lpExitCode"))
-GetExitCodeProcess = GetExitCodeProcessProto(
-    ("GetExitCodeProcess", windll.kernel32),
-    GetExitCodeProcessFlags)
-GetExitCodeProcess.errcheck = ErrCheckBool
-
-
-def CanCreateJobObject():
-    currentProc = GetCurrentProcess()
-    if IsProcessInJob(currentProc):
-        jobinfo = QueryInformationJobObject(HANDLE(0), 'JobObjectExtendedLimitInformation')
-        limitflags = jobinfo['BasicLimitInformation']['LimitFlags']
-        return bool(limitflags & JOB_OBJECT_LIMIT_BREAKAWAY_OK) or \
-            bool(limitflags & JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK)
-    else:
-        return True
-
-# testing functions
-
-
-def parent():
-    print 'Starting parent'
-    currentProc = GetCurrentProcess()
-    if IsProcessInJob(currentProc):
-        print >> sys.stderr, "You should not be in a job object to test"
-        sys.exit(1)
-    assert CanCreateJobObject()
-    print 'File: %s' % __file__
-    command = [sys.executable, __file__, '-child']
-    print 'Running command: %s' % command
-    process = subprocess.Popen(command)
-    process.kill()
-    code = process.returncode
-    print 'Child code: %s' % code
-    assert code == 127
-
-
-def child():
-    print 'Starting child'
-    currentProc = GetCurrentProcess()
-    injob = IsProcessInJob(currentProc)
-    print "Is in a job?: %s" % injob
-    can_create = CanCreateJobObject()
-    print 'Can create job?: %s' % can_create
-    process = subprocess.Popen('c:\\windows\\notepad.exe')
-    assert process._job
-    jobinfo = QueryInformationJobObject(process._job, 'JobObjectExtendedLimitInformation')
-    print 'Job info: %s' % jobinfo
-    limitflags = jobinfo['BasicLimitInformation']['LimitFlags']
-    print 'LimitFlags: %s' % limitflags
-    process.kill()

testing/mozharness/tox.ini

@@ -6,11 +6,13 @@ deps =
     coverage
     nose
     rednose
+mozbase = {toxinidir}/../mozbase
 
 [testenv]
 basepython = python2.7
 setenv =
     HGRCPATH = {toxinidir}/test/hgrc
+    PYTHONPATH = $PYTHONPATH:{[base]mozbase}/manifestparser:{[base]mozbase}/mozfile:{[base]mozbase}/mozinfo:{[base]mozbase}/mozprocess
 
 commands =
     coverage run --source configs,mozharness,scripts --branch {envbindir}/nosetests -v --with-xunit --rednose --force-color {posargs}

testing/web-platform/meta/html/semantics/embedded-content/media-elements/playing-the-media-resource/__dir__.ini

@@ -1 +0,0 @@
-prefs: [network.http.send_window_size:0]

testing/web-platform/meta/html/semantics/embedded-content/media-elements/video_008.htm.ini

@@ -1,4 +1,3 @@
 [video_008.htm]
-  prefs: [network.http.send_window_size:0]
   disabled:
     if verify and (os == "win") and not debug: fails in verify mode

testing/web-platform/meta/html/semantics/embedded-content/the-video-element/video_initially_paused.html.ini

@@ -1,3 +1,2 @@
 [video_initially_paused.html]
   expected: FAIL
-  prefs: [network.http.send_window_size:0]

toolkit/actors/PictureInPictureChild.jsm

@@ -16,6 +16,10 @@ var gWeakVideo = null;
 var gWeakPlayerContent = null;
 
 class PictureInPictureChild extends ActorChild {
+  static videoIsPlaying(video) {
+    return !!(video.currentTime > 0 && !video.paused && !video.ended && video.readyState > 2);
+  }
+
   handleEvent(event) {
     switch (event.type) {
       case "MozTogglePictureInPicture": {
@@ -30,6 +34,14 @@ class PictureInPictureChild extends ActorChild {
         this.closePictureInPicture();
         break;
       }
+      case "play": {
+        this.mm.sendAsyncMessage("PictureInPicture:Playing");
+        break;
+      }
+      case "pause": {
+        this.mm.sendAsyncMessage("PictureInPicture:Paused");
+        break;
+      }
     }
   }
 
@@ -73,6 +85,7 @@ class PictureInPictureChild extends ActorChild {
 
       gWeakVideo = Cu.getWeakReference(video);
       this.mm.sendAsyncMessage("PictureInPicture:Request", {
+        playing: PictureInPictureChild.videoIsPlaying(video),
         videoHeight: video.videoHeight,
         videoWidth: video.videoWidth,
       });
@@ -128,6 +141,14 @@ class PictureInPictureChild extends ActorChild {
         this.setupPlayer();
         break;
       }
+      case "PictureInPicture:Play": {
+        this.play();
+        break;
+      }
+      case "PictureInPicture:Pause": {
+        this.pause();
+        break;
+      }
     }
   }
 
@@ -140,6 +161,8 @@ class PictureInPictureChild extends ActorChild {
     let originatingWindow = originatingVideo.ownerGlobal;
     if (originatingWindow) {
       originatingWindow.addEventListener("pagehide", this);
+      originatingVideo.addEventListener("play", this);
+      originatingVideo.addEventListener("pause", this);
     }
   }
 
@@ -153,6 +176,8 @@ class PictureInPictureChild extends ActorChild {
     let originatingWindow = originatingVideo.ownerGlobal;
     if (originatingWindow) {
       originatingWindow.removeEventListener("pagehide", this);
+      originatingVideo.removeEventListener("play", this);
+      originatingVideo.removeEventListener("pause", this);
     }
   }
 
@@ -224,4 +249,18 @@ class PictureInPictureChild extends ActorChild {
 
     gWeakPlayerContent = Cu.getWeakReference(this.content);
   }
+
+  play() {
+    let video = this.weakVideo;
+    if (video) {
+      video.play();
+    }
+  }
+
+  pause() {
+    let video = this.weakVideo;
+    if (video) {
+      video.pause();
+    }
+  }
 }

toolkit/components/antitracking/test/browser/browser_siteSpecificWorkArounds.js

@@ -21,7 +21,7 @@ AntiTracking.runTest("localStorage with a tracker that is whitelisted via a pref
       Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value => resolve());
     });
   },
-  [["urlclassifier.trackingAnnotationSkipURLs", "tracking.example.org"]],
+  [["urlclassifier.trackingAnnotationSkipURLs", "TRACKING.EXAMPLE.ORG"]],
   false, // run the window.open() test
   false, // run the user interaction test
   0, // don't expect blocking notifications

toolkit/components/antitracking/test/browser/head.js

@@ -284,6 +284,21 @@ this.AntiTracking = {
 
     if (extraPrefs && Array.isArray(extraPrefs) && extraPrefs.length) {
       await SpecialPowers.pushPrefEnv({"set": extraPrefs });
+
+      for (let item of extraPrefs) {
+        // When setting up skip URLs, we need to wait to ensure our prefs
+        // actually take effect.  In order to do this, we set up a skip list
+        // observer and wait until it calls us back.
+        if (item[0] == "urlclassifier.trackingAnnotationSkipURLs") {
+          info("Waiting for the skip list service to initialize...");
+          let classifier = Cc["@mozilla.org/url-classifier/dbservice;1"]
+                             .getService(Ci.nsIURIClassifier);
+          let feature = classifier.getFeatureByName("tracking-annotation");
+          await TestUtils.waitForCondition(() => feature.skipHostList == item[1].toLowerCase(),
+                                           "Skip list service initialized");
+          break;
+        }
+      }
     }
 
     await UrlClassifierTestUtils.addTestTrackers();

toolkit/components/passwordmgr/LoginHelper.jsm

@@ -60,18 +60,12 @@ var LoginHelper = {
       return this.debug ? "Debug" : "Warn";
     };
 
-    let logger;
-    function getConsole() {
-      if (!logger) {
-        // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
-        let consoleOptions = {
-          maxLogLevel: getMaxLogLevel(),
-          prefix: aLogPrefix,
-        };
-        logger = console.createInstance(consoleOptions);
-      }
-      return logger;
-    }
+    // Create a new instance of the ConsoleAPI so we can control the maxLogLevel with a pref.
+    let consoleOptions = {
+      maxLogLevel: getMaxLogLevel(),
+      prefix: aLogPrefix,
+    };
+    let logger = console.createInstance(consoleOptions);
 
     // Watch for pref changes and update this.debug and the maxLogLevel for created loggers
     Services.prefs.addObserver("signon.debug", () => {
@@ -81,26 +75,7 @@ var LoginHelper = {
       }
     });
 
-    return {
-      log: (...args) => {
-        if (this.debug) {
-          getConsole().log(...args);
-        }
-      },
-      error: (...args) => {
-        getConsole().error(...args);
-      },
-      debug: (...args) => {
-        if (this.debug) {
-          getConsole().debug(...args);
-        }
-      },
-      warn: (...args) => {
-        if (this.debug) {
-          getConsole().warn(...args);
-        }
-      },
-    };
+    return logger;
   },
 
   /**

toolkit/components/pictureinpicture/PictureInPicture.jsm

@@ -35,9 +35,31 @@ var PictureInPicture = {
         this.closePipWindow();
         break;
       }
+      case "PictureInPicture:Playing": {
+        let controls = this.weakPipControls && this.weakPipControls.get();
+        if (controls) {
+          controls.classList.add("playing");
+        }
+        break;
+      }
+      case "PictureInPicture:Paused": {
+        let controls = this.weakPipControls && this.weakPipControls.get();
+        if (controls) {
+          controls.classList.remove("playing");
+        }
+        break;
+      }
     }
   },
 
+  focusTabAndClosePip() {
+    let gBrowser = this.browser.ownerGlobal.gBrowser;
+    let tab = gBrowser.getTabForBrowser(this.browser);
+    gBrowser.selectedTab = tab;
+    this.unload();
+    this.closePipWindow();
+  },
+
   /**
    * Find and close any pre-existing Picture in Picture windows.
    */
@@ -48,7 +70,6 @@ var PictureInPicture = {
       if (win.closed) {
         continue;
       }
-
       win.close();
     }
   },
@@ -74,12 +95,27 @@ var PictureInPicture = {
    *   the player component inside it has finished loading.
    */
   async handlePictureInPictureRequest(browser, videoData) {
+    this.browser = browser;
     let parentWin = browser.ownerGlobal;
     this.closePipWindow();
     let win = await this.openPipWindow(parentWin, videoData);
+    let controls = win.document.getElementById("controls");
+    this.weakPipControls = Cu.getWeakReference(controls);
+    if (videoData.playing) {
+      controls.classList.add("playing");
+    }
     win.setupPlayer(browser, videoData);
   },
 
+  /**
+   * unload event has been called in player.js, cleanup our preserved
+   * browser object.
+   */
+  unload() {
+    delete this.weakPipControls;
+    delete this.browser;
+  },
+
   /**
    * Open a Picture in Picture window on the same screen as parentWin,
    * sized based on the information in videoData.

toolkit/components/pictureinpicture/content/player.js

@@ -2,6 +2,8 @@
  * 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/. */
 
+const {PictureInPicture} = ChromeUtils.import("resource://gre/modules/PictureInPicture.jsm");
+
 async function setupPlayer(originatingBrowser, videoData) {
   window.windowUtils.setChromeMargin(0, 0, 0, 0);
   let holder = document.querySelector(".player-holder");
@@ -19,12 +21,33 @@ async function setupPlayer(originatingBrowser, videoData) {
   let mm = browser.frameLoader.messageManager;
   mm.sendAsyncMessage("PictureInPicture:SetupPlayer");
 
+  document.getElementById("play").addEventListener("click", () => {
+    mm.sendAsyncMessage("PictureInPicture:Play");
+  });
+
+  document.getElementById("pause").addEventListener("click", () => {
+    mm.sendAsyncMessage("PictureInPicture:Pause");
+  });
+
+  document.getElementById("unpip").addEventListener("click", () => {
+    PictureInPicture.focusTabAndClosePip();
+  });
+
   // If the content process hosting the video crashes, let's
   // just close the window for now.
   browser.addEventListener("oop-browser-crashed", () => {
     window.close();
   });
 
+  browser.addEventListener("unload", () => {
+    PictureInPicture.unload();
+  });
+
   await window.promiseDocumentFlushed(() => {});
   browser.style.MozWindowDragging = "drag";
+
+  let close = document.getElementById("close");
+  close.addEventListener("click", () => {
+    window.close();
+  });
 }

toolkit/components/pictureinpicture/content/player.xhtml

@@ -21,5 +21,11 @@
     <div class="player-holder">
       <xul:browser type="content" primary="true" remote="true" remoteType="web" id="browser"></xul:browser>
     </div>
+    <div id="controls">
+      <div id="close" class="control-item"></div>
+      <div id="unpip" class="control-item"></div>
+      <div id="pause" class="control-item"></div>
+      <div id="play" class="control-item"></div>
+    </div>
   </body>
 </html>

toolkit/modules/ActorManagerParent.jsm

@@ -225,6 +225,8 @@ let ACTORS = {
 
       messages: [
         "PictureInPicture:SetupPlayer",
+        "PictureInPicture:Play",
+        "PictureInPicture:Pause",
       ],
     },
   },

toolkit/modules/Color.jsm

@@ -6,6 +6,33 @@
 
 var EXPORTED_SYMBOLS = ["Color"];
 
+/**
+ * A list of minimum contrast ratio's per WCAG 2.0 conformance level.
+ * Please refer to section 1.4.3 of the WCAG 2.0 spec at http://www.w3.org/TR/WCAG20/.
+ * Simply put:
+ * A = Large text only.
+ * AA = Regular sized text or large text in enhanced contrast mode.
+ * AAA = Regular sized text in enhanced contrast mode.
+ *
+ * @type {Object}
+ */
+const CONTRAST_RATIO_LEVELS = {
+  A: 3,
+  AA: 4.5,
+  AAA: 7,
+};
+
+/**
+ * For text legibility on any background color, you need to determine which text
+ * color - black or white - will yield the highest contrast ratio.
+ * Since you're always comparing `contrastRatio(bgcolor, black) >
+ * contrastRatio(bgcolor, white) ? <use black> : <use white>`, we can greatly
+ * simplify the calculation to the following constant.
+ *
+ * @type {Number}
+ */
+const CONTRAST_BRIGHTTEXT_THRESHOLD = Math.sqrt(1.05 * 0.05) - 0.05;
+
 /**
  * Color class, which describes a color.
  * In the future, this object may be extended to allow for conversions between
@@ -15,13 +42,13 @@ var EXPORTED_SYMBOLS = ["Color"];
  * @param {Number} g Green color component
  * @param {Number} b Blue color component
  */
-function Color(r, g, b) {
-  this.r = r;
-  this.g = g;
-  this.b = b;
-}
+class Color {
+  constructor(r, g, b) {
+    this.r = r;
+    this.g = g;
+    this.b = b;
+  }
 
-Color.prototype = {
   /**
    * Formula from W3C's WCAG 2.0 spec's relative luminance, section 1.4.1,
    * http://www.w3.org/TR/WCAG20/.
@@ -29,25 +56,25 @@ Color.prototype = {
    * @return {Number} Relative luminance, represented as number between 0 and 1.
    */
   get relativeLuminance() {
-    let colorArr = [this.r, this.b, this.g].map(color => {
+    let colorArr = [this.r, this.g, this.b].map(color => {
       color = parseInt(color, 10);
-      if (color <= 10)
+      if (color <= 10) {
         return color / 255 / 12.92;
+      }
       return Math.pow(((color / 255) + 0.055) / 1.055, 2.4);
     });
     return colorArr[0] * 0.2126 +
            colorArr[1] * 0.7152 +
            colorArr[2] * 0.0722;
-  },
+  }
 
   /**
-   * @return {Boolean} TRUE if the color value can be considered bright.
+   * @return {Boolean} TRUE if you need to use a bright color (e.g. 'white'), when
+   *                   this color is set as the background.
    */
-  get isBright() {
-    // Note: this is a high enough value to be considered as 'bright', but was
-    //       decided upon empirically.
-    return this.relativeLuminance > 0.7;
-  },
+  get useBrightText() {
+    return this.relativeLuminance <= CONTRAST_BRIGHTTEXT_THRESHOLD;
+  }
 
   /**
    * Get the contrast ratio between the current color and a second other color.
@@ -61,25 +88,26 @@ Color.prototype = {
    *                  as 1:1 to 21:1.
    */
   contrastRatio(otherColor) {
-    if (!(otherColor instanceof Color))
+    if (!(otherColor instanceof Color)) {
       throw new TypeError("The first argument should be an instance of Color");
+    }
 
     let luminance = this.relativeLuminance;
     let otherLuminance = otherColor.relativeLuminance;
     return (Math.max(luminance, otherLuminance) + 0.05) /
       (Math.min(luminance, otherLuminance) + 0.05);
-  },
+  }
 
   /**
-   * Biased method to check if the contrast ratio between two colors is high
-   * enough to be discernable.
+   * Method to check if the contrast ratio between two colors is high enough to
+   * be discernable.
    *
-   * @param  {Color} otherColor Color instance to calculate the contrast with
+   * @param  {Color}  otherColor Color instance to calculate the contrast with
+   * @param  {String} [level]    WCAG conformance level that maps to the minimum
+   *                             required contrast ratio. Defaults to 'AA'
    * @return {Boolean}
    */
-  isContrastRatioAcceptable(otherColor) {
-    // Note: this is a high enough value to be considered as 'high contrast',
-    //       but was decided upon empirically.
-    return this.contrastRatio(otherColor) > 3;
-  },
-};
+  isContrastRatioAcceptable(otherColor, level = "AA") {
+    return this.contrastRatio(otherColor) > CONTRAST_RATIO_LEVELS[level];
+  }
+}

toolkit/modules/FinderHighlighter.jsm

@@ -734,7 +734,7 @@ FinderHighlighter.prototype = {
     if (!cssColor || !cssColor.length)
       return false;
     cssColor.shift();
-    return new Color(...cssColor).isBright;
+    return !(new Color(...cssColor)).useBrightText;
   },
 
   /**

toolkit/modules/tests/xpcshell/test_Color.js

@@ -4,7 +4,7 @@ const {Color} = ChromeUtils.import("resource://gre/modules/Color.jsm");
 
 function run_test() {
   testRelativeLuminance();
-  testIsBright();
+  testUseBrightText();
   testContrastRatio();
   testIsContrastRatioAcceptable();
 }
@@ -17,16 +17,15 @@ function testRelativeLuminance() {
   Assert.equal(c.relativeLuminance, 1, "White is quite the luminant one");
 
   c = new Color(142, 42, 142);
-  Assert.equal(c.relativeLuminance, 0.25263952353998204,
-    "This purple is not that luminant");
+  Assert.equal(c.relativeLuminance, 0.09359705837110571, "This purple is not that luminant");
 }
 
-function testIsBright() {
+function testUseBrightText() {
   let c = new Color(0, 0, 0);
-  Assert.equal(c.isBright, 0, "Black is bright");
+  Assert.ok(c.useBrightText, "Black is bright, so bright text should be used here");
 
   c = new Color(255, 255, 255);
-  Assert.equal(c.isBright, 1, "White is bright");
+  Assert.ok(!c.useBrightText, "White is bright, so better not use bright colored text on it");
 }
 
 function testContrastRatio() {
@@ -36,8 +35,8 @@ function testContrastRatio() {
   Assert.equal(c.contrastRatio(c), 1, "Contrast between equals is min");
 
   let c3 = new Color(142, 42, 142);
-  Assert.equal(c.contrastRatio(c3), 6.05279047079964, "Contrast between black and purple");
-  Assert.equal(c2.contrastRatio(c3), 3.469474137806338, "Contrast between white and purple");
+  Assert.equal(c.contrastRatio(c3), 2.871941167422114, "Contrast between black and purple shouldn't be very high");
+  Assert.equal(c2.contrastRatio(c3), 7.312127503938331, "Contrast between white and purple should be high");
 }
 
 function testIsContrastRatioAcceptable() {
@@ -48,6 +47,8 @@ function testIsContrastRatioAcceptable() {
   Assert.equal(c.g, 156, "Greens should match");
   Assert.equal(c.b, 152, "Blues should match");
   Assert.ok(c.isContrastRatioAcceptable(c2), "The blue is high contrast enough");
-  c = new Color(...[35, 65, 100]);
+  c2 = new Color(...[35, 65, 100]);
   Assert.ok(!c.isContrastRatioAcceptable(c2), "The blue is not high contrast enough");
+  // But would it be high contrast enough at a lower conformance level?
+  Assert.ok(c.isContrastRatioAcceptable(c2, "A"), "The blue is high contrast enough when used as large text");
 }

toolkit/themes/shared/aboutRights.css

@@ -10,6 +10,6 @@
   padding-inline-end: 320px;
 }
 
-body[dir="rtl"] .rights-header{
-   background-position: left center;
+.rights-header:dir(rtl) {
+  background-position: left center;
 }

toolkit/themes/shared/jar.inc.mn

@@ -32,6 +32,7 @@ toolkit.jar:
   skin/classic/global/icons/check.svg                      (../../shared/icons/check.svg)
   skin/classic/global/icons/check-partial.svg              (../../shared/icons/check-partial.svg)
   skin/classic/global/icons/close.svg                      (../../shared/icons/close.svg)
+  skin/classic/global/pictureinpicture/close-pip.svg       (../../shared/pictureinpicture/close-pip.svg)
   skin/classic/global/icons/columnpicker.svg               (../../shared/icons/columnpicker.svg)
   skin/classic/global/icons/delete.svg                     (../../shared/icons/delete.svg)
   skin/classic/global/icons/error.svg                      (../../shared/icons/error.svg)
@@ -44,6 +45,8 @@ toolkit.jar:
   skin/classic/global/icons/loading@2x.png                 (../../shared/icons/loading@2x.png)
   skin/classic/global/icons/more.svg                       (../../shared/icons/more.svg)
   skin/classic/global/icons/performance.svg                (../../shared/icons/performance.svg)
+  skin/classic/global/pictureinpicture/pause.svg           (../../shared/pictureinpicture/pause.svg)
+  skin/classic/global/pictureinpicture/play.svg            (../../shared/pictureinpicture/play.svg)
   skin/classic/global/icons/resizer.svg                    (../../shared/icons/resizer.svg)
   skin/classic/global/icons/shortcut.svg                   (../../shared/icons/shortcut.svg)
   skin/classic/global/icons/spinner-arrow-down.svg         (../../shared/icons/spinner-arrow-down.svg)
@@ -54,6 +57,7 @@ toolkit.jar:
   skin/classic/global/icons/arrow-dropdown-12.svg          (../../shared/icons/arrow-dropdown-12.svg)
   skin/classic/global/icons/arrow-dropdown-16.svg          (../../shared/icons/arrow-dropdown-16.svg)
   skin/classic/global/icons/arrow-up-12.svg                (../../shared/icons/arrow-up-12.svg)
+  skin/classic/global/pictureinpicture/unpip.svg           (../../shared/pictureinpicture/unpip.svg)
   skin/classic/global/icons/warning.svg                    (../../shared/icons/warning.svg)
   skin/classic/global/illustrations/about-rights.svg       (../../shared/illustrations/about-rights.svg)
   skin/classic/global/icons/blocked.svg                    (../../shared/incontent-icons/blocked.svg)

toolkit/themes/shared/pictureinpicture/close-pip.svg

@@ -0,0 +1,5 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M9.061 8l3.47-3.47a.75.75 0 0 0-1.061-1.06L8 6.939 4.53 3.47a.75.75 0 1 0-1.06 1.06L6.939 8 3.47 11.47a.75.75 0 1 0 1.06 1.06L8 9.061l3.47 3.47a.75.75 0 0 0 1.06-1.061z"/></svg>
+

toolkit/themes/shared/pictureinpicture/pause.svg

@@ -0,0 +1,4 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="#F9F9FA" fill-rule="evenodd" fill-opacity=".8"><rect x="3" y="3" width="4" height="10" rx=".5"/><rect x="9" y="3" width="4" height="10" rx=".5"/></g></svg>

toolkit/themes/shared/pictureinpicture/play.svg

@@ -0,0 +1,4 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#F9F9FA" d="M4 3.995c0-.55.386-.754.856-.46l6.288 3.93c.473.295.47.776 0 1.07l-6.288 3.93c-.473.295-.856.08-.856-.46v-8.01z"/></svg>

toolkit/themes/shared/pictureinpicture/player.css

@@ -2,6 +2,11 @@
  * 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/. */
 
+:root {
+  --btn-bg-color: rgba(50,50,50,0.55);
+  --close-btn-bg-color: rgb(211,216,220);
+}
+
 body {
   margin: 0;
 }
@@ -14,5 +19,67 @@ body {
 }
 
 browser {
+  -moz-window-dragging: drag;
   flex: 1;
 }
+
+#controls {
+  height: 100%;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.control-item {
+  -moz-window-dragging: no-drag;
+  background: var(--btn-bg-color);
+  border-radius: 4px;
+  bottom: 15px;
+  cursor: pointer;
+  height: 15%;
+  max-height: 32px;
+  max-width: 32px;
+  min-height: 16px;
+  min-width: 16px;
+  position: absolute;
+  width: 10%;
+}
+
+#close {
+  background-color: var(--close-btn-bg-color);
+  background-image: url("chrome://global/skin/pictureinpicture/close-pip.svg");
+  right: 10px;
+  top: 10px;
+}
+
+#play {
+  background-image: url("chrome://global/skin/pictureinpicture/play.svg");
+  display: block;
+  left: 55%;
+}
+
+#pause {
+  background-image: url("chrome://global/skin/pictureinpicture/pause.svg");
+  display: none;
+  left: 55%;
+}
+
+.playing #play {
+  display: none;
+}
+
+.playing #pause {
+  display: block;
+}
+
+#unpip {
+  left: 45%;
+}
+
+#unpip {
+  background-image: url("chrome://global/skin/pictureinpicture/unpip.svg");
+  background-position: 60%;
+  background-repeat: no-repeat;
+  background-size: 80%;
+}