SkScalarMul is deprecated

ui/gfx/render_text.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text.h"
 
 #include <limits.h>
 
 #include <algorithm>
 #include <climits>
@@ skipping 287 matching lines @@
   }
 }
 
 void SkiaTextRenderer::DrawUnderline(int x, int y, int width) {
   SkScalar x_scalar = SkIntToScalar(x);
   SkRect r = SkRect::MakeLTRB(
       x_scalar, y + underline_position_, x_scalar + width,
       y + underline_position_ + underline_thickness_);
   if (underline_thickness_ == kUnderlineMetricsNotSet) {
     const SkScalar text_size = flags_.getTextSize();
-    r.fTop = SkScalarMulAdd(text_size, kUnderlineOffset, y);
-    r.fBottom = r.fTop + SkScalarMul(text_size, kLineThickness);
+    r.fTop = text_size * kUnderlineOffset + y;
+    r.fBottom = r.fTop + text_size * kLineThickness;
   }
   canvas_skia_->drawRect(r, flags_);
 }
 
 void SkiaTextRenderer::DrawStrike(int x, int y, int width) const {
   const SkScalar text_size = flags_.getTextSize();
-  const SkScalar height = SkScalarMul(text_size, kLineThickness);
-  const SkScalar offset = SkScalarMulAdd(text_size, kStrikeThroughOffset, y);
+  const SkScalar height = text_size * kLineThickness;
+  const SkScalar offset = text_size * kStrikeThroughOffset + y;
   SkScalar x_scalar = SkIntToScalar(x);
   const SkRect r =
       SkRect::MakeLTRB(x_scalar, offset, x_scalar + width, offset + height);
   canvas_skia_->drawRect(r, flags_);
 }
 
 SkiaTextRenderer::DiagonalStrike::DiagonalStrike(Canvas* canvas,
                                                  Point start,
                                                  const cc::PaintFlags& flags)
     : canvas_(canvas), start_(start), flags_(flags), total_length_(0) {}
 
 SkiaTextRenderer::DiagonalStrike::~DiagonalStrike() {
 }
 
 void SkiaTextRenderer::DiagonalStrike::AddPiece(int length, SkColor color) {
   pieces_.push_back(Piece(length, color));
   total_length_ += length;
 }
 
 void SkiaTextRenderer::DiagonalStrike::Draw() {
   const SkScalar text_size = flags_.getTextSize();
-  const SkScalar offset = SkScalarMul(text_size, kDiagonalStrikeMarginOffset);
-  const int thickness =
-      SkScalarCeilToInt(SkScalarMul(text_size, kLineThickness) * 2);
+  const SkScalar offset = text_size * kDiagonalStrikeMarginOffset;
+  const int thickness = SkScalarCeilToInt(text_size * kLineThickness * 2);
   const int height = SkScalarCeilToInt(text_size - offset);
   const Point end = start_ + Vector2d(total_length_, -height);
   const int clip_height = height + 2 * thickness;
 
   flags_.setAntiAlias(true);
   flags_.setStrokeWidth(SkIntToScalar(thickness));
 
   const bool clipped = pieces_.size() > 1;
   int x = start_.x();
 
@@ skipping 1362 matching lines @@
 
   for (; range_max < length; ++range_max)
     if (iter.IsEndOfWord(range_max) || iter.IsStartOfWord(range_max))
       break;
 
   return range.is_reversed() ? Range(range_max, range_min)
                              : Range(range_min, range_max);
 }
 
 }  // namespace gfx