[LayoutNG] Add NG-specific DrawText support to GraphicsContext

third_party/WebKit/Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 219 matching lines @@
   void ClipOut(const Path&);
   void ClipOutRoundedRect(const FloatRoundedRect&);
   void ClipPath(const SkPath&,
                 AntiAliasingMode = kNotAntiAliased,
                 SkClipOp = SkClipOp::kIntersect);
   void ClipRect(const SkRect&,
                 AntiAliasingMode = kNotAntiAliased,
                 SkClipOp = SkClipOp::kIntersect);
 
   void DrawText(const Font&, const TextRunPaintInfo&, const FloatPoint&);
+  void DrawText(const Font&, const TextFragmentPaintInfo&, const FloatPoint&);

[eae, 2017/04/27 03:30:32]

I tried templetazing the public methods themselves but couldn't get it to link
reliably across all platforms, even with explicit template instantiation.

This way it works reliably and it makes it very clear what types are supported.

+
   void DrawText(const Font&,
                 const TextRunPaintInfo&,
                 const FloatPoint&,
                 const PaintFlags&);
+  void DrawText(const Font&,
+                const TextFragmentPaintInfo&,
+                const FloatPoint&,
+                const PaintFlags&);
+
   void DrawEmphasisMarks(const Font&,
                          const TextRunPaintInfo&,
                          const AtomicString& mark,
                          const FloatPoint&);
+  void DrawEmphasisMarks(const Font&,
+                         const TextFragmentPaintInfo&,
+                         const AtomicString& mark,
+                         const FloatPoint&);
+
   void DrawBidiText(
       const Font&,
       const TextRunPaintInfo&,
       const FloatPoint&,
       Font::CustomFontNotReadyAction = Font::kDoNotPaintIfFontNotReady);
   void DrawHighlightForText(const Font&,
                             const TextRun&,
                             const FloatPoint&,
                             int h,
                             const Color& background_color,
@@ skipping 105 matching lines @@
   static sk_sp<SkColorFilter> WebCoreColorFilterToSkiaColorFilter(ColorFilter);
 
  private:
   const GraphicsContextState* ImmutableState() const { return paint_state_; }
 
   GraphicsContextState* MutableState() {
     RealizePaintSave();
     return paint_state_;
   }
 
+  template <typename TextPaintInfo>
+  void DrawTextInternal(const Font&,
+                        const TextPaintInfo&,
+                        const FloatPoint&,
+                        const PaintFlags&);
+
+  template <typename TextPaintInfo>
+  void DrawTextInternal(const Font&, const TextPaintInfo&, const FloatPoint&);
+
+  template <typename TextPaintInfo>
+  void DrawEmphasisMarksInternal(const Font&,
+                                 const TextPaintInfo&,
+                                 const AtomicString& mark,
+                                 const FloatPoint&);
+
   template <typename DrawTextFunc>
   void DrawTextPasses(const DrawTextFunc&);
 
   void SaveLayer(const SkRect* bounds, const PaintFlags*);
   void RestoreLayer();
 
   // Helpers for drawing a focus ring (drawFocusRing)
   void DrawFocusRingPath(const SkPath&, const Color&, float width);
   void DrawFocusRingRect(const SkRect&, const Color&, float width);
 
@@ skipping 59 matching lines @@
 
   float device_scale_factor_;
 
   unsigned printing_ : 1;
   unsigned has_meta_data_ : 1;
 };
 
 }  // namespace blink
 
 #endif  // GraphicsContext_h