BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 2 insertions, 3 deletions

diff --git a/chromium/testing/libfuzzer/proto/skia_image_filter.proto b/chromium/testing/libfuzzer/proto/skia_image_filter.proto
index a495618439c..3448f551a57 100644
--- a/chromium/testing/libfuzzer/proto/skia_image_filter.proto
+++ b/chromium/testing/libfuzzer/proto/skia_image_filter.proto
@@ -350,7 +350,7 @@ message Paint {
   enum Style {
     kFill_Style = 0;
     kStroke_Style = 1;
-    kStrokeAndFill_Style = 2;
+    kStrokeAndFill_Style = 2;  // no longer needed/used
   }
 
   enum StrokeCap {
diff --git a/chromium/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc b/chromium/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc
index f6fece43fa9..46814c562a7 100644
--- a/chromium/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc
+++ b/chromium/testing/libfuzzer/proto/skia_image_filter_proto_converter.cc
@@ -949,8 +949,7 @@ void Converter::Visit(const Paint& paint) {
 
   if (stroke_style_used_) {
     style = Paint::kFill_Style;
-  } else if (style == Paint::kStrokeAndFill_Style ||
-             style == Paint::kStroke_Style) {
+  } else if (style == Paint::kStroke_Style) {
     stroke_style_used_ = true;
     // Avoid timeouts.
     stroke_cap = Paint::kButt_Cap;