| 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_impl.h" | 5 #include "cc/trees/layer_tree_host_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1409 | 1409 |
| 1410 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); | 1410 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); |
| 1411 | 1411 |
| 1412 return metadata; | 1412 return metadata; |
| 1413 } | 1413 } |
| 1414 | 1414 |
| 1415 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { | 1415 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { |
| 1416 layer->DidBeginTracing(); | 1416 layer->DidBeginTracing(); |
| 1417 } | 1417 } |
| 1418 | 1418 |
| 1419 void LayerTreeHostImpl::DrawLayers(FrameData* frame) { | 1419 void LayerTreeHostImpl::DrawLayers(FrameData* frame, |
| 1420 base::TimeTicks frame_begin_time) { |
| 1420 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); | 1421 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); |
| 1421 DCHECK(CanDraw()); | 1422 DCHECK(CanDraw()); |
| 1422 | 1423 |
| 1423 if (frame->has_no_damage) { | 1424 if (frame->has_no_damage) { |
| 1424 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); | 1425 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); |
| 1425 DCHECK(!output_surface_->capabilities() | 1426 DCHECK(!output_surface_->capabilities() |
| 1426 .draw_and_swap_full_viewport_every_frame); | 1427 .draw_and_swap_full_viewport_every_frame); |
| 1427 return; | 1428 return; |
| 1428 } | 1429 } |
| 1429 | 1430 |
| 1430 DCHECK(!frame->render_passes.empty()); | 1431 DCHECK(!frame->render_passes.empty()); |
| 1431 | 1432 |
| 1432 fps_counter_->SaveTimeStamp(CurrentFrameTimeTicks(), | 1433 fps_counter_->SaveTimeStamp(frame_begin_time, |
| 1433 !output_surface_->context_provider()); | 1434 !output_surface_->context_provider()); |
| 1434 bool on_main_thread = false; | 1435 bool on_main_thread = false; |
| 1435 rendering_stats_instrumentation_->IncrementFrameCount( | 1436 rendering_stats_instrumentation_->IncrementFrameCount( |
| 1436 1, on_main_thread); | 1437 1, on_main_thread); |
| 1437 | 1438 |
| 1438 if (tile_manager_) { | 1439 if (tile_manager_) { |
| 1439 memory_history_->SaveEntry( | 1440 memory_history_->SaveEntry( |
| 1440 tile_manager_->memory_stats_from_last_assign()); | 1441 tile_manager_->memory_stats_from_last_assign()); |
| 1441 } | 1442 } |
| 1442 | 1443 |
| (...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3257 } | 3258 } |
| 3258 | 3259 |
| 3259 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3260 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3260 std::vector<PictureLayerImpl*>::iterator it = | 3261 std::vector<PictureLayerImpl*>::iterator it = |
| 3261 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3262 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3262 DCHECK(it != picture_layers_.end()); | 3263 DCHECK(it != picture_layers_.end()); |
| 3263 picture_layers_.erase(it); | 3264 picture_layers_.erase(it); |
| 3264 } | 3265 } |
| 3265 | 3266 |
| 3266 } // namespace cc | 3267 } // namespace cc |
| OLD | NEW |