diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 01:53:21 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 01:53:21 +0000 |
| commit | fb3aaa444ab08bb83c84ce39694e39e729855856 (patch) | |
| tree | cb96e33159c74ab30b32c6aaa3717367d676d3fb /chrome/common | |
| parent | 8ff7f34d4f9aa91e8e7165e15f1e50b3f48cc875 (diff) | |
| download | chromium_src-fb3aaa444ab08bb83c84ce39694e39e729855856.zip chromium_src-fb3aaa444ab08bb83c84ce39694e39e729855856.tar.gz chromium_src-fb3aaa444ab08bb83c84ce39694e39e729855856.tar.bz2 | |
roll skia 1402:1410
http://code.google.com/p/skia/source/detail?r=1405 make SkIntToScalar more strict (it no longer allows double arguments), so the roll requires a minor code change.
BUG=none
TEST=none
TBR=epoger
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86489
Review URL: http://codereview.chromium.org/7067031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/extension_action.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index 0cb4a0f..ae39c5f 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -147,8 +147,8 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas, if (badge_width >= kCenterAlignThreshold) { rect.fLeft = SkIntToScalar( SkScalarFloor(SkIntToScalar(bounds.x()) + - SkIntToScalar(bounds.width() / 2.0) - - SkIntToScalar(badge_width / 2.0))); + SkIntToScalar(bounds.width()) / 2 - + SkIntToScalar(badge_width) / 2)); rect.fRight = rect.fLeft + SkIntToScalar(badge_width); } else { rect.fRight = SkIntToScalar(bounds.right()); |