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 #include "ui/gfx/render_text_win.h" | 5 #include "ui/gfx/render_text_win.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/i18n/break_iterator.h" | 9 #include "base/i18n/break_iterator.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 c == base::i18n::kPopDirectionalFormatting || | 234 c == base::i18n::kPopDirectionalFormatting || |
235 c == base::i18n::kLeftToRightOverride || | 235 c == base::i18n::kLeftToRightOverride || |
236 c == base::i18n::kRightToLeftOverride; | 236 c == base::i18n::kRightToLeftOverride; |
237 } | 237 } |
238 | 238 |
239 } // namespace | 239 } // namespace |
240 | 240 |
241 namespace internal { | 241 namespace internal { |
242 | 242 |
243 TextRun::TextRun() | 243 TextRun::TextRun() |
244 : strike(false), | 244 : foreground(0), |
| 245 font_style(0), |
| 246 strike(false), |
| 247 diagonal_strike(false), |
245 underline(false), | 248 underline(false), |
246 width(0), | 249 width(0), |
247 preceding_run_widths(0), | 250 preceding_run_widths(0), |
248 glyph_count(0), | 251 glyph_count(0), |
249 script_cache(NULL) { | 252 script_cache(NULL) { |
250 memset(&script_analysis, 0, sizeof(script_analysis)); | 253 memset(&script_analysis, 0, sizeof(script_analysis)); |
251 memset(&abc_widths, 0, sizeof(abc_widths)); | 254 memset(&abc_widths, 0, sizeof(abc_widths)); |
252 } | 255 } |
253 | 256 |
254 TextRun::~TextRun() { | 257 TextRun::~TextRun() { |
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
949 const internal::TextRun* run) { | 952 const internal::TextRun* run) { |
950 size_t caret = IndexOfAdjacentGrapheme(run->range.end(), CURSOR_BACKWARD); | 953 size_t caret = IndexOfAdjacentGrapheme(run->range.end(), CURSOR_BACKWARD); |
951 return SelectionModel(caret, CURSOR_FORWARD); | 954 return SelectionModel(caret, CURSOR_FORWARD); |
952 } | 955 } |
953 | 956 |
954 RenderText* RenderText::CreateInstance() { | 957 RenderText* RenderText::CreateInstance() { |
955 return new RenderTextWin; | 958 return new RenderTextWin; |
956 } | 959 } |
957 | 960 |
958 } // namespace gfx | 961 } // namespace gfx |
OLD | NEW |