Fix duplicate insertion of async slices in subrow generation.

Review URL: http://codereview.chromium.org/9726021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127776 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 18 insertions, 0 deletions

diff --git a/chrome/browser/resources/tracing/timeline_model.js b/chrome/browser/resources/tracing/timeline_model.js
index a309f17..73cfe0b 100644
--- a/chrome/browser/resources/tracing/timeline_model.js
+++ b/chrome/browser/resources/tracing/timeline_model.js
@@ -530,6 +530,7 @@ cr.define('tracing', function() {
           if (slice.start >= lastSliceInSubRow.end) {
             found = true;
             subRow.push(slice);
+            break;
           }
         }
         if (!found) {
diff --git a/chrome/browser/resources/tracing/timeline_model_test.html b/chrome/browser/resources/tracing/timeline_model_test.html
index 136211c..22e5033 100644
--- a/chrome/browser/resources/tracing/timeline_model_test.html
+++ b/chrome/browser/resources/tracing/timeline_model_test.html
@@ -201,6 +201,23 @@ function testAsyncSliceGroup_rebuildSubRows_threePartlyOverlappingSlices() {
   assertEquals(g.slices[1], g.subRows[1][0]);
 }
 
+function testAsyncSliceGroup_rebuildSubRows_twoOverlappingSlices() {
+  var p1 = new TimelineProcess(1);
+  var t1 = new TimelineThread(p1, 1);
+  var g = new TimelineAsyncSliceGroup('a');
+  g.slices.push(newAsyncSlice(0, 1, t1, t1));
+  g.slices.push(newAsyncSlice(0, 1.5, t1, t1));
+  g.slices.push(newAsyncSlice(2, 1, t1, t1));
+  g.updateBounds();
+
+  assertEquals(2, g.subRows.length);
+  assertEquals(2, g.subRows[0].length);
+  assertEquals(g.slices[0], g.subRows[0][0]);
+  assertEquals(g.slices[2], g.subRows[0][1]);
+  assertEquals(1, g.subRows[1].length);
+  assertEquals(g.slices[1], g.subRows[1][0]);
+}
+
 function testAsyncSliceGroup_computeSubGroups_twoThreadSpecificSlices() {
   var p1 = new TimelineProcess(1);
   var t1 = new TimelineThread(p1, 1);