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

Unified Diff: tracing/tracing/model/helpers/android_app.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
Index: tracing/tracing/model/helpers/android_app.html
diff --git a/tracing/tracing/model/helpers/android_app.html b/tracing/tracing/model/helpers/android_app.html
index 5831d0092293bd819f9002704369083a78fdff10..8504a34c98ed8a8af994dc388bae748ea7684500 100644
--- a/tracing/tracing/model/helpers/android_app.html
+++ b/tracing/tracing/model/helpers/android_app.html
@@ -4,10 +4,10 @@ Copyright (c) 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<link rel="import" href="/tracing/base/statistics.html">
+<link rel="import" href="/tracing/base/range_utils.html">
<link rel="import" href="/tracing/base/sorted_array_utils.html">
+<link rel="import" href="/tracing/base/statistics.html">
<link rel="import" href="/tracing/model/frame.html">
-<link rel="import" href="/tracing/base/range_utils.html">
<script>
'use strict';
@@ -230,10 +230,10 @@ tr.exportTo('tr.model.helpers', function() {
return [];
var slices = [];
- uiThread.asyncSliceGroup.iterateAllEvents(function(slice) {
+ for (var slice of uiThread.asyncSliceGroup.getDescendantEvents()) {
if (/^animator\:/.test(slice.title))
slices.push(slice);
- });
+ }
return slices;
}
« no previous file with comments | « tracing/tracing/model/global_memory_dump_test.html ('k') | tracing/tracing/model/helpers/chrome_browser_helper.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698