Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Side by Side Diff: cc/trees/layer_tree_impl.cc

Issue 1062403002: cc: Plumbing for storing property trees (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix perf test compile failure Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_common_perftest.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 10
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 TRACE_EVENT2( 536 TRACE_EVENT2(
537 "cc", "LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties", 537 "cc", "LayerTreeImpl::UpdateDrawProperties::CalculateDrawProperties",
538 "IsActive", IsActiveTree(), "SourceFrameNumber", source_frame_number_); 538 "IsActive", IsActiveTree(), "SourceFrameNumber", source_frame_number_);
539 LayerImpl* page_scale_layer = 539 LayerImpl* page_scale_layer =
540 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer(); 540 page_scale_layer_ ? page_scale_layer_ : InnerViewportContainerLayer();
541 bool can_render_to_separate_surface = 541 bool can_render_to_separate_surface =
542 (layer_tree_host_impl_->GetDrawMode() != 542 (layer_tree_host_impl_->GetDrawMode() !=
543 DRAW_MODE_RESOURCELESS_SOFTWARE); 543 DRAW_MODE_RESOURCELESS_SOFTWARE);
544 544
545 ++render_surface_layer_list_id_; 545 ++render_surface_layer_list_id_;
546
547 // TODO(enne): Synchronize property trees to compositor thread and use
548 // them here.
549 PropertyTrees* property_trees = nullptr;
546 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( 550 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
547 root_layer(), DrawViewportSize(), 551 root_layer(), DrawViewportSize(),
548 layer_tree_host_impl_->DrawTransform(), device_scale_factor(), 552 layer_tree_host_impl_->DrawTransform(), device_scale_factor(),
549 current_page_scale_factor(), page_scale_layer, 553 current_page_scale_factor(), page_scale_layer,
550 elastic_overscroll()->Current(IsActiveTree()), 554 elastic_overscroll()->Current(IsActiveTree()),
551 overscroll_elasticity_layer_, resource_provider()->max_texture_size(), 555 overscroll_elasticity_layer_, resource_provider()->max_texture_size(),
552 settings().can_use_lcd_text, settings().layers_always_allowed_lcd_text, 556 settings().can_use_lcd_text, settings().layers_always_allowed_lcd_text,
553 can_render_to_separate_surface, 557 can_render_to_separate_surface,
554 settings().layer_transforms_should_scale_layer_contents, 558 settings().layer_transforms_should_scale_layer_contents,
555 settings().verify_property_trees, 559 settings().verify_property_trees, &render_surface_layer_list_,
556 &render_surface_layer_list_, render_surface_layer_list_id_); 560 render_surface_layer_list_id_, property_trees);
557 LayerTreeHostCommon::CalculateDrawProperties(&inputs); 561 LayerTreeHostCommon::CalculateDrawProperties(&inputs);
558 } 562 }
559 563
560 { 564 {
561 TRACE_EVENT2("cc", "LayerTreeImpl::UpdateDrawProperties::Occlusion", 565 TRACE_EVENT2("cc", "LayerTreeImpl::UpdateDrawProperties::Occlusion",
562 "IsActive", IsActiveTree(), "SourceFrameNumber", 566 "IsActive", IsActiveTree(), "SourceFrameNumber",
563 source_frame_number_); 567 source_frame_number_);
564 OcclusionTracker<LayerImpl> occlusion_tracker( 568 OcclusionTracker<LayerImpl> occlusion_tracker(
565 root_layer()->render_surface()->content_rect()); 569 root_layer()->render_surface()->content_rect());
566 occlusion_tracker.set_minimum_tracking_size( 570 occlusion_tracker.set_minimum_tracking_size(
(...skipping 996 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 scoped_ptr<PendingPageScaleAnimation> pending_animation) { 1567 scoped_ptr<PendingPageScaleAnimation> pending_animation) {
1564 pending_page_scale_animation_ = pending_animation.Pass(); 1568 pending_page_scale_animation_ = pending_animation.Pass();
1565 } 1569 }
1566 1570
1567 scoped_ptr<PendingPageScaleAnimation> 1571 scoped_ptr<PendingPageScaleAnimation>
1568 LayerTreeImpl::TakePendingPageScaleAnimation() { 1572 LayerTreeImpl::TakePendingPageScaleAnimation() {
1569 return pending_page_scale_animation_.Pass(); 1573 return pending_page_scale_animation_.Pass();
1570 } 1574 }
1571 1575
1572 } // namespace cc 1576 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common_perftest.cc ('k') | cc/trees/property_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698