OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_ | 5 #ifndef UI_GFX_RENDER_TEXT_HARFBUZZ_H_ |
6 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_ | 6 #define UI_GFX_RENDER_TEXT_HARFBUZZ_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 scoped_ptr<SkPoint[]> positions; | 71 scoped_ptr<SkPoint[]> positions; |
72 std::vector<uint32_t> glyph_to_char; | 72 std::vector<uint32_t> glyph_to_char; |
73 size_t glyph_count; | 73 size_t glyph_count; |
74 | 74 |
75 Font font; | 75 Font font; |
76 skia::RefPtr<SkTypeface> skia_face; | 76 skia::RefPtr<SkTypeface> skia_face; |
77 FontRenderParams render_params; | 77 FontRenderParams render_params; |
78 int font_size; | 78 int font_size; |
79 int baseline_offset; | 79 int baseline_offset; |
80 int baseline_type; | 80 int baseline_type; |
81 int font_style; | 81 bool italic; |
| 82 gfx::Font::Weight weight; |
82 bool strike; | 83 bool strike; |
83 bool diagonal_strike; | 84 bool diagonal_strike; |
84 bool underline; | 85 bool underline; |
85 | 86 |
86 private: | 87 private: |
87 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz); | 88 DISALLOW_COPY_AND_ASSIGN(TextRunHarfBuzz); |
88 }; | 89 }; |
89 | 90 |
90 // Manages the list of TextRunHarfBuzz and its logical <-> visual index mapping. | 91 // Manages the list of TextRunHarfBuzz and its logical <-> visual index mapping. |
91 class TextRunList { | 92 class TextRunList { |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
273 | 274 |
274 // Fixed width of glyphs. This should only be set in test environments. | 275 // Fixed width of glyphs. This should only be set in test environments. |
275 float glyph_width_for_test_; | 276 float glyph_width_for_test_; |
276 | 277 |
277 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz); | 278 DISALLOW_COPY_AND_ASSIGN(RenderTextHarfBuzz); |
278 }; | 279 }; |
279 | 280 |
280 } // namespace gfx | 281 } // namespace gfx |
281 | 282 |
282 #endif // UI_GFX_RENDER_TEXT_HARFBUZZ_H_ | 283 #endif // UI_GFX_RENDER_TEXT_HARFBUZZ_H_ |
OLD | NEW |