Backed out changeset 7af65df7e09e (bug 1253803) for xpcshell bustage a=backout
authorWes Kocher <wkocher@mozilla.com>
Wed, 13 Apr 2016 11:24:51 -0700
changeset 323925 aa74410e52f0ff645a328a6e5a0928d2ba0b46c5
parent 323924 359c46892e799a4d6b6aeb148681bbbd3a3da4c4
child 323926 27aca73b0ff73eecbad93123eb50ce19c01afbef
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1253803
milestone47.0a2
backs out7af65df7e09e439d16d97ec32c39b34a62d2efad
Backed out changeset 7af65df7e09e (bug 1253803) for xpcshell bustage a=backout MozReview-Commit-ID: IhMZlMQuPJB
devtools/client/memory/reducers/snapshots.js
devtools/client/memory/test/unit/test_dominator_trees_10.js
devtools/client/memory/test/unit/xpcshell.ini
--- a/devtools/client/memory/reducers/snapshots.js
+++ b/devtools/client/memory/reducers/snapshots.js
@@ -216,42 +216,20 @@ handlers[actions.FETCH_DOMINATOR_TREE_EN
     if (snapshot.id !== id) {
       return snapshot;
     }
 
     assert(snapshot.dominatorTree, "Should have a dominator tree model");
     assert(snapshot.dominatorTree.state == dominatorTreeState.FETCHING,
            "Should be in the FETCHING state");
 
-    let focused;
-    if (snapshot.dominatorTree.focused) {
-      focused = (function findFocused(node) {
-        if (node.nodeId === snapshot.dominatorTree.focused.nodeId) {
-          return node;
-        }
-
-        if (node.children) {
-          const length = node.children.length;
-          for (let i = 0; i < length; i++) {
-            const result = findFocused(node.children[i]);
-            if (result) {
-              return result;
-            }
-          }
-        }
-
-        return undefined;
-      }(root));
-    }
-
     const dominatorTree = immutableUpdate(snapshot.dominatorTree, {
       state: dominatorTreeState.LOADED,
       root,
       expanded: new Set(),
-      focused,
     });
 
     return immutableUpdate(snapshot, { dominatorTree });
   });
 };
 
 handlers[actions.EXPAND_DOMINATOR_TREE_NODE] = function (snapshots, { id, node }) {
   return snapshots.map(snapshot => {
deleted file mode 100644
--- a/devtools/client/memory/test/unit/test_dominator_trees_10.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Test that we maintain focus of the selected dominator tree node across
-// changing breakdowns for labeling them.
-
-let {
-  snapshotState: states,
-  dominatorTreeState,
-  labelDisplays,
-  viewState,
-} = require("devtools/client/memory/constants");
-let {
-  takeSnapshotAndCensus,
-  focusDominatorTreeNode,
-} = require("devtools/client/memory/actions/snapshot");
-const {
-  changeView,
-} = require("devtools/client/memory/actions/view");
-const {
-  setLabelDisplayAndRefresh,
-} = require("devtools/client/memory/actions/label-display");
-
-function run_test() {
-  run_next_test();
-}
-
-add_task(function *() {
-  let front = new StubbedMemoryFront();
-  let heapWorker = new HeapAnalysesClient();
-  yield front.attach();
-  let store = Store();
-  let { getState, dispatch } = store;
-
-  dispatch(changeView(viewState.DOMINATOR_TREE));
-  dispatch(takeSnapshotAndCensus(front, heapWorker));
-
-  // Wait for the dominator tree to finish being fetched.
-  yield waitUntilState(store, state =>
-    state.snapshots[0] &&
-    state.snapshots[0].dominatorTree &&
-    state.snapshots[0].dominatorTree.state === dominatorTreeState.LOADED);
-  ok(true, "The dominator tree was fetched");
-
-  const root = getState().snapshots[0].dominatorTree.root;
-  ok(root, "When the dominator tree is loaded, we should have its root");
-
-  dispatch(focusDominatorTreeNode(getState().snapshots[0].id, root));
-  equal(root, getState().snapshots[0].dominatorTree.focused,
-        "The root should be focused.");
-
-  equal(getState().labelDisplay, labelDisplays.coarseType,
-        "Using labelDisplays.coarseType by default");
-  dispatch(setLabelDisplayAndRefresh(heapWorker,
-                                             labelDisplays.allocationStack));
-  equal(getState().labelDisplay, labelDisplays.allocationStack,
-        "Using labelDisplays.allocationStack now");
-
-  yield waitUntilState(store, state =>
-    state.snapshots[0].dominatorTree.state === dominatorTreeState.FETCHING);
-  ok(true, "We started re-fetching the dominator tree");
-
-  yield waitUntilState(store, state =>
-    state.snapshots[0].dominatorTree.state === dominatorTreeState.LOADED);
-  ok(true, "The dominator tree was loaded again");
-
-  ok(getState().snapshots[0].dominatorTree.focused,
-     "Still have a focused node");
-  equal(getState().snapshots[0].dominatorTree.focused.nodeId, root.nodeId,
-        "Focused node is the same as before");
-
-  heapWorker.destroy();
-  yield front.detach();
-});
--- a/devtools/client/memory/test/unit/xpcshell.ini
+++ b/devtools/client/memory/test/unit/xpcshell.ini
@@ -35,11 +35,10 @@ skip-if = toolkit == 'android' || toolki
 [test_dominator_trees_02.js]
 [test_dominator_trees_03.js]
 [test_dominator_trees_04.js]
 [test_dominator_trees_05.js]
 [test_dominator_trees_06.js]
 [test_dominator_trees_07.js]
 [test_dominator_trees_08.js]
 [test_dominator_trees_09.js]
-[test_dominator_trees_10.js]
 [test_utils.js]
 [test_utils-get-snapshot-totals.js]