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

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

Issue 1175113010: cc: Rename visible_content_rect and content stuff on quads. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename-visible-content-rect: moreandroid Created 5 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/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/render_surface_impl_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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 } 150 }
151 151
152 void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass, 152 void RenderSurfaceImpl::AppendQuads(RenderPass* render_pass,
153 const gfx::Transform& draw_transform, 153 const gfx::Transform& draw_transform,
154 const Occlusion& occlusion_in_content_space, 154 const Occlusion& occlusion_in_content_space,
155 SkColor debug_border_color, 155 SkColor debug_border_color,
156 float debug_border_width, 156 float debug_border_width,
157 LayerImpl* mask_layer, 157 LayerImpl* mask_layer,
158 AppendQuadsData* append_quads_data, 158 AppendQuadsData* append_quads_data,
159 RenderPassId render_pass_id) { 159 RenderPassId render_pass_id) {
160 gfx::Rect visible_content_rect = 160 gfx::Rect visible_layer_rect =
161 occlusion_in_content_space.GetUnoccludedContentRect(content_rect_); 161 occlusion_in_content_space.GetUnoccludedContentRect(content_rect_);
162 if (visible_content_rect.IsEmpty()) 162 if (visible_layer_rect.IsEmpty())
163 return; 163 return;
164 164
165 SharedQuadState* shared_quad_state = 165 SharedQuadState* shared_quad_state =
166 render_pass->CreateAndAppendSharedQuadState(); 166 render_pass->CreateAndAppendSharedQuadState();
167 shared_quad_state->SetAll(draw_transform, content_rect_.size(), content_rect_, 167 shared_quad_state->SetAll(draw_transform, content_rect_.size(), content_rect_,
168 clip_rect_, is_clipped_, draw_opacity_, 168 clip_rect_, is_clipped_, draw_opacity_,
169 owning_layer_->blend_mode(), 169 owning_layer_->blend_mode(),
170 owning_layer_->sorting_context_id()); 170 owning_layer_->sorting_context_id());
171 171
172 if (owning_layer_->ShowDebugBorders()) { 172 if (owning_layer_->ShowDebugBorders()) {
173 DebugBorderDrawQuad* debug_border_quad = 173 DebugBorderDrawQuad* debug_border_quad =
174 render_pass->CreateAndAppendDrawQuad<DebugBorderDrawQuad>(); 174 render_pass->CreateAndAppendDrawQuad<DebugBorderDrawQuad>();
175 debug_border_quad->SetNew(shared_quad_state, content_rect_, 175 debug_border_quad->SetNew(shared_quad_state, content_rect_,
176 visible_content_rect, debug_border_color, 176 visible_layer_rect, debug_border_color,
177 debug_border_width); 177 debug_border_width);
178 } 178 }
179 179
180 ResourceId mask_resource_id = 0; 180 ResourceId mask_resource_id = 0;
181 gfx::Size mask_texture_size; 181 gfx::Size mask_texture_size;
182 gfx::Vector2dF mask_uv_scale; 182 gfx::Vector2dF mask_uv_scale;
183 if (mask_layer && mask_layer->DrawsContent() && 183 if (mask_layer && mask_layer->DrawsContent() &&
184 !mask_layer->bounds().IsEmpty()) { 184 !mask_layer->bounds().IsEmpty()) {
185 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size); 185 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
186 gfx::Vector2dF owning_layer_draw_scale = 186 gfx::Vector2dF owning_layer_draw_scale =
187 MathUtil::ComputeTransform2dScaleComponents( 187 MathUtil::ComputeTransform2dScaleComponents(
188 owning_layer_->draw_transform(), 1.f); 188 owning_layer_->draw_transform(), 1.f);
189 gfx::SizeF unclipped_mask_target_size = 189 gfx::SizeF unclipped_mask_target_size =
190 gfx::ScaleSize(owning_layer_->bounds(), owning_layer_draw_scale.x(), 190 gfx::ScaleSize(owning_layer_->bounds(), owning_layer_draw_scale.x(),
191 owning_layer_draw_scale.y()); 191 owning_layer_draw_scale.y());
192 mask_uv_scale = gfx::Vector2dF( 192 mask_uv_scale = gfx::Vector2dF(
193 content_rect_.width() / unclipped_mask_target_size.width(), 193 content_rect_.width() / unclipped_mask_target_size.width(),
194 content_rect_.height() / unclipped_mask_target_size.height()); 194 content_rect_.height() / unclipped_mask_target_size.height());
195 } 195 }
196 196
197 DCHECK(owning_layer_->draw_properties().target_space_transform.IsScale2d()); 197 DCHECK(owning_layer_->draw_properties().target_space_transform.IsScale2d());
198 gfx::Vector2dF owning_layer_to_target_scale = 198 gfx::Vector2dF owning_layer_to_target_scale =
199 owning_layer_->draw_properties().target_space_transform.Scale2d(); 199 owning_layer_->draw_properties().target_space_transform.Scale2d();
200 200
201 RenderPassDrawQuad* quad = 201 RenderPassDrawQuad* quad =
202 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 202 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
203 quad->SetNew(shared_quad_state, 203 quad->SetNew(shared_quad_state, content_rect_, visible_layer_rect,
204 content_rect_, 204 render_pass_id, mask_resource_id, mask_uv_scale,
205 visible_content_rect, 205 mask_texture_size, owning_layer_->filters(),
206 render_pass_id,
207 mask_resource_id,
208 mask_uv_scale,
209 mask_texture_size,
210 owning_layer_->filters(),
211 owning_layer_to_target_scale, 206 owning_layer_to_target_scale,
212 owning_layer_->background_filters()); 207 owning_layer_->background_filters());
213 } 208 }
214 209
215 } // namespace cc 210 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698