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

Side by Side Diff: cc/layers/render_surface_impl.cc

Issue 2571263002: cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex (Closed)
Patch Set: Fix post-rebase unit test failure Created 3 years, 11 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/layers/render_surface_impl.h ('k') | cc/layers/render_surface_unittest.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/layers/render_surface_impl.h" 5 #include "cc/layers/render_surface_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 17 matching lines...) Expand all
28 #include "third_party/skia/include/core/SkImageFilter.h" 28 #include "third_party/skia/include/core/SkImageFilter.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 29 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/transform.h" 30 #include "ui/gfx/transform.h"
31 31
32 namespace cc { 32 namespace cc {
33 33
34 RenderSurfaceImpl::RenderSurfaceImpl(LayerImpl* owning_layer) 34 RenderSurfaceImpl::RenderSurfaceImpl(LayerImpl* owning_layer)
35 : owning_layer_(owning_layer), 35 : owning_layer_(owning_layer),
36 layer_tree_impl_(owning_layer->layer_tree_impl()), 36 layer_tree_impl_(owning_layer->layer_tree_impl()),
37 stable_effect_id_(owning_layer->id()), 37 stable_effect_id_(owning_layer->id()),
38 effect_tree_index_(EffectTree::kInvalidNodeId),
38 surface_property_changed_(false), 39 surface_property_changed_(false),
39 ancestor_property_changed_(false), 40 ancestor_property_changed_(false),
40 contributes_to_drawn_surface_(false), 41 contributes_to_drawn_surface_(false),
41 nearest_occlusion_immune_ancestor_(nullptr), 42 nearest_occlusion_immune_ancestor_(nullptr),
42 target_render_surface_layer_index_history_(0), 43 target_render_surface_layer_index_history_(0),
43 current_layer_index_history_(0) { 44 current_layer_index_history_(0) {
44 damage_tracker_ = DamageTracker::Create(); 45 damage_tracker_ = DamageTracker::Create();
45 } 46 }
46 47
47 RenderSurfaceImpl::~RenderSurfaceImpl() {} 48 RenderSurfaceImpl::~RenderSurfaceImpl() {}
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 153
153 int RenderSurfaceImpl::TransformTreeIndex() const { 154 int RenderSurfaceImpl::TransformTreeIndex() const {
154 return owning_layer_->transform_tree_index(); 155 return owning_layer_->transform_tree_index();
155 } 156 }
156 157
157 int RenderSurfaceImpl::ClipTreeIndex() const { 158 int RenderSurfaceImpl::ClipTreeIndex() const {
158 return owning_layer_->clip_tree_index(); 159 return owning_layer_->clip_tree_index();
159 } 160 }
160 161
161 int RenderSurfaceImpl::EffectTreeIndex() const { 162 int RenderSurfaceImpl::EffectTreeIndex() const {
162 return layer_tree_impl_->property_trees() 163 DCHECK_EQ(effect_tree_index_,
163 ->effect_id_to_index_map[stable_effect_id_]; 164 layer_tree_impl_->property_trees()
165 ->effect_id_to_index_map[stable_effect_id_]);
166 return effect_tree_index_;
164 } 167 }
165 168
166 const EffectNode* RenderSurfaceImpl::OwningEffectNode() const { 169 const EffectNode* RenderSurfaceImpl::OwningEffectNode() const {
167 return layer_tree_impl_->property_trees()->effect_tree.Node( 170 return layer_tree_impl_->property_trees()->effect_tree.Node(
168 EffectTreeIndex()); 171 EffectTreeIndex());
169 } 172 }
170 173
171 void RenderSurfaceImpl::SetClipRect(const gfx::Rect& clip_rect) { 174 void RenderSurfaceImpl::SetClipRect(const gfx::Rect& clip_rect) {
172 if (clip_rect == draw_properties_.clip_rect) 175 if (clip_rect == draw_properties_.clip_rect)
173 return; 176 return;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 396
394 RenderPassDrawQuad* quad = 397 RenderPassDrawQuad* quad =
395 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 398 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
396 quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect, 399 quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect,
397 GetRenderPassId(), mask_resource_id, mask_uv_scale, 400 GetRenderPassId(), mask_resource_id, mask_uv_scale,
398 mask_texture_size, owning_layer_to_target_scale, 401 mask_texture_size, owning_layer_to_target_scale,
399 FiltersOrigin()); 402 FiltersOrigin());
400 } 403 }
401 404
402 } // namespace cc 405 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/render_surface_impl.h ('k') | cc/layers/render_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698