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

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

Issue 1357423009: gfx: Make conversions from Size to SizeF be explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sizefconvert-gfx: . Created 5 years, 2 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/viewport.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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 215
216 ResourceId mask_resource_id = 0; 216 ResourceId mask_resource_id = 0;
217 gfx::Size mask_texture_size; 217 gfx::Size mask_texture_size;
218 gfx::Vector2dF mask_uv_scale; 218 gfx::Vector2dF mask_uv_scale;
219 if (mask_layer && mask_layer->DrawsContent() && 219 if (mask_layer && mask_layer->DrawsContent() &&
220 !mask_layer->bounds().IsEmpty()) { 220 !mask_layer->bounds().IsEmpty()) {
221 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size); 221 mask_layer->GetContentsResourceId(&mask_resource_id, &mask_texture_size);
222 gfx::Vector2dF owning_layer_draw_scale = 222 gfx::Vector2dF owning_layer_draw_scale =
223 MathUtil::ComputeTransform2dScaleComponents( 223 MathUtil::ComputeTransform2dScaleComponents(
224 owning_layer_->draw_transform(), 1.f); 224 owning_layer_->draw_transform(), 1.f);
225 gfx::SizeF unclipped_mask_target_size = 225 gfx::SizeF unclipped_mask_target_size = gfx::ScaleSize(
226 gfx::ScaleSize(owning_layer_->bounds(), owning_layer_draw_scale.x(), 226 gfx::SizeF(owning_layer_->bounds()), owning_layer_draw_scale.x(),
227 owning_layer_draw_scale.y()); 227 owning_layer_draw_scale.y());
228 mask_uv_scale = gfx::Vector2dF( 228 mask_uv_scale = gfx::Vector2dF(
229 content_rect_.width() / unclipped_mask_target_size.width(), 229 content_rect_.width() / unclipped_mask_target_size.width(),
230 content_rect_.height() / unclipped_mask_target_size.height()); 230 content_rect_.height() / unclipped_mask_target_size.height());
231 } 231 }
232 232
233 DCHECK(owning_layer_->draw_properties().target_space_transform.IsScale2d()); 233 DCHECK(owning_layer_->draw_properties().target_space_transform.IsScale2d());
234 gfx::Vector2dF owning_layer_to_target_scale = 234 gfx::Vector2dF owning_layer_to_target_scale =
235 owning_layer_->draw_properties().target_space_transform.Scale2d(); 235 owning_layer_->draw_properties().target_space_transform.Scale2d();
236 236
237 RenderPassDrawQuad* quad = 237 RenderPassDrawQuad* quad =
238 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); 238 render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
239 quad->SetNew(shared_quad_state, content_rect_, visible_layer_rect, 239 quad->SetNew(shared_quad_state, content_rect_, visible_layer_rect,
240 render_pass_id, mask_resource_id, mask_uv_scale, 240 render_pass_id, mask_resource_id, mask_uv_scale,
241 mask_texture_size, owning_layer_->filters(), 241 mask_texture_size, owning_layer_->filters(),
242 owning_layer_to_target_scale, 242 owning_layer_to_target_scale,
243 owning_layer_->background_filters()); 243 owning_layer_->background_filters());
244 } 244 }
245 245
246 } // namespace cc 246 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/layers/viewport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698