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

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

Issue 1505243003: Revert of Create RenderSurface on Effect Tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@alwayspt
Patch Set: rebase Created 5 years 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/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.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_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after
772 Layer* root_scroll = FindFirstScrollableLayer(root_layer); 772 Layer* root_scroll = FindFirstScrollableLayer(root_layer);
773 Layer* page_scale_layer = page_scale_layer_.get(); 773 Layer* page_scale_layer = page_scale_layer_.get();
774 if (!page_scale_layer && root_scroll) 774 if (!page_scale_layer && root_scroll)
775 page_scale_layer = root_scroll->parent(); 775 page_scale_layer = root_scroll->parent();
776 776
777 if (hud_layer_.get()) { 777 if (hud_layer_.get()) {
778 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(), 778 hud_layer_->PrepareForCalculateDrawProperties(device_viewport_size(),
779 device_scale_factor_); 779 device_scale_factor_);
780 } 780 }
781 781
782 bool can_render_to_separate_surface = true;
782 783
783 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps"); 784 TRACE_EVENT0("cc", "LayerTreeHost::UpdateLayers::CalcDrawProps");
784 785
785 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer); 786 LayerTreeHostCommon::PreCalculateMetaInformation(root_layer);
786 787
788 bool preserves_2d_axis_alignment = false;
787 gfx::Transform identity_transform; 789 gfx::Transform identity_transform;
788 LayerList update_layer_list; 790 LayerList update_layer_list;
789 791
792 LayerTreeHostCommon::UpdateRenderSurfaces(
793 root_layer, can_render_to_separate_surface, identity_transform,
794 preserves_2d_axis_alignment);
790 { 795 {
791 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), 796 TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
792 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees"); 797 "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees");
793 bool can_render_to_separate_surface = true;
794 BuildPropertyTreesAndComputeVisibleRects( 798 BuildPropertyTreesAndComputeVisibleRects(
795 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(), 799 root_layer, page_scale_layer, inner_viewport_scroll_layer_.get(),
796 outer_viewport_scroll_layer_.get(), overscroll_elasticity_layer_.get(), 800 outer_viewport_scroll_layer_.get(), overscroll_elasticity_layer_.get(),
797 elastic_overscroll_, page_scale_factor_, device_scale_factor_, 801 elastic_overscroll_, page_scale_factor_, device_scale_factor_,
798 gfx::Rect(device_viewport_size_), identity_transform, 802 gfx::Rect(device_viewport_size_), identity_transform,
799 can_render_to_separate_surface, &property_trees_, &update_layer_list); 803 can_render_to_separate_surface, &property_trees_, &update_layer_list);
800 } 804 }
801 805
802 for (const auto& layer : update_layer_list) 806 for (const auto& layer : update_layer_list)
803 layer->SavePaintProperties(); 807 layer->SavePaintProperties();
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1255 return compositor_mode_ == CompositorMode::SingleThreaded; 1259 return compositor_mode_ == CompositorMode::SingleThreaded;
1256 } 1260 }
1257 1261
1258 bool LayerTreeHost::IsThreaded() const { 1262 bool LayerTreeHost::IsThreaded() const {
1259 DCHECK(compositor_mode_ != CompositorMode::Threaded || 1263 DCHECK(compositor_mode_ != CompositorMode::Threaded ||
1260 task_runner_provider_->HasImplThread()); 1264 task_runner_provider_->HasImplThread());
1261 return compositor_mode_ == CompositorMode::Threaded; 1265 return compositor_mode_ == CompositorMode::Threaded;
1262 } 1266 }
1263 1267
1264 } // namespace cc 1268 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/draw_property_utils.cc ('k') | cc/trees/layer_tree_host_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698