blink: Fix cc/paint skia type mismatches

third_party/WebKit/Source/core/paint/FilterEffectBuilder.h

Index: third_party/WebKit/Source/core/paint/FilterEffectBuilder.h
diff --git a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.h b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.h
index 9032c61161a6c4349e33b068ebbde45f359fa8a9..cad404b3ec8c7f79c738496b944f9468e996e518 100644
--- a/third_party/WebKit/Source/core/paint/FilterEffectBuilder.h
+++ b/third_party/WebKit/Source/core/paint/FilterEffectBuilder.h
@@ -50,13 +50,13 @@ class CORE_EXPORT FilterEffectBuilder final {
  public:
   FilterEffectBuilder(const FloatRect& zoomedReferenceBox,
                       float zoom,
-                      const SkPaint* fillPaint = nullptr,
-                      const SkPaint* strokePaint = nullptr);
+                      const PaintFlags* fillFlags = nullptr,

[Stephen White, 2017/02/27 13:44:59]

Naming nit: while not new to this patch, this typedef is new to me, and I find
the name confusing. I think I understand the motivation (to avoid PaintPaint?),
SkPaint contains things much more heavy weight than "flags". But I can't think
of anything better, so I'll shut up until I do.

[enne (OOO), 2017/02/27 17:42:38]

vmpstr said almost word for word the same thing (and yes, it's to avoid
PaintPaint or cc::Paint).  I'm happy to change it to something more
understandable, but nobody came up with anything better.  :C

+                      const PaintFlags* strokeFlags = nullptr);
   FilterEffectBuilder(Node*,
                       const FloatRect& zoomedReferenceBox,
                       float zoom,
-                      const PaintFlags* fillPaint = nullptr,
-                      const PaintFlags* strokePaint = nullptr);
+                      const PaintFlags* fillFlags = nullptr,
+                      const PaintFlags* strokeFlags = nullptr);
 
   Filter* buildReferenceFilter(SVGFilterElement&,
                                FilterEffect* previousEffect,
@@ -73,8 +73,8 @@ class CORE_EXPORT FilterEffectBuilder final {
   Member<Node> m_targetContext;
   FloatRect m_referenceBox;
   float m_zoom;
-  const PaintFlags* m_fillPaint;
-  const PaintFlags* m_strokePaint;
+  const PaintFlags* m_fillFlags;
+  const PaintFlags* m_strokeFlags;
 };
 
 }  // namespace blink