summaryrefslogtreecommitdiffstats
path: root/cc/debug/debug_rect_history.cc
diff options
context:
space:
mode:
authorbokan <bokan@chromium.org>2014-10-08 08:15:22 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-08 15:15:44 +0000
commitcccfde7dac913451d92e9cd44e3d77a7f913be43 (patch)
treed83e9cf51df8ba8cce53716591ac7ceafbe8dea8 /cc/debug/debug_rect_history.cc
parent6efe7f2e63509864dc9378a7af86721aecd8e15e (diff)
downloadchromium_src-cccfde7dac913451d92e9cd44e3d77a7f913be43.zip
chromium_src-cccfde7dac913451d92e9cd44e3d77a7f913be43.tar.gz
chromium_src-cccfde7dac913451d92e9cd44e3d77a7f913be43.tar.bz2
Revert of "Converted LayerImpl::bounds() to return SizeF."
Seems this was more contentious than originally anticipated. Reverting this until we have consensus on how to go forward. TBR=aelias@chromium.org,enne@chromium.org,danakj@chromium.org BUG= Review URL: https://codereview.chromium.org/637913003 Cr-Commit-Position: refs/heads/master@{#298710}
Diffstat (limited to 'cc/debug/debug_rect_history.cc')
-rw-r--r--cc/debug/debug_rect_history.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/debug/debug_rect_history.cc b/cc/debug/debug_rect_history.cc
index 71611a6..e8792e7 100644
--- a/cc/debug/debug_rect_history.cc
+++ b/cc/debug/debug_rect_history.cc
@@ -78,9 +78,9 @@ void DebugRectHistory::SavePaintRects(LayerImpl* layer) {
if (!layer->update_rect().IsEmpty() && layer->DrawsContent()) {
float width_scale = layer->content_bounds().width() /
- layer->bounds().width();
+ static_cast<float>(layer->bounds().width());
float height_scale = layer->content_bounds().height() /
- layer->bounds().height();
+ static_cast<float>(layer->bounds().height());
gfx::Rect update_content_rect = gfx::ScaleToEnclosingRect(
gfx::ToEnclosingRect(layer->update_rect()), width_scale, height_scale);
debug_rects_.push_back(