| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WIN_H_ | 5 #ifndef UI_GFX_RENDER_TEXT_WIN_H_ |
| 6 #define UI_GFX_RENDER_TEXT_WIN_H_ | 6 #define UI_GFX_RENDER_TEXT_WIN_H_ |
| 7 | 7 |
| 8 #include <usp10.h> | 8 #include <usp10.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 Range range; | 26 Range range; |
| 27 Font font; | 27 Font font; |
| 28 // A gfx::Font::FontStyle flag to specify bold and italic styles. | 28 // A gfx::Font::FontStyle flag to specify bold and italic styles. |
| 29 // Supersedes |font.GetFontStyle()|. Stored separately to avoid calling | 29 // Supersedes |font.GetFontStyle()|. Stored separately to avoid calling |
| 30 // |font.DeriveFont()|, which is expensive on Windows. | 30 // |font.DeriveFont()|, which is expensive on Windows. |
| 31 int font_style; | 31 int font_style; |
| 32 | 32 |
| 33 bool strike; | 33 bool strike; |
| 34 bool diagonal_strike; | 34 bool diagonal_strike; |
| 35 bool underline; | |
| 36 | 35 |
| 37 int width; | 36 int width; |
| 38 // The cumulative widths of preceding runs. | 37 // The cumulative widths of preceding runs. |
| 39 int preceding_run_widths; | 38 int preceding_run_widths; |
| 40 | 39 |
| 41 SCRIPT_ANALYSIS script_analysis; | 40 SCRIPT_ANALYSIS script_analysis; |
| 42 | 41 |
| 43 scoped_ptr<WORD[]> glyphs; | 42 scoped_ptr<WORD[]> glyphs; |
| 44 scoped_ptr<WORD[]> logical_clusters; | 43 scoped_ptr<WORD[]> logical_clusters; |
| 45 scoped_ptr<SCRIPT_VISATTR[]> visible_attributes; | 44 scoped_ptr<SCRIPT_VISATTR[]> visible_attributes; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 scoped_ptr<int[]> logical_to_visual_; | 134 scoped_ptr<int[]> logical_to_visual_; |
| 136 | 135 |
| 137 bool needs_layout_; | 136 bool needs_layout_; |
| 138 | 137 |
| 139 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); | 138 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); |
| 140 }; | 139 }; |
| 141 | 140 |
| 142 } // namespace gfx | 141 } // namespace gfx |
| 143 | 142 |
| 144 #endif // UI_GFX_RENDER_TEXT_WIN_H_ | 143 #endif // UI_GFX_RENDER_TEXT_WIN_H_ |
| OLD | NEW |