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

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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText); 596 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText);
597 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText); 597 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText);
598 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText); 598 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText);
599 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText); 599 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
600 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText); 600 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
601 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions); 601 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
602 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight); 602 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight);
603 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels); 603 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
604 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset); 604 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
605 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL); 605 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
606 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_HorizontalAlignment);
msw 2015/02/23 19:30:06 nit: Isn't being a friend test of rthb enough? Is
oshima 2015/02/23 23:06:52 Thanks for catching . This was added to access Get
606 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 607 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
607 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 608 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
608 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); 609 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
609 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); 610 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
610 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag); 611 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag);
611 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds); 612 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
612 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds); 613 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
613 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, 614 FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
614 MoveCursorLeftRight_MeiryoUILigatures); 615 MoveCursorLeftRight_MeiryoUILigatures);
615 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters); 616 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 // Lines computed by EnsureLayout. These should be invalidated upon 770 // Lines computed by EnsureLayout. These should be invalidated upon
770 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls. 771 // OnLayoutTextAttributeChanged and OnDisplayTextAttributeChanged calls.
771 std::vector<internal::Line> lines_; 772 std::vector<internal::Line> lines_;
772 773
773 DISALLOW_COPY_AND_ASSIGN(RenderText); 774 DISALLOW_COPY_AND_ASSIGN(RenderText);
774 }; 775 };
775 776
776 } // namespace gfx 777 } // namespace gfx
777 778
778 #endif // UI_GFX_RENDER_TEXT_H_ 779 #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