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

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

Issue 1070223004: Stop combining text runs which are connected by 'COMMON' blocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address msw@'s comment. Created 5 years, 6 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
« no previous file with comments | « no previous file | ui/gfx/render_text_harfbuzz.h » ('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_H_ 5 #ifndef UI_GFX_RENDER_TEXT_H_
6 #define UI_GFX_RENDER_TEXT_H_ 6 #define UI_GFX_RENDER_TEXT_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <cstring> 9 #include <cstring>
10 #include <string> 10 #include <string>
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions); 630 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
631 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight); 631 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight);
632 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels); 632 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
633 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset); 633 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
634 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL); 634 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
635 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 635 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
636 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 636 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
637 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); 637 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
638 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); 638 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
639 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_WordWrapBehavior); 639 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_WordWrapBehavior);
640 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_LineBreakerBehavior);
641 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
642 Multiline_SurrogatePairsOrCombiningChars);
643 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_ZeroWidthChars);
640 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag); 644 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag);
641 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds); 645 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
642 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds); 646 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
643 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, 647 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
644 MoveCursorLeftRight_MeiryoUILigatures); 648 MoveCursorLeftRight_MeiryoUILigatures);
645 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 649 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
646 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses); 650 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses);
647 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks); 651 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks);
648 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes); 652 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes);
649 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth); 653 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth);
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 // Lines computed by EnsureLayout. These should be invalidated upon 811 // Lines computed by EnsureLayout. These should be invalidated upon
808 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls. 812 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
809 std::vector<internal::Line> lines_; 813 std::vector<internal::Line> lines_;
810 814
811 DISALLOW_COPY_AND_ASSIGN(RenderText); 815 DISALLOW_COPY_AND_ASSIGN(RenderText);
812 }; 816 };
813 817
814 } // namespace gfx 818 } // namespace gfx
815 819
816 #endif // UI_GFX_RENDER_TEXT_H_ 820 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text_harfbuzz.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698