commit 84b1fb2bc73d0a27647c31a5b42faa280b9d1b32
author Lalit Maganti <lalitm@google.com> Thu Jan 31 11:45:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 31 11:45:23 2019 +0000
tree 46e6a5e0e05e8af17d7d1399591a2b698ada4e95
parent 94bebb39c6cb15c7767fe655ba315e8daa75817e
parent 9b375392bc6f9926ec19578159cead309d250c27

Merge "Revert "trace_processor: invalidate mismatched pid sched slices""

tools/heap_profile

diff --git a/tools/heap_profile b/tools/heap_profile
index 432e3d0..aeb266f 100755
--- a/tools/heap_profile
+++ b/tools/heap_profile
@@ -30,8 +30,8 @@
 import urllib
 
 TRACE_TO_TEXT_SHAS = {
-  'linux': '02b80116b5873dc00d82ff50c79f89909e054e78',
-  'mac': 'f0fcf2e9adaacd28c1b712b241d5f02e9f746741',
+  'linux': '4e52b07b2f6258643d16610ae1aae8ac73063624',
+  'mac': '0893f2892f519c6c48458bbc34a61dbed50c20a5',
 }
 TRACE_TO_TEXT_PATH = tempfile.gettempdir()
 TRACE_TO_TEXT_BASE_URL = (

ui/src/controller/trace_controller.ts

diff --git a/ui/src/controller/trace_controller.ts b/ui/src/controller/trace_controller.ts
index 6c0d409..5ffbffb 100644
--- a/ui/src/controller/trace_controller.ts
+++ b/ui/src/controller/trace_controller.ts
@@ -259,7 +259,7 @@
           trackGroup: SCROLLING_TRACK_GROUP,
           config: {
             cpu,
-            maximumValue: maxFreq.columns[0].longValues![0],
+            maximumValue: +maxFreq.columns[0].doubleValues![0],
           }
         }));
       }

ui/src/tracks/cpu_freq/frontend.ts

diff --git a/ui/src/tracks/cpu_freq/frontend.ts b/ui/src/tracks/cpu_freq/frontend.ts
index c7eac0e..894bc12 100644
--- a/ui/src/tracks/cpu_freq/frontend.ts
+++ b/ui/src/tracks/cpu_freq/frontend.ts
@@ -189,7 +189,8 @@
       ctx.fillText(text, this.mouseXpos + 10, centerY - 3);
       // Display idle value if current hover is idle.
       if (this.hoveredIdle !== undefined && this.hoveredIdle !== -1) {
-        const idle = `idle: ${this.hoveredIdle.toLocaleString()}`;
+        // Display the idle value +1 to be consistent with catapult.
+        const idle = `idle: ${(this.hoveredIdle + 1).toLocaleString()}`;
         ctx.fillText(idle, this.mouseXpos + 10, centerY + 11);
       }
     }