Backed out changeset 167cd2f19d93 (bug 1219079)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 28 Oct 2015 13:09:36 +0100
changeset 269924 f680104e114519af11d8d70e6ab9d57d8407d32e
parent 269923 ef2b5e2a78672c228e42529ca181fdfae714fb1b
child 269925 205846a3aef5295249a622371daffa8fc5c7ac58
push id15939
push usercbook@mozilla.com
push dateWed, 28 Oct 2015 12:10:08 +0000
treeherderfx-team@8edcaa544e24 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1219079
milestone44.0a1
backs out167cd2f19d9368498359f528df23acde21fc5b16
Backed out changeset 167cd2f19d93 (bug 1219079)
devtools/client/memory/components/toolbar.js
devtools/client/memory/constants.js
--- a/devtools/client/memory/components/toolbar.js
+++ b/devtools/client/memory/components/toolbar.js
@@ -31,23 +31,20 @@ const Toolbar = module.exports = createC
       onToggleInverted,
       inverted
     } = this.props;
 
     return (
       DOM.div({ className: "devtools-toolbar" }, [
         DOM.button({ className: `take-snapshot devtools-button`, onClick: onTakeSnapshotClick }),
 
-        DOM.label({},
-          "Breakdown by ",
-          DOM.select({
-            className: `select-breakdown`,
-            onChange: e => onBreakdownChange(e.target.value),
-          }, breakdowns.map(({ name, displayName }) => DOM.option({ value: name }, displayName)))
-        ),
+        DOM.select({
+          className: `select-breakdown`,
+          onChange: e => onBreakdownChange(e.target.value),
+        }, breakdowns.map(({ name, displayName }) => DOM.option({ value: name }, displayName))),
 
         DOM.label({}, [
           DOM.input({
             type: "checkbox",
             checked: inverted,
             onChange: onToggleInverted,
           }),
           // TODO bug 1214799
--- a/devtools/client/memory/constants.js
+++ b/devtools/client/memory/constants.js
@@ -47,24 +47,24 @@ const ALLOCATION_STACK = { by: "allocati
 const OBJECT_CLASS = { by: "objectClass", then: COUNT, other: COUNT };
 
 const breakdowns = exports.breakdowns = {
   coarseType: {
     displayName: "Coarse Type",
     breakdown: {
       by: "coarseType",
       objects: ALLOCATION_STACK,
-      strings: COUNT,
+      strings: ALLOCATION_STACK,
       scripts: INTERNAL_TYPE,
       other: INTERNAL_TYPE,
     }
   },
 
   allocationStack: {
-    displayName: "Allocation Stack",
+    displayName: "Allocation Site",
     breakdown: ALLOCATION_STACK,
   },
 
   objectClass: {
     displayName: "Object Class",
     breakdown: OBJECT_CLASS,
   },