chrome/browser/chromeos/status/network_menu_icon.cc - Issue 11081007: Remove implicit flooring Scale() method from Point and Size.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/status/network_menu_icon.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:

Index: chrome/browser/chromeos/status/network_menu_icon.cc

diff --git a/chrome/browser/chromeos/status/network_menu_icon.cc b/chrome/browser/chromeos/status/network_menu_icon.cc

index abd4580d7656a078f257b6d6a88c572003790183..0b712b7785adf5119ef695f0c990d22ca7de801a 100644

--- a/chrome/browser/chromeos/status/network_menu_icon.cc

+++ b/chrome/browser/chromeos/status/network_menu_icon.cc

@@ -19,6 +19,7 @@

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/image_skia_operations.h"

#include "ui/gfx/image/image_skia_source.h"

+#include "ui/gfx/size_conversions.h"

using std::max;

using std::min;

@@ -182,7 +183,8 @@ class EmptyImageSource: public gfx::ImageSkiaSource {

virtual gfx::ImageSkiaRep GetImageForScale(

ui::ScaleFactor scale_factor) OVERRIDE {

- gfx::Size pixel_size = size_.Scale(ui::GetScaleFactorScale(scale_factor));

+ gfx::Size pixel_size = gfx::ToFlooredSize(

+ size_.Scale(ui::GetScaleFactorScale(scale_factor)));

SkBitmap empty_bitmap = GetEmptyBitmap(pixel_size);

return gfx::ImageSkiaRep(empty_bitmap, scale_factor);

}