| 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 1387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1398 | 1398 |
| 1399 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); | 1399 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); |
| 1400 | 1400 |
| 1401 return metadata; | 1401 return metadata; |
| 1402 } | 1402 } |
| 1403 | 1403 |
| 1404 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { | 1404 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { |
| 1405 layer->DidBeginTracing(); | 1405 layer->DidBeginTracing(); |
| 1406 } | 1406 } |
| 1407 | 1407 |
| 1408 void LayerTreeHostImpl::DrawLayers(FrameData* frame, | 1408 void LayerTreeHostImpl::DrawLayers(FrameData* frame) { |
| 1409 base::TimeTicks frame_begin_time) { | |
| 1410 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); | 1409 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); |
| 1411 DCHECK(CanDraw()); | 1410 DCHECK(CanDraw()); |
| 1412 | 1411 |
| 1413 if (frame->has_no_damage) { | 1412 if (frame->has_no_damage) { |
| 1414 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); | 1413 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); |
| 1415 DCHECK(!output_surface_->capabilities() | 1414 DCHECK(!output_surface_->capabilities() |
| 1416 .draw_and_swap_full_viewport_every_frame); | 1415 .draw_and_swap_full_viewport_every_frame); |
| 1417 return; | 1416 return; |
| 1418 } | 1417 } |
| 1419 | 1418 |
| 1420 DCHECK(!frame->render_passes.empty()); | 1419 DCHECK(!frame->render_passes.empty()); |
| 1421 | 1420 |
| 1422 fps_counter_->SaveTimeStamp(frame_begin_time, | 1421 fps_counter_->SaveTimeStamp(current_frame_timeticks_, |
| 1423 !output_surface_->context_provider()); | 1422 !output_surface_->context_provider()); |
| 1424 bool on_main_thread = false; | 1423 bool on_main_thread = false; |
| 1425 rendering_stats_instrumentation_->IncrementFrameCount( | 1424 rendering_stats_instrumentation_->IncrementFrameCount( |
| 1426 1, on_main_thread); | 1425 1, on_main_thread); |
| 1427 | 1426 |
| 1428 if (tile_manager_) { | 1427 if (tile_manager_) { |
| 1429 memory_history_->SaveEntry( | 1428 memory_history_->SaveEntry( |
| 1430 tile_manager_->memory_stats_from_last_assign()); | 1429 tile_manager_->memory_stats_from_last_assign()); |
| 1431 } | 1430 } |
| 1432 | 1431 |
| (...skipping 1720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3153 } | 3152 } |
| 3154 | 3153 |
| 3155 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3154 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3156 std::vector<PictureLayerImpl*>::iterator it = | 3155 std::vector<PictureLayerImpl*>::iterator it = |
| 3157 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3156 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3158 DCHECK(it != picture_layers_.end()); | 3157 DCHECK(it != picture_layers_.end()); |
| 3159 picture_layers_.erase(it); | 3158 picture_layers_.erase(it); |
| 3160 } | 3159 } |
| 3161 | 3160 |
| 3162 } // namespace cc | 3161 } // namespace cc |
| OLD | NEW |