Merge mozilla-central to autoland. a=merge CLOSED TREE

dothq · May 31, 2018 · 614b78a · 614b78a
2 parents de808cb + 54db525
commit 614b78a
Show file tree

Hide file tree

Showing 162 changed files with 2,885 additions and 1,294 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/caps/nsScriptSecurityManager.cpp b/caps/nsScriptSecurityManager.cpp
@@ -1253,15 +1253,6 @@ nsScriptSecurityManager::GetDocShellCodebasePrincipal(nsIURI* aURI,
   return *aPrincipal ? NS_OK : NS_ERROR_FAILURE;
 }
 
-// static
-nsIPrincipal*
-nsScriptSecurityManager::doGetObjectPrincipal(JSObject *aObj)
-{
-    JSCompartment *compartment = js::GetObjectCompartment(aObj);
-    JSPrincipals *principals = JS_GetCompartmentPrincipals(compartment);
-    return nsJSPrincipals::get(principals);
-}
-
 NS_IMETHODIMP
 nsScriptSecurityManager::CanCreateWrapper(JSContext *cx,
                                           const nsIID &aIID,

diff --git a/caps/nsScriptSecurityManager.h b/caps/nsScriptSecurityManager.h
@@ -93,10 +93,6 @@ class nsScriptSecurityManager final : public nsIScriptSecurityManager,
     static bool
     JSPrincipalsSubsume(JSPrincipals *first, JSPrincipals *second);
 
-    // Returns null if a principal cannot be found; generally callers
-    // should error out at that point.
-    static nsIPrincipal* doGetObjectPrincipal(JSObject* obj);
-
     nsresult
     Init();
 

diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla
@@ -1,9 +1,9 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Version 60
+Version 61
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-59...release-60
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-60...release-61
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2

diff --git a/devtools/client/debugger/new/dist/debugger.css b/devtools/client/debugger/new/dist/debugger.css
@@ -2117,6 +2117,10 @@ menuseparator {
   padding: 0 2px;
 }
 
+.objectBox-node.clickable {
+  cursor: pointer;
+}
+
 /******************************************************************************/
 
 .objectBox-event,
@@ -2223,6 +2227,7 @@ button.open-inspector {
   height: 16px;
   margin-left: 0.25em;
   vertical-align: middle;
+  cursor: pointer;
 }
 
 .objectBox-node:hover .open-inspector,

diff --git a/devtools/client/debugger/new/dist/parser-worker.js b/devtools/client/debugger/new/dist/parser-worker.js
@@ -1222,7 +1222,7 @@ function isYieldExpression(path) {
 }
 
 function isObjectShorthand(parent) {
-  return t.isObjectProperty(parent) && parent.key.start == parent.value.start && parent.key.loc.identifierName === parent.value.loc.identifierName;
+  return t.isObjectProperty(parent) && parent.value && parent.key.start == parent.value.start && parent.key.loc.identifierName === parent.value.loc.identifierName;
 }
 
 function getObjectExpressionValue(node) {

diff --git a/devtools/client/debugger/new/dist/vendors.js b/devtools/client/debugger/new/dist/vendors.js
@@ -8174,7 +8174,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 // (eg. "my-module/Test") which is why they are nested in "vendored".
 // The keys of the vendored object should match the module names
 // !!! Should remain synchronized with .babel/transform-mc.js !!!
-const vendored = {
+const vendored = exports.vendored = {
   classnames: _classnames2.default,
   "devtools-components": devtoolsComponents,
   "devtools-config": devtoolsConfig,
@@ -8210,7 +8210,6 @@ const vendored = {
  */
 
 // Modules imported with destructuring
-exports.vendored = vendored;
 
 /***/ }),
 

diff --git a/devtools/client/debugger/new/src/actions/pause/extra.js b/devtools/client/debugger/new/src/actions/pause/extra.js
@@ -91,7 +91,7 @@ function getExtra(expression, result) {
     const selectedFrame = (0, _selectors.getSelectedFrame)(getState());
 
     if (!selectedFrame) {
-      return;
+      return {};
     }
 
     const extra = await getExtraProps(getState, expression, result, expr => client.evaluateInFrame(expr, selectedFrame.id));

diff --git a/devtools/client/debugger/new/src/client/index.js b/devtools/client/debugger/new/src/client/index.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onConnect = undefined;
+exports.onConnect = onConnect;
 
 var _firefox = require("./firefox");
 
@@ -68,6 +68,4 @@ async function onConnect(connection, {
     selectors,
     client: commands
   };
-}
-
-exports.onConnect = onConnect;
+}
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/Popup.js b/devtools/client/debugger/new/src/components/Editor/Preview/Popup.js
@@ -237,7 +237,7 @@ class Popup extends _react.Component {
       roots = roots.filter(r => r.type != NODE_TYPES.PROTOTYPE);
     }
 
-    if ((0, _preview.isReactComponent)(this.getObjectProperties())) {
+    if (extra.react && (0, _preview.isReactComponent)(this.getObjectProperties())) {
       header = this.renderReact(extra.react);
       roots = roots.filter(r => ["state", "props"].includes(r.name));
     }