Observatory: Include profiler samples in the timeline view.

runtime/observatory/web/timeline.js

Index: runtime/observatory/web/timeline.js
diff --git a/runtime/observatory/web/timeline.js b/runtime/observatory/web/timeline.js
index 155d010b2a42f27b216485882e80c69220215c5e..3909d2cb65d2bdf1b531cc64807af7a1beadca47 100644
--- a/runtime/observatory/web/timeline.js
+++ b/runtime/observatory/web/timeline.js
@@ -40,18 +40,37 @@ function fetchUri(uri, onLoad, onError) {
   console.log('GET ' + uri);
 }
 
+
+var traceObject;
+
 function fetchTimelineOnLoad(event) {
   var xhr = event.target;
   var response = JSON.parse(xhr.responseText);
   var result = response['result'];
-  var traceEvents = result['traceEvents'];
-  updateTimeline(traceEvents);
+  var newStackFrames = result['stackFrames'];  // Map.
+  var newTraceEvents = result['traceEvents'];  // List.
+
+  // Merge in timeline events.
+  traceObject.traceEvents = traceObject.traceEvents.concat(newTraceEvents);
+  for (var key in newStackFrames) {
+    if (newStackFrames.hasOwnProperty(key)) {
+      traceObject.stackFrames[key] = newStackFrames[key];
+    }
+  }
+
+  updateTimeline(traceObject);
 }
 
 function fetchTimelineOnError(event) {
 }
 
-function fetchTimeline(vmAddress) {
+function fetchTimeline(vmAddress, isolateIds) {
+  // Reset combined timeline.
+  traceObject = {
+    'stackFrames': {},
+    'traceEvents': []
+  };
+
   var parser = document.createElement('a');
   parser.href = vmAddress;
   var requestUri = 'http://' +
@@ -60,6 +79,17 @@ function fetchTimeline(vmAddress) {
                    parser.port +
                    '/_getVMTimeline';
   fetchUri(requestUri, fetchTimelineOnLoad, fetchTimelineOnError);
+
+  for (var i = 0; i < isolateIds.length; i++) {
+    var isolateId = isolateIds[i];
+    var requestUri = 'http://' +
+                     parser.hostname +
+                     ':' +
+                     parser.port +
+                     '/_getCpuProfileTimeline?tags=VMUser&isolateId=' +
+                     isolateId;
+    fetchUri(requestUri, fetchTimelineOnLoad, fetchTimelineOnError);
+  }
 }
 
 function onMessage(event) {
@@ -68,7 +98,7 @@ function onMessage(event) {
   var params = request['params'];
   switch (method) {
     case 'refresh':
-      fetchTimeline(params['vmAddress']);
+      fetchTimeline(params['vmAddress'], params['isolateIds']);
     break;
     case 'clear':
       clearTimeline();
@@ -90,4 +120,4 @@ document.addEventListener('DOMContentLoaded', function() {
   registerForMessages();
 });
 
-console.log('loaded');
+console.log('loaded');