Revert 86489 (SkScalara asserts on Mac unit_tests) - 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

Review URL: http://codereview.chromium.org/7067031

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/7065040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86495 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -16,7 +16,7 @@ vars = {
   "libjingle_revision": "59",
   "libvpx_revision": "81610",
   "ffmpeg_revision": "83815",
-  "skia_revision": "1410",
+  "skia_revision": "1402",
   "v8_revision": "8003",
 }
 

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, SkDoubleToScalar(1.5), SkDoubleToScalar(1.5), inner_paint);
+      inner_rect, SkIntToScalar(1.5), SkIntToScalar(1.5), inner_paint);
 }
 
 }  // namespace

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) -
-                                   SkIntToScalar(badge_width / 2)));
+                                   SkIntToScalar(bounds.width() / 2.0) -
+                                   SkIntToScalar(badge_width / 2.0)));
     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());