OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <!-- | 2 <!-- |
3 Copyright 2017 The Chromium Authors. All rights reserved. | 3 Copyright 2017 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/value/diagnostics/diagnostic.html"> | 8 <link rel="import" href="/tracing/value/diagnostics/diagnostic.html"> |
9 | 9 |
10 <script> | 10 <script> |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 } | 60 } |
61 | 61 |
62 mergeRelationships(otherDiagnostic, parentHist, otherParentHist) { | 62 mergeRelationships(otherDiagnostic, parentHist, otherParentHist) { |
63 if (otherDiagnostic instanceof UnmergeableDiagnosticSet) { | 63 if (otherDiagnostic instanceof UnmergeableDiagnosticSet) { |
64 for (const subDiagnostic of otherDiagnostic) { | 64 for (const subDiagnostic of otherDiagnostic) { |
65 this.mergeRelationships(subDiagnostic, parentHist, otherParentHist); | 65 this.mergeRelationships(subDiagnostic, parentHist, otherParentHist); |
66 } | 66 } |
67 return; | 67 return; |
68 } | 68 } |
69 for (const subDiagnostic of this) { | 69 for (const subDiagnostic of this) { |
70 if (!(subDiagnostic instanceof tr.v.d.RelatedHistogramSet) && | 70 if (!(subDiagnostic instanceof tr.v.d.RelatedHistogramMap) && |
71 !(subDiagnostic instanceof tr.v.d.RelatedHistogramMap) && | |
72 !(subDiagnostic instanceof tr.v.d.RelatedHistogramBreakdown)) { | 71 !(subDiagnostic instanceof tr.v.d.RelatedHistogramBreakdown)) { |
73 continue; | 72 continue; |
74 } | 73 } |
75 subDiagnostic.mergeRelationships( | 74 subDiagnostic.mergeRelationships( |
76 otherDiagnostic, parentHist, otherParentHist); | 75 otherDiagnostic, parentHist, otherParentHist); |
77 } | 76 } |
78 } | 77 } |
79 | 78 |
80 get length() { | 79 get length() { |
81 return this._diagnostics.length; | 80 return this._diagnostics.length; |
(...skipping 16 matching lines...) Expand all Loading... |
98 | 97 |
99 tr.v.d.Diagnostic.register(UnmergeableDiagnosticSet, { | 98 tr.v.d.Diagnostic.register(UnmergeableDiagnosticSet, { |
100 elementName: 'tr-v-ui-unmergeable-diagnostic-set-span' | 99 elementName: 'tr-v-ui-unmergeable-diagnostic-set-span' |
101 }); | 100 }); |
102 | 101 |
103 return { | 102 return { |
104 UnmergeableDiagnosticSet, | 103 UnmergeableDiagnosticSet, |
105 }; | 104 }; |
106 }); | 105 }); |
107 </script> | 106 </script> |
OLD | NEW |