More or less implement RenderTextHarfBuzz

ui/gfx/render_text.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 
 #include <algorithm>
 #include <cstring>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/gfx/break_list.h"
 #include "ui/gfx/font_list.h"
@@ skipping 11 matching lines @@
 class SkDrawLooper;
 struct SkPoint;
 class SkShader;
 class SkTypeface;
 
 namespace gfx {
 
 class Canvas;
 class Font;
 class RenderTextTest;
+class RenderTextHarfBuzz; // REMOVE

[msw, 2014/04/29 06:24:45]

Move this to where it's needed, if anywhere.

[ckocagil, 2014/05/01 22:02:01]

Done.

 
 namespace internal {
 
 // Internal helper class used by derived classes to draw text through Skia.
 class SkiaTextRenderer {
  public:
   explicit SkiaTextRenderer(Canvas* canvas);
   ~SkiaTextRenderer();
 
   void SetDrawLooper(SkDrawLooper* draw_looper);
@@ skipping 17 matching lines @@
   // Draw underline and strike-through text decorations.
   // Based on |SkCanvas::DrawTextDecorations()| and constants from:
   //   third_party/skia/src/core/SkTextFormatParams.h
   void DrawDecorations(int x, int y, int width, bool underline, bool strike,
                        bool diagonal_strike);
   // Finishes any ongoing diagonal strike run.
   void EndDiagonalStrike();
   void DrawUnderline(int x, int y, int width);
   void DrawStrike(int x, int y, int width) const;
 
+  SkPaint paint() const { return paint_; }
+
  private:
   // Helper class to draw a diagonal line with multiple pieces of different
   // lengths and colors; to support text selection appearances.
   class DiagonalStrike {
    public:
     DiagonalStrike(Canvas* canvas, Point start, const SkPaint& paint);
     ~DiagonalStrike();
 
     void AddPiece(int length, SkColor color);
     void Draw();
 
    private:
     typedef std::pair<int, SkColor> Piece;
 
     Canvas* canvas_;
+    SkMatrix matrix_;
     const Point start_;
     SkPaint paint_;
     int total_length_;
     std::vector<Piece> pieces_;
 
     DISALLOW_COPY_AND_ASSIGN(DiagonalStrike);
   };
 
   Canvas* canvas_;
   SkCanvas* canvas_skia_;
@@ skipping 62 matching lines @@
   // heights.
   Size size;
 
   // Sum of preceding lines' heights.
   int preceding_heights;
 
   // Maximum baseline of all segments on this line.
   int baseline;
 };
 
+skia::RefPtr<SkTypeface> CreateSkiaTypeface(const std::string& family,
+                                            int style);

[msw, 2014/04/29 06:24:45]

nit: document that this is a gfx::Font::FontStyle value.

[ckocagil, 2014/05/01 22:02:01]

Done.

+
 }  // namespace internal
 
 // RenderText represents an abstract model of styled text and its corresponding
 // visual layout. Support is built in for a cursor, a selection, simple styling,
 // complex scripts, and bi-directional text. Implementations provide mechanisms
 // for rendering and translation between logical and visual data.
 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_; }
   void SetText(const base::string16& text);
 
   HorizontalAlignment horizontal_alignment() const {
     return horizontal_alignment_;
   }
   void SetHorizontalAlignment(HorizontalAlignment alignment);
 
@@ skipping 222 matching lines @@
 
   // Gets the horizontal bounds (relative to the left of the text, not the view)
   // of the glyph starting at |index|. If the glyph is RTL then the returned
   // Range will have is_reversed() true.  (This does not return a Rect because a
   // Rect can't have a negative width.)
   virtual Range GetGlyphBounds(size_t index) = 0;
 
  protected:
   RenderText();
 
+  // Creates a platform-specific RenderText instance.
+  static RenderText* CreateNativeInstance();

[msw, 2014/04/29 06:24:45]

Make this private.

[ckocagil, 2014/05/01 22:02:01]

Done.

+
   const BreakList<SkColor>& colors() const { return colors_; }
   const std::vector<BreakList<bool> >& styles() const { return styles_; }
 
   const std::vector<internal::Line>& lines() const { return lines_; }
   void set_lines(std::vector<internal::Line>* lines) { lines_.swap(*lines); }
 
   // Returns the baseline of the current text.  The return value depends on
   // the text and its layout while the return value of GetBaseline() doesn't.
   // GetAlignmentOffset() takes into account the difference between them.
   //
@@ skipping 264 matching lines @@
   // Lines computed by EnsureLayout. These should be invalidated with
   // ResetLayout and on |display_rect_| changes.
   std::vector<internal::Line> lines_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_