Rename paint data structures

third_party/WebKit/Source/platform/fonts/Font.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Holger Hans Peter Freyther
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 13 matching lines @@
 
 #ifndef Font_h
 #define Font_h
 
 #include "platform/LayoutUnit.h"
 #include "platform/PlatformExport.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFallbackList.h"
 #include "platform/fonts/FontFallbackPriority.h"
 #include "platform/fonts/SimpleFontData.h"
+#include "platform/graphics/paint/PaintCanvas.h"
+#include "platform/graphics/paint/PaintFlags.h"
 #include "platform/text/TabSize.h"
 #include "platform/text/TextDirection.h"
 #include "wtf/Allocator.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/MathExtras.h"
 #include "wtf/text/CharacterNames.h"
 
-class SkCanvas;
-class SkPaint;
-
 namespace blink {
 
 struct CharacterRange;
 class FloatPoint;
 class FloatRect;
 class FontFallbackIterator;
 class FontData;
 class FontSelector;
 class GlyphBuffer;
 class ShapeCache;
@@ skipping 17 matching lines @@
   const FontDescription& getFontDescription() const {
     return m_fontDescription;
   }
 
   void update(FontSelector*) const;
 
   enum CustomFontNotReadyAction {
     DoNotPaintIfFontNotReady,
     UseFallbackIfFontNotReady
   };
-  bool drawText(SkCanvas*,
+  bool drawText(PaintCanvas*,
                 const TextRunPaintInfo&,
                 const FloatPoint&,
                 float deviceScaleFactor,
-                const SkPaint&) const;
-  bool drawBidiText(SkCanvas*,
+                const PaintFlags&) const;
+  bool drawBidiText(PaintCanvas*,
                     const TextRunPaintInfo&,
                     const FloatPoint&,
                     CustomFontNotReadyAction,
                     float deviceScaleFactor,
-                    const SkPaint&) const;
-  void drawEmphasisMarks(SkCanvas*,
+                    const PaintFlags&) const;
+  void drawEmphasisMarks(PaintCanvas*,
                          const TextRunPaintInfo&,
                          const AtomicString& mark,
                          const FloatPoint&,
                          float deviceScaleFactor,
-                         const SkPaint&) const;
+                         const PaintFlags&) const;
 
   struct TextIntercept {
     float m_begin, m_end;
   };
 
   // Compute the text intercepts along the axis of the advance and write them
   // into the specified Vector of TextIntercepts. The number of those is zero or
   // a multiple of two, and is at most the number of glyphs * 2 in the TextRun
   // part of TextRunPaintInfo. Specify bounds for the upper and lower extend of
   // a line crossing through the text, parallel to the baseline.
   // TODO(drott): crbug.com/655154 Fix this for
   // upright in vertical.
   void getTextIntercepts(const TextRunPaintInfo&,
                          float deviceScaleFactor,
-                         const SkPaint&,
+                         const PaintFlags&,
                          const std::tuple<float, float>& bounds,
                          Vector<TextIntercept>&) const;
 
   // Glyph bounds will be the minimum rect containing all glyph strokes, in
   // coordinates using (<text run x position>, <baseline position>) as the
   // origin.
   float width(const TextRun&,
               HashSet<const SimpleFontData*>* fallbackFonts = nullptr,
               FloatRect* glyphBounds = nullptr) const;
 
@@ skipping 46 matching lines @@
     m_shapeWordByWordComputed = true;
   }
 
  private:
   enum ForTextEmphasisOrNot { NotForTextEmphasis, ForTextEmphasis };
 
   // Returns the total advance.
   float buildGlyphBuffer(const TextRunPaintInfo&,
                          GlyphBuffer&,
                          const GlyphData* emphasisData = nullptr) const;
-  void drawGlyphBuffer(SkCanvas*,
-                       const SkPaint&,
+  void drawGlyphBuffer(PaintCanvas*,
+                       const PaintFlags&,
                        const TextRunPaintInfo&,
                        const GlyphBuffer&,
                        const FloatPoint&,
                        float deviceScaleFactor) const;
 
   bool getEmphasisMarkGlyphData(const AtomicString&, GlyphData&) const;
 
   bool computeCanShapeWordByWord() const;
 
   friend struct SimpleShaper;
@@ skipping 54 matching lines @@
   // advance an additional tab stop.
   if (distanceToTabStop < fontData->spaceWidth() / 2)
     distanceToTabStop += baseTabWidth;
 
   return distanceToTabStop;
 }
 
 }  // namespace blink
 
 #endif