Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: tracing/tracing/model/process.html

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration
Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tracing/tracing/model/power_series_test.html ('k') | tracing/tracing/model/process_base.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <!-- 2 <!--
3 Copyright (c) 2013 The Chromium Authors. All rights reserved. 3 Copyright (c) 2013 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/model/process_base.html"> 8 <link rel="import" href="/tracing/model/process_base.html">
9 <link rel="import" href="/tracing/model/process_memory_dump.html"> 9 <link rel="import" href="/tracing/model/process_memory_dump.html">
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 __proto__: tr.model.ProcessBase.prototype, 66 __proto__: tr.model.ProcessBase.prototype,
67 67
68 get stableId() { 68 get stableId() {
69 return this.pid; 69 return this.pid;
70 }, 70 },
71 71
72 compareTo: function(that) { 72 compareTo: function(that) {
73 return Process.compare(this, that); 73 return Process.compare(this, that);
74 }, 74 },
75 75
76 childEvents: function*(eventTypePredicate, opt_this) { 76 childEvents: function*() {
77 yield * ProcessBase.prototype.childEvents.call( 77 yield * ProcessBase.prototype.childEvents.call(this);
78 this, eventTypePredicate, opt_this); 78 yield * this.instantEvents;
79 79 yield * this.frames;
80 if (eventTypePredicate.call(opt_this, ProcessInstantEvent)) 80 yield * this.memoryDumps;
81 yield * this.instantEvents;
82
83 if (eventTypePredicate.call(opt_this, Frame))
84 yield * this.frames;
85
86 if (eventTypePredicate.call(opt_this, ProcessMemoryDump))
87 yield * this.memoryDumps;
88 }, 81 },
89 82
90 addLabelIfNeeded: function(labelName) { 83 addLabelIfNeeded: function(labelName) {
91 for (var i = 0; i < this.labels.length; i++) { 84 for (var i = 0; i < this.labels.length; i++) {
92 if (this.labels[i] === labelName) 85 if (this.labels[i] === labelName)
93 return; 86 return;
94 } 87 }
95 this.labels.push(labelName); 88 this.labels.push(labelName);
96 }, 89 },
97 90
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 this.memoryDumps); 151 this.memoryDumps);
159 } 152 }
160 }; 153 };
161 154
162 return { 155 return {
163 Process: Process 156 Process: Process
164 }; 157 };
165 }); 158 });
166 </script> 159 </script>
167 160
OLDNEW
« no previous file with comments | « tracing/tracing/model/power_series_test.html ('k') | tracing/tracing/model/process_base.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698