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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tracing/tracing/model/process.html
diff --git a/tracing/tracing/model/process.html b/tracing/tracing/model/process.html
index 2e64d225eb064d4e6b64520db0ef8646c6aeeec0..47ed41004271d6b2a362e2a155309366c8cf1f72 100644
--- a/tracing/tracing/model/process.html
+++ b/tracing/tracing/model/process.html
@@ -73,18 +73,11 @@ tr.exportTo('tr.model', function() {
return Process.compare(this, that);
},
- childEvents: function*(eventTypePredicate, opt_this) {
- yield * ProcessBase.prototype.childEvents.call(
- this, eventTypePredicate, opt_this);
-
- if (eventTypePredicate.call(opt_this, ProcessInstantEvent))
- yield * this.instantEvents;
-
- if (eventTypePredicate.call(opt_this, Frame))
- yield * this.frames;
-
- if (eventTypePredicate.call(opt_this, ProcessMemoryDump))
- yield * this.memoryDumps;
+ childEvents: function*() {
+ yield * ProcessBase.prototype.childEvents.call(this);
+ yield * this.instantEvents;
+ yield * this.frames;
+ yield * this.memoryDumps;
},
addLabelIfNeeded: function(labelName) {
« 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