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

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

Issue 915383003: Fix alignment format in multiline mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.cc » ('j') | ui/gfx/render_text.cc » ('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 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText); 579 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText);
580 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText); 580 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText);
581 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText); 581 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText);
582 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText); 582 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
583 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText); 583 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
584 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions); 584 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
585 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight); 585 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight);
586 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels); 586 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
587 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset); 587 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
588 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL); 588 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
589 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_HorizontalAlignment);
589 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 590 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
590 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 591 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
591 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); 592 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
592 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); 593 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
593 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag); 594 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag);
594 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds); 595 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
595 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds); 596 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
596 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, 597 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
597 MoveCursorLeftRight_MeiryoUILigatures); 598 MoveCursorLeftRight_MeiryoUILigatures);
598 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 599 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 // Lines computed by EnsureLayout. These should be invalidated with 742 // Lines computed by EnsureLayout. These should be invalidated with
742 // ResetLayout and on |display_rect_| changes. 743 // ResetLayout and on |display_rect_| changes.
743 std::vector<internal::Line> lines_; 744 std::vector<internal::Line> lines_;
744 745
745 DISALLOW_COPY_AND_ASSIGN(RenderText); 746 DISALLOW_COPY_AND_ASSIGN(RenderText);
746 }; 747 };
747 748
748 } // namespace gfx 749 } // namespace gfx
749 750
750 #endif // UI_GFX_RENDER_TEXT_H_ 751 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/render_text.cc » ('j') | ui/gfx/render_text.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698