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

Unified Diff: cc/trees/draw_property_utils.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: Created 5 years, 4 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
Index: cc/trees/draw_property_utils.cc
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index 2481e2dc14bfc69580acbdcfabac8f012e1aab22..a91fc4d11b0f1c1c581dac80ba1a6683e2f561d3 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -862,16 +862,15 @@ bool CanUseLcdTextFromPropertyTrees(const LayerImpl* layer,
gfx::Rect DrawableContentRectOfSurfaceFromPropertyTrees(
const RenderSurfaceImpl* render_surface,
const TransformTree& transform_tree) {
- gfx::Rect drawable_content_rect =
- gfx::ToEnclosingRect(MathUtil::MapClippedRect(
- DrawTransformOfRenderSurfaceFromPropertyTrees(render_surface,
- transform_tree),
- render_surface->content_rect_from_property_trees()));
+ gfx::Rect drawable_content_rect = MathUtil::MapEnclosingClippedRect(
+ DrawTransformOfRenderSurfaceFromPropertyTrees(render_surface,
+ transform_tree),
+ render_surface->content_rect_from_property_trees());
if (render_surface->HasReplica()) {
- drawable_content_rect.Union(gfx::ToEnclosingRect(MathUtil::MapClippedRect(
+ drawable_content_rect.Union(MathUtil::MapEnclosingClippedRect(
DrawTransformOfRenderSurfaceReplicaFromPropertyTrees(render_surface,
transform_tree),
- render_surface->content_rect_from_property_trees())));
+ render_surface->content_rect_from_property_trees()));
}
return drawable_content_rect;
}

Powered by Google App Engine
This is Rietveld 408576698