diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/create_application_shortcut_view.cc | 2 | ||||
| -rw-r--r-- | chrome/common/extensions/extension_action.cc | 4 | ||||
| -rw-r--r-- | skia/ext/canvas_paint_mac.h | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -16,7 +16,7 @@ vars = { "libjingle_revision": "59", "libvpx_revision": "81610", "ffmpeg_revision": "83815", - "skia_revision": "1402", + "skia_revision": "1410", "v8_revision": "8003", } diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index eef988f..8f714ad 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -187,7 +187,7 @@ void AppInfoView::OnPaint(gfx::Canvas* canvas) { inner_paint.setAntiAlias(true); inner_paint.setARGB(0xFF, 0xF8, 0xF8, 0xF8); canvas->AsCanvasSkia()->drawRoundRect( - inner_rect, SkIntToScalar(1.5), SkIntToScalar(1.5), inner_paint); + inner_rect, SkDoubleToScalar(1.5), SkDoubleToScalar(1.5), inner_paint); } } // namespace 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()); diff --git a/skia/ext/canvas_paint_mac.h b/skia/ext/canvas_paint_mac.h index fe73a8e..6cef9ba 100644 --- a/skia/ext/canvas_paint_mac.h +++ b/skia/ext/canvas_paint_mac.h @@ -89,8 +89,8 @@ class CanvasPaintT : public T { // Need to translate so that the dirty region appears at the origin of the // surface. - T::translate(-SkIntToScalar(rectangle_.origin.x), - -SkIntToScalar(rectangle_.origin.y)); + T::translate(-SkDoubleToScalar(rectangle_.origin.x), + -SkDoubleToScalar(rectangle_.origin.y)); context_ = T::getTopPlatformDevice().GetBitmapContext(); } |