Remove unused SkBlendMode arguments in *Box*Painter*

These argument are always SkBlendMode::kSrcOver, and are not used in the
end.

Change-Id: I1625bdced4601b3eec3de609063f331208282b0d
Reviewed-on: https://chromium-review.googlesource.com/c/1386789
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Cr-Commit-Position: refs/heads/master@{#618256}
diff --git a/third_party/blink/renderer/core/paint/box_painter_base.cc b/third_party/blink/renderer/core/paint/box_painter_base.cc
index 37dc1aa..562536a 100644
--- a/third_party/blink/renderer/core/paint/box_painter_base.cc
+++ b/third_party/blink/renderer/core/paint/box_painter_base.cc
@@ -28,8 +28,7 @@
                                      const FillLayer& fill_layer,
                                      const LayoutRect& rect,
                                      BackgroundImageGeometry& geometry,
-                                     BackgroundBleedAvoidance bleed,
-                                     SkBlendMode op) {
+                                     BackgroundBleedAvoidance bleed) {
   FillLayerOcclusionOutputList reversed_paint_list;
   bool should_draw_background_in_separate_buffer =
       CalculateFillLayerOcclusionCulling(reversed_paint_list, fill_layer);
@@ -43,7 +42,7 @@
 
   for (auto it = reversed_paint_list.rbegin(); it != reversed_paint_list.rend();
        ++it) {
-    PaintFillLayer(paint_info, c, **it, rect, bleed, geometry, op);
+    PaintFillLayer(paint_info, c, **it, rect, bleed, geometry);
   }
 
   if (should_draw_background_in_separate_buffer)
@@ -599,7 +598,6 @@
                                     const LayoutRect& rect,
                                     BackgroundBleedAvoidance bleed_avoidance,
                                     BackgroundImageGeometry& geometry,
-                                    SkBlendMode op,
                                     bool object_has_multiple_boxes,
                                     const LayoutSize flow_box_size) {
   GraphicsContext& context = paint_info.context;
diff --git a/third_party/blink/renderer/core/paint/box_painter_base.h b/third_party/blink/renderer/core/paint/box_painter_base.h
index fb43c43..19558c4 100644
--- a/third_party/blink/renderer/core/paint/box_painter_base.h
+++ b/third_party/blink/renderer/core/paint/box_painter_base.h
@@ -43,8 +43,7 @@
                        const FillLayer&,
                        const LayoutRect&,
                        BackgroundImageGeometry&,
-                       BackgroundBleedAvoidance = kBackgroundBleedNone,
-                       SkBlendMode = SkBlendMode::kSrcOver);
+                       BackgroundBleedAvoidance = kBackgroundBleedNone);
 
   void PaintFillLayer(const PaintInfo&,
                       const Color&,
@@ -52,7 +51,6 @@
                       const LayoutRect&,
                       BackgroundBleedAvoidance,
                       BackgroundImageGeometry&,
-                      SkBlendMode = SkBlendMode::kSrcOver,
                       bool object_has_multiple_boxes = false,
                       const LayoutSize flow_box_size = LayoutSize());
 
diff --git a/third_party/blink/renderer/core/paint/inline_box_painter_base.cc b/third_party/blink/renderer/core/paint/inline_box_painter_base.cc
index 5842732..4483ed5 100644
--- a/third_party/blink/renderer/core/paint/inline_box_painter_base.cc
+++ b/third_party/blink/renderer/core/paint/inline_box_painter_base.cc
@@ -66,16 +66,15 @@
                                            const FillLayer& layer,
                                            const LayoutRect& rect,
                                            BackgroundImageGeometry& geometry,
