[LayoutNG] Add NG-specific DrawText support to GraphicsContext

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

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 721 matching lines @@
     PaintFlags flags(ImmutableState()->FillFlags());
     flags.setColor(StrokeColor().Rgb());
     flags.setStyle(PaintFlags::kStroke_Style);
     flags.setStrokeWidth(1);
 
     sk_rect.inset(0.5f, 0.5f);
     DrawRect(sk_rect, flags);
   }
 }
 
-void GraphicsContext::DrawText(const Font& font,
-                               const TextRunPaintInfo& run_info,
-                               const FloatPoint& point,
-                               const PaintFlags& flags) {
+template <typename TextPaintInfo>
+void GraphicsContext::DrawTextInternal(const Font& font,
+                                       const TextPaintInfo& text_info,
+                                       const FloatPoint& point,
+                                       const PaintFlags& flags) {
   if (ContextDisabled())
     return;
 
-  if (font.DrawText(canvas_, run_info, point, device_scale_factor_, flags))
+  if (font.DrawText(canvas_, text_info, point, device_scale_factor_, flags))
     paint_controller_.SetTextPainted();
 }
 
+void GraphicsContext::DrawText(const Font& font,
+                               const TextRunPaintInfo& text_info,
+                               const FloatPoint& point,
+                               const PaintFlags& flags) {
+  DrawTextInternal(font, text_info, point, flags);
+}
+
+void GraphicsContext::DrawText(const Font& font,
+                               const TextFragmentPaintInfo& text_info,
+                               const FloatPoint& point,
+                               const PaintFlags& flags) {
+  DrawTextInternal(font, text_info, point, flags);
+}
+
 template <typename DrawTextFunc>
 void GraphicsContext::DrawTextPasses(const DrawTextFunc& draw_text) {
   TextDrawingModeFlags mode_flags = TextDrawingMode();
 
   if (mode_flags & kTextModeFill) {
     draw_text(ImmutableState()->FillFlags());
   }
 
   if ((mode_flags & kTextModeStroke) && GetStrokeStyle() != kNoStroke &&
       StrokeThickness() > 0) {
     PaintFlags stroke_flags(ImmutableState()->StrokeFlags());
     if (mode_flags & kTextModeFill) {
       // shadow was already applied during fill pass
       stroke_flags.setLooper(0);
     }
     draw_text(stroke_flags);
   }
 }
 
-void GraphicsContext::DrawText(const Font& font,
-                               const TextRunPaintInfo& run_info,
-                               const FloatPoint& point) {
+template <typename TextPaintInfo>
+void GraphicsContext::DrawTextInternal(const Font& font,
+                                       const TextPaintInfo& text_info,
+                                       const FloatPoint& point) {
   if (ContextDisabled())
     return;
 
-  DrawTextPasses([&font, &run_info, &point, this](const PaintFlags& flags) {
-    if (font.DrawText(canvas_, run_info, point, device_scale_factor_, flags))
+  DrawTextPasses([&font, &text_info, &point, this](const PaintFlags& flags) {
+    if (font.DrawText(canvas_, text_info, point, device_scale_factor_, flags))
       paint_controller_.SetTextPainted();
   });
 }
 
-void GraphicsContext::DrawEmphasisMarks(const Font& font,
-                                        const TextRunPaintInfo& run_info,
-                                        const AtomicString& mark,
-                                        const FloatPoint& point) {
+void GraphicsContext::DrawText(const Font& font,
+                               const TextRunPaintInfo& text_info,
+                               const FloatPoint& point) {
+  DrawTextInternal(font, text_info, point);
+}
+
+void GraphicsContext::DrawText(const Font& font,
+                               const TextFragmentPaintInfo& text_info,
+                               const FloatPoint& point) {
+  DrawTextInternal(font, text_info, point);
+}
+
+template <typename TextPaintInfo>
+void GraphicsContext::DrawEmphasisMarksInternal(const Font& font,
+                                                const TextPaintInfo& text_info,
+                                                const AtomicString& mark,
+                                                const FloatPoint& point) {
   if (ContextDisabled())
     return;
 
   DrawTextPasses(
-      [&font, &run_info, &mark, &point, this](const PaintFlags& flags) {
-        font.DrawEmphasisMarks(canvas_, run_info, mark, point,
+      [&font, &text_info, &mark, &point, this](const PaintFlags& flags) {
+        font.DrawEmphasisMarks(canvas_, text_info, mark, point,
                                device_scale_factor_, flags);
       });
 }
 
+void GraphicsContext::DrawEmphasisMarks(const Font& font,
+                                        const TextRunPaintInfo& text_info,
+                                        const AtomicString& mark,
+                                        const FloatPoint& point) {
+  DrawEmphasisMarksInternal(font, text_info, mark, point);
+}
+
+void GraphicsContext::DrawEmphasisMarks(const Font& font,
+                                        const TextFragmentPaintInfo& text_info,
+                                        const AtomicString& mark,
+                                        const FloatPoint& point) {
+  DrawEmphasisMarksInternal(font, text_info, mark, point);
+}
+
 void GraphicsContext::DrawBidiText(
     const Font& font,
     const TextRunPaintInfo& run_info,
     const FloatPoint& point,
     Font::CustomFontNotReadyAction custom_font_not_ready_action) {
   if (ContextDisabled())
     return;
 
   DrawTextPasses([&font, &run_info, &point, custom_font_not_ready_action,
                   this](const PaintFlags& flags) {
@@ skipping 553 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 
   return nullptr;
 }
 
 }  // namespace blink