OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <!-- | 2 <!-- |
3 Copyright (c) 2015 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2015 The Chromium Authors. All rights reserved. |
4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
5 found in the LICENSE file. | 5 found in the LICENSE file. |
6 --> | 6 --> |
7 | 7 |
8 <link rel="import" href="/tracing/base/iteration_helpers.html"> | 8 <link rel="import" href="/tracing/base/iteration_helpers.html"> |
9 <link rel="import" href="/tracing/core/test_utils.html"> | 9 <link rel="import" href="/tracing/core/test_utils.html"> |
10 <link rel="import" href="/tracing/model/heap_dump.html"> | 10 <link rel="import" href="/tracing/model/heap_dump.html"> |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 }); | 161 }); |
162 | 162 |
163 var contexts; | 163 var contexts; |
164 if (dumpCreatedCallback === undefined) { | 164 if (dumpCreatedCallback === undefined) { |
165 contexts = undefined; | 165 contexts = undefined; |
166 } else { | 166 } else { |
167 tr.c.TestUtils.newModel(function(model) { | 167 tr.c.TestUtils.newModel(function(model) { |
168 var process = model.getOrCreateProcess(1); | 168 var process = model.getOrCreateProcess(1); |
169 fieldAndDumpMask.forEach(function(mask, i) { | 169 fieldAndDumpMask.forEach(function(mask, i) { |
170 var timestamp = 10 + i; | 170 var timestamp = 10 + i; |
171 var gmd = addGlobalMemoryDump(model, timestamp); | 171 var gmd = addGlobalMemoryDump(model, {ts: timestamp}); |
172 if (mask & DUMP) { | 172 if (mask & DUMP) { |
173 var pmd = addProcessMemoryDump(gmd, process, timestamp); | 173 var pmd = addProcessMemoryDump(gmd, process, {ts: timestamp}); |
174 dumpCreatedCallback(pmd, mask); | 174 dumpCreatedCallback(pmd, mask); |
175 } | 175 } |
176 }); | 176 }); |
177 contexts = model.globalMemoryDumps.map(function(gmd) { | 177 contexts = model.globalMemoryDumps.map(function(gmd) { |
178 return gmd.processMemoryDumps[1]; | 178 return gmd.processMemoryDumps[1]; |
179 }); | 179 }); |
180 }); | 180 }); |
181 } | 181 } |
182 | 182 |
183 checkColumnInfosAndColor( | 183 checkColumnInfosAndColor( |
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
803 test('tracingColumn', function() { | 803 test('tracingColumn', function() { |
804 var c = new TracingColumn('Tracing', 'bytes', tr.b.identity, | 804 var c = new TracingColumn('Tracing', 'bytes', tr.b.identity, |
805 AggregationMode.DIFF); | 805 AggregationMode.DIFF); |
806 checkSpanWithColor(c.title, 'Tracing', | 806 checkSpanWithColor(c.title, 'Tracing', |
807 'tracing_memory_column' /* expected column title gray color */); | 807 'tracing_memory_column' /* expected column title gray color */); |
808 checkColor(c.color(undefined /* contexts */), | 808 checkColor(c.color(undefined /* contexts */), |
809 'tracing_memory_column' /* expected column cells gray color */); | 809 'tracing_memory_column' /* expected column cells gray color */); |
810 }); | 810 }); |
811 }); | 811 }); |
812 </script> | 812 </script> |
OLD | NEW |