| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 Copyright (c) 2015 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2015 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 <link rel="import" href="/tracing/base/base.html"> | 7 <link rel="import" href="/tracing/base/base.html"> |
| 8 <link rel="import" href="/tracing/core/test_utils.html"> | 8 <link rel="import" href="/tracing/core/test_utils.html"> |
| 9 <link rel="import" href="/tracing/model/model.html"> | 9 <link rel="import" href="/tracing/model/model.html"> |
| 10 | 10 |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 dict.type = tr.model.ThreadSlice; | 79 dict.type = tr.model.ThreadSlice; |
| 80 var slice = tr.c.TestUtils.newSliceEx(dict); | 80 var slice = tr.c.TestUtils.newSliceEx(dict); |
| 81 model.rendererMain.sliceGroup.pushSlice(slice); | 81 model.rendererMain.sliceGroup.pushSlice(slice); |
| 82 return slice; | 82 return slice; |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 ChromeTestUtils.addFrameEvent = function(model, dict) { | 85 ChromeTestUtils.addFrameEvent = function(model, dict) { |
| 86 dict.title = tr.model.helpers.IMPL_RENDERING_STATS; | 86 dict.title = tr.model.helpers.IMPL_RENDERING_STATS; |
| 87 dict.type = tr.model.ThreadSlice; | 87 dict.type = tr.model.ThreadSlice; |
| 88 var slice = tr.c.TestUtils.newSliceEx(dict); | 88 var slice = tr.c.TestUtils.newSliceEx(dict); |
| 89 model.rendererMain.asyncSliceGroup.push(slice); | 89 model.rendererMain.sliceGroup.pushSlice(slice); |
| 90 return slice; | 90 return slice; |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 ChromeTestUtils.addLoadingEvent = function(model, dict) { | 93 ChromeTestUtils.addLoadingEvent = function(model, dict) { |
| 94 dict.title = 'WebContentsImpl Loading'; | 94 dict.title = 'WebContentsImpl Loading'; |
| 95 var slice = tr.c.TestUtils.newAsyncSliceEx(dict); | 95 var slice = tr.c.TestUtils.newAsyncSliceEx(dict); |
| 96 model.rendererMain.asyncSliceGroup.push(slice); | 96 model.rendererMain.asyncSliceGroup.push(slice); |
| 97 return slice; | 97 return slice; |
| 98 }; | 98 }; |
| 99 | 99 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 var slice = tr.c.TestUtils.newSliceEx(dict); | 152 var slice = tr.c.TestUtils.newSliceEx(dict); |
| 153 model.rendererMain.sliceGroup.pushSlice(slice); | 153 model.rendererMain.sliceGroup.pushSlice(slice); |
| 154 return slice; | 154 return slice; |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 return { | 157 return { |
| 158 ChromeTestUtils: ChromeTestUtils | 158 ChromeTestUtils: ChromeTestUtils |
| 159 }; | 159 }; |
| 160 }); | 160 }); |
| 161 </script> | 161 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2162963002:
[polymer] Merge of master into polymer10-migration (Closed)
Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration