| 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 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1382 | 1382 |
| 1383 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); | 1383 metadata.root_scroll_offset = active_tree_->TotalScrollOffset(); |
| 1384 | 1384 |
| 1385 return metadata; | 1385 return metadata; |
| 1386 } | 1386 } |
| 1387 | 1387 |
| 1388 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { | 1388 static void LayerTreeHostImplDidBeginTracingCallback(LayerImpl* layer) { |
| 1389 layer->DidBeginTracing(); | 1389 layer->DidBeginTracing(); |
| 1390 } | 1390 } |
| 1391 | 1391 |
| 1392 void LayerTreeHostImpl::DrawLayers(FrameData* frame, | 1392 void LayerTreeHostImpl::DrawLayers(FrameData* frame) { |
| 1393 base::TimeTicks frame_begin_time) { | |
| 1394 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); | 1393 TRACE_EVENT0("cc", "LayerTreeHostImpl::DrawLayers"); |
| 1395 DCHECK(CanDraw()); | 1394 DCHECK(CanDraw()); |
| 1396 | 1395 |
| 1397 if (frame->has_no_damage) { | 1396 if (frame->has_no_damage) { |
| 1398 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); | 1397 TRACE_EVENT_INSTANT0("cc", "EarlyOut_NoDamage", TRACE_EVENT_SCOPE_THREAD); |
| 1399 DCHECK(!output_surface_->capabilities() | 1398 DCHECK(!output_surface_->capabilities() |
| 1400 .draw_and_swap_full_viewport_every_frame); | 1399 .draw_and_swap_full_viewport_every_frame); |
| 1401 return; | 1400 return; |
| 1402 } | 1401 } |
| 1403 | 1402 |
| 1404 DCHECK(!frame->render_passes.empty()); | 1403 DCHECK(!frame->render_passes.empty()); |
| 1405 | 1404 |
| 1406 fps_counter_->SaveTimeStamp(frame_begin_time, | 1405 fps_counter_->SaveTimeStamp(current_frame_timeticks_, |
| 1407 !output_surface_->context_provider()); | 1406 !output_surface_->context_provider()); |
| 1408 bool on_main_thread = false; | 1407 bool on_main_thread = false; |
| 1409 rendering_stats_instrumentation_->IncrementFrameCount( | 1408 rendering_stats_instrumentation_->IncrementFrameCount( |
| 1410 1, on_main_thread); | 1409 1, on_main_thread); |
| 1411 | 1410 |
| 1412 if (tile_manager_) { | 1411 if (tile_manager_) { |
| 1413 memory_history_->SaveEntry( | 1412 memory_history_->SaveEntry( |
| 1414 tile_manager_->memory_stats_from_last_assign()); | 1413 tile_manager_->memory_stats_from_last_assign()); |
| 1415 } | 1414 } |
| 1416 | 1415 |
| (...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3152 } | 3151 } |
| 3153 | 3152 |
| 3154 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { | 3153 void LayerTreeHostImpl::UnregisterPictureLayerImpl(PictureLayerImpl* layer) { |
| 3155 std::vector<PictureLayerImpl*>::iterator it = | 3154 std::vector<PictureLayerImpl*>::iterator it = |
| 3156 std::find(picture_layers_.begin(), picture_layers_.end(), layer); | 3155 std::find(picture_layers_.begin(), picture_layers_.end(), layer); |
| 3157 DCHECK(it != picture_layers_.end()); | 3156 DCHECK(it != picture_layers_.end()); |
| 3158 picture_layers_.erase(it); | 3157 picture_layers_.erase(it); |
| 3159 } | 3158 } |
| 3160 | 3159 |
| 3161 } // namespace cc | 3160 } // namespace cc |
| OLD | NEW |