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_impl.h" | 5 #include "cc/trees/layer_tree_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 "SourceFrameNumber", | 483 "SourceFrameNumber", |
484 source_frame_number_); | 484 source_frame_number_); |
485 LayerImpl* page_scale_layer = | 485 LayerImpl* page_scale_layer = |
486 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); | 486 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); |
487 bool can_render_to_separate_surface = | 487 bool can_render_to_separate_surface = |
488 (layer_tree_host_impl_->GetDrawMode() != | 488 (layer_tree_host_impl_->GetDrawMode() != |
489 DRAW_MODE_RESOURCELESS_SOFTWARE); | 489 DRAW_MODE_RESOURCELESS_SOFTWARE); |
490 | 490 |
491 ++render_surface_layer_list_id_; | 491 ++render_surface_layer_list_id_; |
492 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( | 492 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
493 root_layer(), DrawViewportSize(), | 493 root_layer(), |
494 layer_tree_host_impl_->DrawTransform(), device_scale_factor(), | 494 DrawViewportSize(), |
495 total_page_scale_factor(), page_scale_layer, | 495 layer_tree_host_impl_->DrawTransform(), |
496 resource_provider()->max_texture_size(), settings().can_use_lcd_text, | 496 device_scale_factor(), |
497 settings().layers_always_allowed_lcd_text, | 497 total_page_scale_factor(), |
| 498 page_scale_layer, |
| 499 resource_provider()->max_texture_size(), |
| 500 settings().can_use_lcd_text, |
498 can_render_to_separate_surface, | 501 can_render_to_separate_surface, |
499 settings().layer_transforms_should_scale_layer_contents, | 502 settings().layer_transforms_should_scale_layer_contents, |
500 &render_surface_layer_list_, render_surface_layer_list_id_); | 503 &render_surface_layer_list_, |
| 504 render_surface_layer_list_id_); |
501 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 505 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
502 } | 506 } |
503 | 507 |
504 { | 508 { |
505 TRACE_EVENT_BEGIN2("cc", "LayerTreeImpl::UpdateTilePriorities", "IsActive", | 509 TRACE_EVENT_BEGIN2("cc", "LayerTreeImpl::UpdateTilePriorities", "IsActive", |
506 IsActiveTree(), "SourceFrameNumber", | 510 IsActiveTree(), "SourceFrameNumber", |
507 source_frame_number_); | 511 source_frame_number_); |
508 scoped_ptr<OcclusionTracker<LayerImpl>> occlusion_tracker; | 512 scoped_ptr<OcclusionTracker<LayerImpl>> occlusion_tracker; |
509 if (settings().use_occlusion_for_tile_prioritization) { | 513 if (settings().use_occlusion_for_tile_prioritization) { |
510 occlusion_tracker.reset(new OcclusionTracker<LayerImpl>( | 514 occlusion_tracker.reset(new OcclusionTracker<LayerImpl>( |
(...skipping 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1515 page_scale, | 1519 page_scale, |
1516 duration.InSecondsF()); | 1520 duration.InSecondsF()); |
1517 } | 1521 } |
1518 } | 1522 } |
1519 | 1523 |
1520 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { | 1524 scoped_ptr<PageScaleAnimation> LayerTreeImpl::TakePageScaleAnimation() { |
1521 return page_scale_animation_.Pass(); | 1525 return page_scale_animation_.Pass(); |
1522 } | 1526 } |
1523 | 1527 |
1524 } // namespace cc | 1528 } // namespace cc |
OLD | NEW |