OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/trees/layer_tree_host.h" | 5 #include "cc/trees/layer_tree_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <stack> | 8 #include <stack> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
427 if (new_impl_tree_has_no_evicted_resources) { | 427 if (new_impl_tree_has_no_evicted_resources) { |
428 if (sync_tree->ContentsTexturesPurged()) | 428 if (sync_tree->ContentsTexturesPurged()) |
429 sync_tree->ResetContentsTexturesPurged(); | 429 sync_tree->ResetContentsTexturesPurged(); |
430 } | 430 } |
431 | 431 |
432 if (!settings_.impl_side_painting) { | 432 if (!settings_.impl_side_painting) { |
433 // If we're not in impl-side painting, the tree is immediately | 433 // If we're not in impl-side painting, the tree is immediately |
434 // considered active. | 434 // considered active. |
435 sync_tree->DidBecomeActive(); | 435 sync_tree->DidBecomeActive(); |
436 } | 436 } |
| 437 devtools_instrumentation::didCommitMainThreadFrame(tree_id_, |
| 438 source_frame_number_); |
437 | 439 |
438 source_frame_number_++; | 440 source_frame_number_++; |
439 } | 441 } |
440 | 442 |
441 void LayerTreeHost::WillCommit() { | 443 void LayerTreeHost::WillCommit() { |
442 client_->WillCommit(); | 444 client_->WillCommit(); |
443 } | 445 } |
444 | 446 |
445 void LayerTreeHost::UpdateHudLayer() { | 447 void LayerTreeHost::UpdateHudLayer() { |
446 if (debug_state_.ShowHudInfo()) { | 448 if (debug_state_.ShowHudInfo()) { |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 | 1276 |
1275 bool LayerTreeHost::ScheduleMicroBenchmark( | 1277 bool LayerTreeHost::ScheduleMicroBenchmark( |
1276 const std::string& benchmark_name, | 1278 const std::string& benchmark_name, |
1277 scoped_ptr<base::Value> value, | 1279 scoped_ptr<base::Value> value, |
1278 const MicroBenchmark::DoneCallback& callback) { | 1280 const MicroBenchmark::DoneCallback& callback) { |
1279 return micro_benchmark_controller_.ScheduleRun( | 1281 return micro_benchmark_controller_.ScheduleRun( |
1280 benchmark_name, value.Pass(), callback); | 1282 benchmark_name, value.Pass(), callback); |
1281 } | 1283 } |
1282 | 1284 |
1283 } // namespace cc | 1285 } // namespace cc |
OLD | NEW |