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

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

Issue 1647573002: cc cleanup: simplify mask_uv_scale and MaskUVRect(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 gfx::Transform owning_layer_draw_transform = owning_layer_->DrawTransform(); 230 gfx::Transform owning_layer_draw_transform = owning_layer_->DrawTransform();
231 if (mask_layer && mask_layer->DrawsContent() && 231 if (mask_layer && mask_layer->DrawsContent() &&
232 !mask_layer->bounds().IsEmpty()) { 232 !mask_layer->bounds().IsEmpty()) {
233 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size); 233 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
234 gfx::Vector2dF owning_layer_draw_scale = 234 gfx::Vector2dF owning_layer_draw_scale =
235 MathUtil::ComputeTransform2dScaleComponents(owning_layer_draw_transform, 235 MathUtil::ComputeTransform2dScaleComponents(owning_layer_draw_transform,
236 1.f); 236 1.f);
237 gfx::SizeF unclipped_mask_target_size = gfx::ScaleSize( 237 gfx::SizeF unclipped_mask_target_size = gfx::ScaleSize(
238 gfx::SizeF(owning_layer_->bounds()), owning_layer_draw_scale.x(), 238 gfx::SizeF(owning_layer_->bounds()), owning_layer_draw_scale.x(),
239 owning_layer_draw_scale.y()); 239 owning_layer_draw_scale.y());
240 mask_uv_scale = gfx::Vector2dF( 240 mask_uv_scale = gfx::Vector2dF(1.0f / unclipped_mask_target_size.width(),
241 content_rect_.width() / unclipped_mask_target_size.width(), 241 1.0f / unclipped_mask_target_size.height());
242 content_rect_.height() / unclipped_mask_target_size.height());
243 } 242 }
244 243
245 DCHECK(owning_layer_draw_transform.IsScale2d()); 244 DCHECK(owning_layer_draw_transform.IsScale2d());
246 gfx::Vector2dF owning_layer_to_target_scale = 245 gfx::Vector2dF owning_layer_to_target_scale =
247 owning_layer_draw_transform.Scale2d(); 246 owning_layer_draw_transform.Scale2d();
248 247
249 RenderPassDrawQuad* quad = 248 RenderPassDrawQuad* quad =
250 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 249 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
251 quad->SetNew(shared_quad_state, content_rect_, visible_layer_rect, 250 quad->SetNew(shared_quad_state, content_rect_, visible_layer_rect,
252 render_pass_id, mask_resource_id, mask_uv_scale, 251 render_pass_id, mask_resource_id, mask_uv_scale,
253 mask_texture_size, owning_layer_->filters(), 252 mask_texture_size, owning_layer_->filters(),
254 owning_layer_to_target_scale, 253 owning_layer_to_target_scale,
255 owning_layer_->background_filters()); 254 owning_layer_->background_filters());
256 } 255 }
257 256
258 } // namespace cc 257 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/render_surface_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698