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

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

Issue 2026033002: cc: Remove can_use_lcd_text from draw properties (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('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_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 const gfx::Size& device_viewport_size, 71 const gfx::Size& device_viewport_size,
72 const gfx::Transform& device_transform, 72 const gfx::Transform& device_transform,
73 float device_scale_factor, 73 float device_scale_factor,
74 float page_scale_factor, 74 float page_scale_factor,
75 const LayerImpl* page_scale_layer, 75 const LayerImpl* page_scale_layer,
76 const LayerImpl* inner_viewport_scroll_layer, 76 const LayerImpl* inner_viewport_scroll_layer,
77 const LayerImpl* outer_viewport_scroll_layer, 77 const LayerImpl* outer_viewport_scroll_layer,
78 const gfx::Vector2dF& elastic_overscroll, 78 const gfx::Vector2dF& elastic_overscroll,
79 const LayerImpl* elastic_overscroll_application_layer, 79 const LayerImpl* elastic_overscroll_application_layer,
80 int max_texture_size, 80 int max_texture_size,
81 bool can_use_lcd_text,
82 bool layers_always_allowed_lcd_text,
83 bool can_render_to_separate_surface, 81 bool can_render_to_separate_surface,
84 bool can_adjust_raster_scales, 82 bool can_adjust_raster_scales,
85 bool verify_clip_tree_calculations, 83 bool verify_clip_tree_calculations,
86 LayerImplList* render_surface_layer_list, 84 LayerImplList* render_surface_layer_list,
87 PropertyTrees* property_trees) 85 PropertyTrees* property_trees)
88 : root_layer(root_layer), 86 : root_layer(root_layer),
89 device_viewport_size(device_viewport_size), 87 device_viewport_size(device_viewport_size),
90 device_transform(device_transform), 88 device_transform(device_transform),
91 device_scale_factor(device_scale_factor), 89 device_scale_factor(device_scale_factor),
92 page_scale_factor(page_scale_factor), 90 page_scale_factor(page_scale_factor),
93 page_scale_layer(page_scale_layer), 91 page_scale_layer(page_scale_layer),
94 inner_viewport_scroll_layer(inner_viewport_scroll_layer), 92 inner_viewport_scroll_layer(inner_viewport_scroll_layer),
95 outer_viewport_scroll_layer(outer_viewport_scroll_layer), 93 outer_viewport_scroll_layer(outer_viewport_scroll_layer),
96 elastic_overscroll(elastic_overscroll), 94 elastic_overscroll(elastic_overscroll),
97 elastic_overscroll_application_layer( 95 elastic_overscroll_application_layer(
98 elastic_overscroll_application_layer), 96 elastic_overscroll_application_layer),
99 max_texture_size(max_texture_size), 97 max_texture_size(max_texture_size),
100 can_use_lcd_text(can_use_lcd_text),
101 layers_always_allowed_lcd_text(layers_always_allowed_lcd_text),
102 can_render_to_separate_surface(can_render_to_separate_surface), 98 can_render_to_separate_surface(can_render_to_separate_surface),
103 can_adjust_raster_scales(can_adjust_raster_scales), 99 can_adjust_raster_scales(can_adjust_raster_scales),
104 verify_clip_tree_calculations(verify_clip_tree_calculations), 100 verify_clip_tree_calculations(verify_clip_tree_calculations),
105 render_surface_layer_list(render_surface_layer_list), 101 render_surface_layer_list(render_surface_layer_list),
106 property_trees(property_trees) {} 102 property_trees(property_trees) {}
107 103
108 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: 104 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting::
109 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, 105 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer,
110 const gfx::Size& device_viewport_size, 106 const gfx::Size& device_viewport_size,
111 const gfx::Transform& device_transform, 107 const gfx::Transform& device_transform,
112 LayerImplList* render_surface_layer_list) 108 LayerImplList* render_surface_layer_list)
113 : CalcDrawPropsImplInputs(root_layer, 109 : CalcDrawPropsImplInputs(root_layer,
114 device_viewport_size, 110 device_viewport_size,
115 device_transform, 111 device_transform,
116 1.f, 112 1.f,
117 1.f, 113 1.f,
118 NULL, 114 NULL,
119 NULL, 115 NULL,
120 NULL, 116 NULL,
121 gfx::Vector2dF(), 117 gfx::Vector2dF(),
122 NULL, 118 NULL,
123 std::numeric_limits<int>::max() / 2, 119 std::numeric_limits<int>::max() / 2,
124 false,
125 false,
126 true, 120 true,
127 false, 121 false,
128 true, 122 true,
129 render_surface_layer_list, 123 render_surface_layer_list,
130 GetPropertyTrees(root_layer)) { 124 GetPropertyTrees(root_layer)) {
131 DCHECK(root_layer); 125 DCHECK(root_layer);
132 DCHECK(render_surface_layer_list); 126 DCHECK(render_surface_layer_list);
133 } 127 }
134 128
135 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: 129 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting::
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 } 581 }
588 582
589 if (should_measure_property_tree_performance) { 583 if (should_measure_property_tree_performance) {
590 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), 584 TRACE_EVENT_BEGIN0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
591 "LayerTreeHostCommon::CalculateDrawProperties"); 585 "LayerTreeHostCommon::CalculateDrawProperties");
592 } 586 }
593 587
594 DCHECK(inputs->can_render_to_separate_surface == 588 DCHECK(inputs->can_render_to_separate_surface ==
595 inputs->property_trees->non_root_surfaces_enabled); 589 inputs->property_trees->non_root_surfaces_enabled);
596 for (LayerImpl* layer : visible_layer_list) { 590 for (LayerImpl* layer : visible_layer_list) {
597 draw_property_utils::ComputeLayerDrawProperties( 591 draw_property_utils::ComputeLayerDrawProperties(layer,
598 layer, inputs->property_trees, inputs->layers_always_allowed_lcd_text, 592 inputs->property_trees);
599 inputs->can_use_lcd_text);
600 if (layer->mask_layer()) 593 if (layer->mask_layer())
601 ComputeMaskLayerDrawProperties(layer, layer->mask_layer()); 594 ComputeMaskLayerDrawProperties(layer, layer->mask_layer());
602 LayerImpl* replica_mask_layer = 595 LayerImpl* replica_mask_layer =
603 layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr; 596 layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr;
604 if (replica_mask_layer) 597 if (replica_mask_layer)
605 ComputeMaskLayerDrawProperties(layer, replica_mask_layer); 598 ComputeMaskLayerDrawProperties(layer, replica_mask_layer);
606 } 599 }
607 600
608 CalculateRenderSurfaceLayerList( 601 CalculateRenderSurfaceLayerList(
609 inputs->root_layer->layer_tree_impl(), inputs->property_trees, 602 inputs->root_layer->layer_tree_impl(), inputs->property_trees,
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 697
705 PropertyTrees* GetPropertyTrees(Layer* layer) { 698 PropertyTrees* GetPropertyTrees(Layer* layer) {
706 return layer->layer_tree_host()->property_trees(); 699 return layer->layer_tree_host()->property_trees();
707 } 700 }
708 701
709 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { 702 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
710 return layer->layer_tree_impl()->property_trees(); 703 return layer->layer_tree_impl()->property_trees();
711 } 704 }
712 705
713 } // namespace cc 706 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698