-                                           bool object_has_multiple_boxes,
-                                           SkBlendMode op) {
+                                           bool object_has_multiple_boxes) {
   // FIXME: This should be a for loop or similar. It's a little non-trivial to
   // do so, however, since the layers need to be painted in reverse order.
   if (layer.Next()) {
     PaintFillLayers(box_painter, info, c, *layer.Next(), rect, geometry,
-                    object_has_multiple_boxes, op);
+                    object_has_multiple_boxes);
   }
   PaintFillLayer(box_painter, info, c, layer, rect, geometry,
-                 object_has_multiple_boxes, op);
+                 object_has_multiple_boxes);
 }
 
 void InlineBoxPainterBase::PaintFillLayer(BoxPainterBase& box_painter,
@@ -84,15 +83,14 @@
                                           const FillLayer& fill_layer,
                                           const LayoutRect& paint_rect,
                                           BackgroundImageGeometry& geometry,
-                                          bool object_has_multiple_boxes,
-                                          SkBlendMode op) {
+                                          bool object_has_multiple_boxes) {
   StyleImage* img = fill_layer.GetImage();
   bool has_fill_image = img && img->CanRender();
 
   if (!object_has_multiple_boxes ||
       (!has_fill_image && !style_.HasBorderRadius())) {
     box_painter.PaintFillLayer(paint_info, c, fill_layer, paint_rect,
-                               kBackgroundBleedNone, geometry, op, false);
+                               kBackgroundBleedNone, geometry, false);
     return;
   }
 
@@ -105,7 +103,7 @@
   GraphicsContextStateSaver state_saver(paint_info.context);
   paint_info.context.Clip(PixelSnappedIntRect(paint_rect));
   box_painter.PaintFillLayer(paint_info, c, fill_layer, rect,
-                             kBackgroundBleedNone, geometry, op, multi_line,
+                             kBackgroundBleedNone, geometry, multi_line,
                              paint_rect.Size());
 }
 
diff --git a/third_party/blink/renderer/core/paint/inline_box_painter_base.h b/third_party/blink/renderer/core/paint/inline_box_painter_base.h
index 726ce1e..8452081 100644
--- a/third_party/blink/renderer/core/paint/inline_box_painter_base.h
+++ b/third_party/blink/renderer/core/paint/inline_box_painter_base.h
@@ -54,16 +54,14 @@
                        const FillLayer&,
                        const LayoutRect&,
                        BackgroundImageGeometry& geometry,
-                       bool object_has_multiple_boxes,
-                       SkBlendMode op = SkBlendMode::kSrcOver);
+                       bool object_has_multiple_boxes);
   void PaintFillLayer(BoxPainterBase&,
                       const PaintInfo&,
                       const Color&,
                       const FillLayer&,
                       const LayoutRect&,
                       BackgroundImageGeometry& geometry,
-                      bool object_has_multiple_boxes,
-                      SkBlendMode op);
+                      bool object_has_multiple_boxes);
   virtual void PaintNormalBoxShadow(const PaintInfo&,
                                     const ComputedStyle&,
                                     const LayoutRect& paint_rect) = 0;
diff --git a/third_party/blink/renderer/core/paint/ng/ng_inline_box_fragment_painter.h b/third_party/blink/renderer/core/paint/ng/ng_inline_box_fragment_painter.h
index 881e3144..1b4a60e 100644
--- a/third_party/blink/renderer/core/paint/ng/ng_inline_box_fragment_painter.h
+++ b/third_party/blink/renderer/core/paint/ng/ng_inline_box_fragment_painter.h
@@ -8,9 +8,7 @@
 #include "third_party/blink/renderer/core/layout/ng/geometry/ng_border_edges.h"
 #include "third_party/blink/renderer/core/paint/inline_box_painter_base.h"
 #include "third_party/blink/renderer/core/paint/ng/ng_box_fragment_painter.h"
-
 #include "third_party/blink/renderer/platform/wtf/allocator.h"
-#include "third_party/skia/include/core/SkBlendMode.h"
 
 namespace blink {
 
diff --git a/third_party/blink/renderer/core/paint/table_cell_painter.cc b/third_party/blink/renderer/core/paint/table_cell_painter.cc
index e655bdb..9396b87d 100644
--- a/third_party/blink/renderer/core/paint/table_cell_painter.cc
+++ b/third_party/blink/renderer/core/paint/table_cell_painter.cc
@@ -61,8 +61,7 @@
     }
     BackgroundImageGeometry geometry(layout_table_cell_, &background_object);
     BoxModelObjectPainter(layout_table_cell_)
-        .PaintFillLayers(paint_info, c, bg_layer, paint_rect, geometry,
-                         kBackgroundBleedNone, SkBlendMode::kSrcOver);
+        .PaintFillLayers(paint_info, c, bg_layer, paint_rect, geometry);
   }
 }