BASELINE: Update Chromium to 85.0.4183.14085-based

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

5 files changed, 35 insertions, 25 deletions

diff --git a/chromium/third_party/skia/include/effects/SkBlurDrawLooper.h b/chromium/third_party/skia/include/effects/SkBlurDrawLooper.h
index 4a1ae83142a..77d9ae50c92 100644
--- a/chromium/third_party/skia/include/effects/SkBlurDrawLooper.h
+++ b/chromium/third_party/skia/include/effects/SkBlurDrawLooper.h
@@ -5,15 +5,13 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkBlurDrawLooper_DEFINED
 #define SkBlurDrawLooper_DEFINED
 
 #include "include/core/SkDrawLooper.h"
 
 /**
- *  Draws a shadow of the object (possibly offset), and then draws the original object in
- *  its original position.
+ *  DEPRECATED: No longer supported in Skia.
  */
 namespace SkBlurDrawLooper {
     sk_sp<SkDrawLooper> SK_API Make(SkColor4f color, SkColorSpace* cs,
diff --git a/chromium/third_party/skia/include/effects/SkLayerDrawLooper.h b/chromium/third_party/skia/include/effects/SkLayerDrawLooper.h
index 8d10e8c2d63..f11727e5e32 100644
--- a/chromium/third_party/skia/include/effects/SkLayerDrawLooper.h
+++ b/chromium/third_party/skia/include/effects/SkLayerDrawLooper.h
@@ -13,6 +13,9 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkPoint.h"
 
+/**
+ *  DEPRECATED: No longer supported by Skia.
+ */
 class SK_API SkLayerDrawLooper : public SkDrawLooper {
 public:
     ~SkLayerDrawLooper() override;
diff --git a/chromium/third_party/skia/include/effects/SkLumaColorFilter.h b/chromium/third_party/skia/include/effects/SkLumaColorFilter.h
index 038461d3d2c..0d6eacb0ae2 100644
--- a/chromium/third_party/skia/include/effects/SkLumaColorFilter.h
+++ b/chromium/third_party/skia/include/effects/SkLumaColorFilter.h
@@ -30,30 +30,14 @@ class SkRasterPipeline;
  *  not luminance, a dot-product of linear color channels.  So at least
  *  SkLumaColorFilter and feColorMatrix+luminanceToAlpha agree there.)
  */
-
- #include "include/core/SkFlattenable.h"
-
-class SK_API SkLumaColorFilter : public SkColorFilter {
+class SK_API SkLumaColorFilter {
 public:
     static sk_sp<SkColorFilter> Make();
 
-#if SK_SUPPORT_GPU
-    std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(GrRecordingContext*,
-                                                             const GrColorInfo&) const override;
-#endif
-
-protected:
-    void flatten(SkWriteBuffer&) const override;
-
 private:
-    SK_FLATTENABLE_HOOKS(SkLumaColorFilter)
-
-    SkLumaColorFilter();
-    bool onAppendStages(const SkStageRec& rec, bool shaderIsOpaque) const override;
-    skvm::Color onProgram(skvm::Builder*, skvm::Color,
-                          SkColorSpace* dstCS, skvm::Uniforms*, SkArenaAlloc*) const override;
+    friend class SkFlattenable;
 
-    typedef SkColorFilter INHERITED;
+    static void RegisterFlattenable();
 };
 
 #endif
diff --git a/chromium/third_party/skia/include/effects/SkRuntimeEffect.h b/chromium/third_party/skia/include/effects/SkRuntimeEffect.h
index 3d812523d55..d570de6a013 100644
--- a/chromium/third_party/skia/include/effects/SkRuntimeEffect.h
+++ b/chromium/third_party/skia/include/effects/SkRuntimeEffect.h
@@ -95,9 +95,6 @@ public:
                                const SkMatrix* localMatrix,
                                bool isOpaque);
 
-    sk_sp<SkColorFilter> makeColorFilter(sk_sp<SkData> inputs,
-                                         sk_sp<SkColorFilter> children[],
-                                         size_t childCount);
     sk_sp<SkColorFilter> makeColorFilter(sk_sp<SkData> inputs);
 
     const SkString& source() const { return fSkSL; }
diff --git a/chromium/third_party/skia/include/effects/SkStrokeAndFillPathEffect.h b/chromium/third_party/skia/include/effects/SkStrokeAndFillPathEffect.h
new file mode 100644
index 00000000000..fbde6493340
--- /dev/null
+++ b/chromium/third_party/skia/include/effects/SkStrokeAndFillPathEffect.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2020 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkStrokeAndFillPathEffect_DEFINED
+#define SkStrokeAndFillPathEffect_DEFINED
+
+#include "include/core/SkPaint.h"
+#include "include/core/SkPathEffect.h"
+#include "include/pathops/SkPathOps.h"
+
+class SK_API SkStrokeAndFillPathEffect {
+public:
+    /*  If the paint is set to stroke, this will add the stroke and fill geometries
+     *  together (hoping that the winding-direction works out).
+     *
+     *  If the paint is set to fill, this effect is ignored.
+     *
+     *  Note that if the paint is set to stroke and the stroke-width is 0, then
+     *  this will turn the geometry into just a fill.
+     */
+    static sk_sp<SkPathEffect> Make();
+};
+
+#endif