Chromium Code Reviews| Index: ui/gfx/render_text.h |
| diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h |
| index 52564fb25731bf92cbb6e94e8d4c35087cca3427..aeaaf98ff687d9741944194694652381a27e476a 100644 |
| --- a/ui/gfx/render_text.h |
| +++ b/ui/gfx/render_text.h |
| @@ -79,6 +79,8 @@ class SkiaTextRenderer { |
| void DrawUnderline(int x, int y, int width); |
| void DrawStrike(int x, int y, int width) const; |
| + SkPaint paint() const { return paint_; } |
|
Alexei Svitkine (slow)
2014/05/12 15:58:31
Is this used somewhere?
ckocagil
2014/05/13 15:03:48
Not anymore, removed.
|
| + |
| private: |
| // Helper class to draw a diagonal line with multiple pieces of different |
| // lengths and colors; to support text selection appearances. |
| @@ -94,6 +96,7 @@ class SkiaTextRenderer { |
| typedef std::pair<int, SkColor> Piece; |
| Canvas* canvas_; |
| + SkMatrix matrix_; |
| const Point start_; |
| SkPaint paint_; |
| int total_length_; |
| @@ -176,6 +179,10 @@ struct Line { |
| int baseline; |
| }; |
| +// Creates an SkTypeface from a font |family| name and a |gfx::Font::FontStyle|. |
| +skia::RefPtr<SkTypeface> CreateSkiaTypeface(const std::string& family, |
| + int style); |
| + |
| } // namespace internal |
| // RenderText represents an abstract model of styled text and its corresponding |
| @@ -186,7 +193,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_; } |
| @@ -569,6 +576,9 @@ class GFX_EXPORT RenderText { |
| FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); |
| FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); |
| + // Creates a platform-specific RenderText instance. |
| + static RenderText* CreateNativeInstance(); |
| + |
| // Set the cursor to |position|, with the caret trailing the previous |
| // grapheme, or if there is no previous grapheme, leading the cursor position. |
| // If |select| is false, the selection start is moved to the same position. |