Bug 1515951 - Update Debugger Frontend v112. r=bhackett
authorJason Laster <jlaster@mozilla.com>
Wed, 26 Dec 2018 23:44:52 -0500
changeset 452007 49233ec55bff867eaa73b1e5c5eb6d2e639da1ad
parent 452006 8ded394acd8153647264a16e4883f46fd7345dd5
child 452008 21ce5e3998e3b7716ef95b44bea56c8c44ab72a5
push id35278
push useraiakab@mozilla.com
push dateThu, 27 Dec 2018 21:57:04 +0000
treeherdermozilla-central@a77e8f3efc4c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhackett
bugs1515951
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1515951 - Update Debugger Frontend v112. r=bhackett
devtools/client/debugger/new/README.mozilla
devtools/client/debugger/new/src/actions/pause/mapFrames.js
--- a/devtools/client/debugger/new/README.mozilla
+++ b/devtools/client/debugger/new/README.mozilla
@@ -1,13 +1,13 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Version 111
+Version 112
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-110...release-111
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-111...release-112
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2
 - babel-preset-react @6.24.1
 - react @16.4.1
 - react-dom @16.4.1
 - webpack @3.12.0
--- a/devtools/client/debugger/new/src/actions/pause/mapFrames.js
+++ b/devtools/client/debugger/new/src/actions/pause/mapFrames.js
@@ -17,27 +17,28 @@ import { findClosestFunction } from "../
 
 import type { Frame } from "../../types";
 import type { State } from "../../reducers/types";
 import type { ThunkArgs } from "../types";
 import { features } from "../../utils/prefs";
 
 import { isGeneratedId } from "devtools-source-map";
 
+function isFrameBlackboxed(state, frame) {
+  const source = getSource(state, frame.location.sourceId);
+  return source && source.isBlackBoxed;
+}
+
 function getSelectedFrameId(state, frames) {
-  if (!features.originalBlackbox) {
-    const selectedFrame = getSelectedFrame(state);
-    return selectedFrame && selectedFrame.id;
+  let selectedFrame = getSelectedFrame(state);
+  if (selectedFrame && !isFrameBlackboxed(state, selectedFrame)) {
+    return selectedFrame.id;
   }
 
-  const selectedFrame = frames.find(frame => {
-    const source = getSource(state, frame.location.sourceId);
-    return source && !source.isBlackBoxed;
-  });
-
+  selectedFrame = frames.find(frame => !isFrameBlackboxed(state, frame));
   return selectedFrame && selectedFrame.id;
 }
 
 export function updateFrameLocation(frame: Frame, sourceMaps: any) {
   if (frame.isOriginal) {
     return Promise.resolve(frame);
   }
   return sourceMaps.getOriginalLocation(frame.location).then(loc => ({