Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: ui/gfx/render_text_win.h

Issue 8570003: Implement font fallback in RenderTextWin, try #2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/render_text_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_win.h
===================================================================
--- ui/gfx/render_text_win.h (revision 110489)
+++ ui/gfx/render_text_win.h (working copy)
@@ -19,6 +19,7 @@
struct TextRun {
TextRun();
+ ~TextRun();
ui::Range range;
Font font;
@@ -43,6 +44,7 @@
scoped_array<int> advance_widths;
scoped_array<GOFFSET> offsets;
ABC abc_widths;
+ SCRIPT_CACHE script_cache;
private:
DISALLOW_COPY_AND_ASSIGN(TextRun);
@@ -89,8 +91,8 @@
// Given a |run|, returns the SelectionModel that contains the logical first
// or last caret position inside (not at a boundary of) the run.
// The returned value represents a cursor/caret position without a selection.
- SelectionModel FirstSelectionModelInsideRun(internal::TextRun*);
- SelectionModel LastSelectionModelInsideRun(internal::TextRun*);
+ SelectionModel FirstSelectionModelInsideRun(internal::TextRun* run);
+ SelectionModel LastSelectionModelInsideRun(internal::TextRun* run);
// Get the selection model visually left/right of |selection| by one grapheme.
// The returned value represents a cursor/caret position without a selection.
@@ -102,17 +104,12 @@
void DrawVisualText(Canvas* canvas);
void DrawCursor(Canvas* canvas);
- bool text_is_dirty_;
- bool style_is_dirty_;
-
// National Language Support native digit and digit substitution settings.
SCRIPT_DIGITSUBSTITUTE digit_substitute_;
SCRIPT_CONTROL script_control_;
SCRIPT_STATE script_state_;
- SCRIPT_CACHE script_cache_;
-
std::vector<internal::TextRun*> runs_;
int string_width_;
« no previous file with comments | « no previous file | ui/gfx/render_text_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698