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

Side by Side Diff: ui/gfx/render_text_win.h

Issue 23857008: Re-land: "RenderTextWin: Break runs between any two characters that are not in the same code block" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/render_text_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE; 79 virtual ui::Range GetGlyphBounds(size_t index) OVERRIDE;
80 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE; 80 virtual std::vector<Rect> GetSubstringBounds(const ui::Range& range) OVERRIDE;
81 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE; 81 virtual size_t TextIndexToLayoutIndex(size_t index) const OVERRIDE;
82 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE; 82 virtual size_t LayoutIndexToTextIndex(size_t index) const OVERRIDE;
83 virtual bool IsCursorablePosition(size_t position) OVERRIDE; 83 virtual bool IsCursorablePosition(size_t position) OVERRIDE;
84 virtual void ResetLayout() OVERRIDE; 84 virtual void ResetLayout() OVERRIDE;
85 virtual void EnsureLayout() OVERRIDE; 85 virtual void EnsureLayout() OVERRIDE;
86 virtual void DrawVisualText(Canvas* canvas) OVERRIDE; 86 virtual void DrawVisualText(Canvas* canvas) OVERRIDE;
87 87
88 private: 88 private:
89 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_BreakRunsByUnicodeBlocks);
89 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 90 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
90 91
91 void ItemizeLogicalText(); 92 void ItemizeLogicalText();
92 void LayoutVisualText(); 93 void LayoutVisualText();
93 void LayoutTextRun(internal::TextRun* run); 94 void LayoutTextRun(internal::TextRun* run);
94 95
95 // Helper function that calls |ScriptShape()| on the run, which has logic to 96 // Helper function that calls |ScriptShape()| on the run, which has logic to
96 // handle E_OUTOFMEMORY return codes. 97 // handle E_OUTOFMEMORY return codes.
97 HRESULT ShapeTextRunWithFont(internal::TextRun* run, const Font& font); 98 HRESULT ShapeTextRunWithFont(internal::TextRun* run, const Font& font);
98 99
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 scoped_ptr<int[]> logical_to_visual_; 132 scoped_ptr<int[]> logical_to_visual_;
132 133
133 bool needs_layout_; 134 bool needs_layout_;
134 135
135 DISALLOW_COPY_AND_ASSIGN(RenderTextWin); 136 DISALLOW_COPY_AND_ASSIGN(RenderTextWin);
136 }; 137 };
137 138
138 } // namespace gfx 139 } // namespace gfx
139 140
140 #endif // UI_GFX_RENDER_TEXT_WIN_H_ 141 #endif // UI_GFX_RENDER_TEXT_WIN_H_
OLDNEW
« no previous file with comments | « ui/gfx/render_text_unittest.cc ('k') | ui/gfx/render_text_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698