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

Unified Diff: content/renderer/render_widget.cc

Issue 11081007: Remove implicit flooring Scale() method from Point and Size. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git try -b win_rel,mac_rel,linux_rel,linux_aura Created 8 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 9c9901c4515c1cf94ed5ea937950c411bd7f54af..1db7762998f872cc97784c3ce3452f6ff17b3b4a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -38,6 +38,7 @@
#include "ui/gfx/point.h"
#include "ui/gfx/rect_conversions.h"
#include "ui/gfx/size.h"
+#include "ui/gfx/size_conversions.h"
#include "ui/gfx/skia_util.h"
#include "ui/gl/gl_switches.h"
#include "ui/surface/transport_dib.h"
@@ -1494,8 +1495,10 @@ void RenderWidget::OnMsgPaintAtSize(const TransportDIB::Handle& dib_handle,
scoped_ptr<TransportDIB> paint_at_size_buffer(
TransportDIB::CreateWithHandle(dib_handle));
- gfx::Size page_size_in_pixel = page_size.Scale(device_scale_factor_);
- gfx::Size desired_size_in_pixel = desired_size.Scale(device_scale_factor_);
+ gfx::Size page_size_in_pixel = gfx::ToFlooredSize(
+ page_size.Scale(device_scale_factor_));
+ gfx::Size desired_size_in_pixel = gfx::ToFlooredSize(
+ desired_size.Scale(device_scale_factor_));
gfx::Size canvas_size = page_size_in_pixel;
float x_scale = static_cast<float>(desired_size_in_pixel.width()) /
static_cast<float>(canvas_size.width());

Powered by Google App Engine
This is Rietveld 408576698