More or less implement RenderTextHarfBuzz

ui/gfx/render_text.h

Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 2864b43f8dc5c236fc796025bfc5f198012c0111..b3d6f4131560edbfc7bc4713d3798d1c6121b673 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -11,6 +11,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string16.h"
@@ -41,6 +42,7 @@ namespace gfx {
 class Canvas;
 class Font;
 class RenderTextTest;
+class RenderTextHarfBuzz; // REMOVE
 
 namespace internal {
 
@@ -75,6 +77,8 @@ class SkiaTextRenderer {
   void DrawStrike(int x, int y, int width) const;
   void DrawDiagonalStrike(int x, int y, int width) const;
 
+  SkPaint paint() const { return paint_; }
+
  private:
   SkCanvas* canvas_skia_;
   bool started_drawing_;
@@ -158,7 +162,7 @@ class GFX_EXPORT RenderText {
  public:
   virtual ~RenderText();
 
-  // Creates a platform-specific RenderText instance.
+  // Creates a platform-specific or cross-platform RenderText instance.
   static RenderText* CreateInstance();
 
   const base::string16& text() const { return text_; }
@@ -399,6 +403,9 @@ class GFX_EXPORT RenderText {
  protected:
   RenderText();
 
+  // Creates a platform-specific RenderText instance.
+  static RenderText* CreateNativeInstance();
+
   const BreakList<SkColor>& colors() const { return colors_; }
   const std::vector<BreakList<bool> >& styles() const { return styles_; }