Index: tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html |
diff --git a/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html b/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html |
index 2d34945a8c372b71b1130a5a6cb23a37f17bb368..282d3433f004e099f7dfbbe2d1496cf9efcc1f38 100644 |
--- a/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html |
+++ b/tracing/tracing/ui/analysis/memory_dump_overview_pane_test.html |
@@ -71,6 +71,7 @@ tr.b.unittest.testSuite(function() { |
{ title: spanMatcher('Private dirty'), type: ByteStatColumn }, |
{ title: spanMatcher('Swapped'), type: ByteStatColumn }, |
{ title: spanMatcher('Private'), type: UsedMemoryColumn }, |
+ { title: spanMatcher('Private footprint'), type: UsedMemoryColumn }, |
{ title: colorLegendMatcher('blink'), type: AllocatorColumn }, |
{ title: colorLegendMatcher('gpu'), type: AllocatorColumn }, |
{ title: colorLegendMatcher('malloc'), type: AllocatorColumn }, |
@@ -218,21 +219,22 @@ tr.b.unittest.testSuite(function() { |
{ |
title: colorLegendMatcher('Process 1'), |
sizes: [[29884416], undefined, [9437184], [5767168], undefined, |
- undefined, undefined, undefined, [7340032], undefined, |
+ undefined, undefined, undefined, undefined, [7340032], undefined, |
undefined, [2097152]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 1) |
}, |
{ |
title: colorLegendMatcher('Process 2'), |
sizes: [[17825792], [39845888], [18350080], [0], [32], [8912896], |
- [7340032], [0], [1048576], [1], [5242880], [1572864]], |
+ [15728640], [7340032], [0], [1048576], [1], [5242880], |
+ [1572864]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 2) |
}, |
{ |
title: colorLegendMatcher('Process 4'), |
sizes: [undefined, [17825792], undefined, undefined, undefined, |
undefined, undefined, undefined, undefined, undefined, |
- undefined, undefined], |
+ undefined, undefined, undefined], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 4) |
} |
], |
@@ -240,8 +242,8 @@ tr.b.unittest.testSuite(function() { |
{ |
title: 'Total', |
sizes: [[47710208], [57671680], [27787264], [5767168], [32], |
- [8912896], [7340032], [0], [8388608], [1], [5242880], |
- [3670016]], |
+ [8912896], [15728640], [7340032], [0], [8388608], [1], |
+ [5242880], [3670016]], |
contexts: undefined |
} |
], |
@@ -258,7 +260,7 @@ tr.b.unittest.testSuite(function() { |
title: colorLegendMatcher('Process 1'), |
sizes: [[31457280, 29884416, undefined], undefined, |
[10485760, 9437184, undefined], [8388608, 5767168, undefined], |
- undefined, undefined, undefined, undefined, |
+ undefined, undefined, undefined, undefined, undefined, |
[undefined, 7340032, undefined], undefined, undefined, |
[undefined, 2097152, undefined]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 1) |
@@ -268,15 +270,16 @@ tr.b.unittest.testSuite(function() { |
sizes: [[19398656, 17825792, 15728640], |
[40370176, 39845888, 40894464], [18350080, 18350080, 18350080], |
[0, 0, -2621440], [32, 32, 64], [10485760, 8912896, 7340032], |
- [undefined, 7340032, 6291456], [undefined, 0, 1048576], |
- [2097152, 1048576, 786432], [undefined, 1, undefined], |
- [5242880, 5242880, 5767168], [1048576, 1572864, 2097152]], |
+ [15728640, 15728640, 15728640], [undefined, 7340032, 6291456], |
+ [undefined, 0, 1048576], [2097152, 1048576, 786432], |
+ [undefined, 1, undefined], [5242880, 5242880, 5767168], |
+ [1048576, 1572864, 2097152]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 2) |
}, |
{ |
title: colorLegendMatcher('Process 3'), |
sizes: [undefined, undefined, undefined, undefined, undefined, |
- undefined, undefined, undefined, undefined, |
+ undefined, undefined, undefined, undefined, undefined, |
[2147483648, undefined, 1073741824], |
[1073741824, undefined, 2147483648], undefined], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 3) |
@@ -285,7 +288,7 @@ tr.b.unittest.testSuite(function() { |
title: colorLegendMatcher('Process 4'), |
sizes: [undefined, [undefined, 17825792, 17825792], undefined, |
undefined, undefined, undefined, undefined, undefined, |
- undefined, undefined, undefined, undefined], |
+ undefined, undefined, undefined, undefined, undefined], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 4) |
} |
], |
@@ -295,9 +298,10 @@ tr.b.unittest.testSuite(function() { |
sizes: [[50855936, 47710208, 15728640], |
[40370176, 57671680, 58720256], [28835840, 27787264, 18350080], |
[8388608, 5767168, -2621440], [32, 32, 64], |
- [10485760, 8912896, 7340032], [undefined, 7340032, 6291456], |
- [undefined, 0, 1048576], [2097152, 8388608, 786432], |
- [2147483648, 1, 1073741824], [1078984704, 5242880, 2153250816], |
+ [10485760, 8912896, 7340032], [15728640, 15728640, 15728640], |
+ [undefined, 7340032, 6291456], [undefined, 0, 1048576], |
+ [2097152, 8388608, 786432], [2147483648, 1, 1073741824], |
+ [1078984704, 5242880, 2153250816], |
[1048576, 3670016, 2097152]], |
contexts: undefined |
} |
@@ -314,7 +318,8 @@ tr.b.unittest.testSuite(function() { |
{ |
title: colorLegendMatcher('Process 2'), |
sizes: [[17825792], [39845888], [18350080], [0], [32], [8912896], |
- [7340032], [0], [1048576], [1], [5242880], [1572864]], |
+ [15728640], [7340032], [0], [1048576], [1], [5242880], |
+ [1572864]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 2) |
} |
], |
@@ -333,9 +338,10 @@ tr.b.unittest.testSuite(function() { |
sizes: [[19398656, 17825792, 15728640], |
[40370176, 39845888, 40894464], [18350080, 18350080, 18350080], |
[0, 0, -2621440], [32, 32, 64], [10485760, 8912896, 7340032], |
- [undefined, 7340032, 6291456], [undefined, 0, 1048576], |
- [2097152, 1048576, 786432], [undefined, 1, undefined], |
- [5242880, 5242880, 5767168], [1048576, 1572864, 2097152]], |
+ [15728640, 15728640, 15728640], [undefined, 7340032, 6291456], |
+ [undefined, 0, 1048576], [2097152, 1048576, 786432], |
+ [undefined, 1, undefined], [5242880, 5242880, 5767168], |
+ [1048576, 1572864, 2097152]], |
contexts: extractProcessMemoryDumps(processMemoryDumps, 2) |
} |
], |
@@ -358,7 +364,7 @@ tr.b.unittest.testSuite(function() { |
// Simulate clicking on the 'malloc' cell of the second process. |
table.selectedTableRow = table.tableRows[1]; |
- table.selectedColumnIndex = 9; |
+ table.selectedColumnIndex = 10; |
assert.lengthOf(viewEl.requestedChildPanes, 2); |
let lastChildPane = viewEl.requestedChildPanes[1]; |
assert.strictEqual( |
@@ -469,7 +475,7 @@ tr.b.unittest.testSuite(function() { |
// Select the 'v8' column of the first process (empty cell). |
table.selectedTableRow = table.tableRows[0]; |
- table.selectedColumnIndex = 10; |
+ table.selectedColumnIndex = 11; |
}); |
simulateView( |