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

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

Issue 882643005: Add multiline support to RenderTextHarfBuzz. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: newline Created 5 years, 10 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') | ui/gfx/render_text_harfbuzz.h » ('J')
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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText); 573 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
574 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText); 574 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
575 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions); 575 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
576 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels); 576 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
577 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset); 577 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
578 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL); 578 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
579 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 579 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
580 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 580 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
581 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); 581 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
582 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); 582 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
583 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
584 Multiline_NewlineWithoutMultilineFlag);
583 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds); 585 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
584 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds); 586 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
585 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, 587 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
586 MoveCursorLeftRight_MeiryoUILigatures); 588 MoveCursorLeftRight_MeiryoUILigatures);
587 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 589 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
588 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses); 590 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses);
589 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks); 591 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks);
590 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes); 592 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes);
591 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth); 593 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth);
592 594
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
727 // Lines computed by EnsureLayout. These should be invalidated with 729 // Lines computed by EnsureLayout. These should be invalidated with
728 // ResetLayout and on |display_rect_| changes. 730 // ResetLayout and on |display_rect_| changes.
729 std::vector<internal::Line> lines_; 731 std::vector<internal::Line> lines_;
730 732
731 DISALLOW_COPY_AND_ASSIGN(RenderText); 733 DISALLOW_COPY_AND_ASSIGN(RenderText);
732 }; 734 };
733 735
734 } // namespace gfx 736 } // namespace gfx
735 737
736 #endif // UI_GFX_RENDER_TEXT_H_ 738 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text_harfbuzz.h » ('j') | ui/gfx/render_text_harfbuzz.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698