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

Unified Diff: cc/layers/delegated_renderer_layer_impl.cc

Issue 1314943008: cc: Remove implicit conversions from Rect to RectF in src/cc/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rectfconvert-cc: rebase-and-sandwich-strategy Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl.cc
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index 9235af5a82691ed78bf1ad34b4d7d5203dab6d31..9b3a513206c17431d8ce0e110f8d2b2da940702b 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -87,7 +87,7 @@ void DelegatedRendererLayerImpl::CreateChildIdIfNeeded(
void DelegatedRendererLayerImpl::SetFrameData(
const DelegatedFrameData* frame_data,
- const gfx::RectF& damage_in_frame) {
+ const gfx::Rect& damage_in_frame) {
DCHECK(child_id_) << "CreateChildIdIfNeeded must be called first.";
DCHECK(frame_data);
DCHECK(!frame_data->render_pass_list.empty());
@@ -153,11 +153,10 @@ void DelegatedRendererLayerImpl::SetFrameData(
// the frame, so intersect the damage to the layer's bounds.
RenderPass* new_root_pass = render_pass_list.back();
gfx::Size frame_size = new_root_pass->output_rect.size();
- gfx::RectF damage_in_layer = damage_in_frame;
- damage_in_layer.Scale(inverse_device_scale_factor_);
+ gfx::Rect damage_in_layer =
+ gfx::ScaleToEnclosingRect(damage_in_frame, inverse_device_scale_factor_);
SetUpdateRect(gfx::IntersectRects(
- gfx::UnionRects(update_rect(), gfx::ToEnclosingRect(damage_in_layer)),
- gfx::Rect(bounds())));
+ gfx::UnionRects(update_rect(), damage_in_layer), gfx::Rect(bounds())));
SetRenderPasses(&render_pass_list);
have_render_passes_to_push_ = true;
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698