BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 6 insertions, 6 deletions

diff --git a/chromium/third_party/skia/gm/dashcircle.cpp b/chromium/third_party/skia/gm/dashcircle.cpp
index c6d03048175..7942b34bb11 100644
--- a/chromium/third_party/skia/gm/dashcircle.cpp
+++ b/chromium/third_party/skia/gm/dashcircle.cpp
@@ -50,7 +50,7 @@ protected:
         SkPaint refPaint;
         refPaint.setAntiAlias(true);
         refPaint.setColor(0xFFbf3f7f);
-        refPaint.setStyle(SkPaint::kStroke_Style);
+        refPaint.setStroke(true);
         refPaint.setStrokeWidth(1);
         const SkScalar radius = 125;
         SkRect oval = SkRect::MakeLTRB(-radius - 20, -radius - 20, radius + 20, radius + 20);
@@ -85,7 +85,7 @@ protected:
                 canvas->restore();
                 SkPaint p;
                 p.setAntiAlias(true);
-                p.setStyle(SkPaint::kStroke_Style);
+                p.setStroke(true);
                 p.setStrokeWidth(10);
                 SkScalar intervals[4];
                 int intervalCount = dashExample.length;
@@ -175,10 +175,10 @@ protected:
         rotate.setRotate(25.f);
         static const SkMatrix kMatrices[]{
                 SkMatrix::I(),
-                SkMatrix::MakeScale(1.2f),
+            SkMatrix::Scale(1.2f, 1.2f),
                 SkMatrix::MakeAll(1, 0, 0, 0, -1, 0, 0, 0, 1),  // y flipper
                 SkMatrix::MakeAll(-1, 0, 0, 0, 1, 0, 0, 0, 1),  // x flipper
-                SkMatrix::MakeScale(0.7f),
+            SkMatrix::Scale(0.7f, 0.7f),
                 rotate,
                 SkMatrix::Concat(
                         SkMatrix::Concat(SkMatrix::MakeAll(-1, 0, 0, 0, 1, 0, 0, 0, 1), rotate),
@@ -188,7 +188,7 @@ protected:
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStrokeWidth(kStrokeWidth);
-        paint.setStyle(SkPaint::kStroke_Style);
+        paint.setStroke(true);
 
         // Compute the union of bounds of all of our test cases.
         SkRect bounds = SkRect::MakeEmpty();
@@ -242,7 +242,7 @@ DEF_SIMPLE_GM(maddash, canvas, 1600, 1600) {
     SkPaint p;
     p.setColor(SK_ColorRED);
     p.setAntiAlias(true);
-    p.setStyle(SkPaint::kStroke_Style);
+    p.setStroke(true);
     p.setStrokeWidth(380);
 
     SkScalar intvls[] = { 2.5, 10 /* 1200 */ };