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

Unified Diff: ui/gfx/render_text.h

Issue 2251893004: Use parameterized tests to test multiple render text implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@selection_direction
Patch Set: Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index 54b9edca43b952a60eb2cc7fb98485a95460e94d..1d1f053050d943cd879d6e255d5cbbf87f6187e7 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -650,40 +650,41 @@ class GFX_EXPORT RenderText {
private:
friend class test::RenderTextTestApi;
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, DefaultStyles);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SetStyles);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyStyles);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, AppendTextKeepsStyles);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ObscuredText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, MinLineHeight);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_WordWrapBehavior);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_LineBreakerBehavior);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, DefaultStyles);
msw 2016/08/25 03:02:19 This isn't a blocker for this CL, but removing fri
karandeepb 2016/08/25 08:13:10 Will look to do this in a future CL.
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, SetStyles);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, ApplyStyles);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, AppendTextKeepsStyles);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, ObscuredText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, RevealObscuredText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, ElidedText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, ElidedObscuredText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, TruncatedText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, TruncatedObscuredText);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, GraphemePositions);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, MinLineHeight);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, EdgeSelectionModels);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, GetTextOffset);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll,
+ GetTextOffsetHorizontalDefaultInRTL);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_MinWidth);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_NormalWidth);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_SufficientWidth);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_Newline);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_WordWrapBehavior);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest,
+ Multiline_LineBreakerBehavior);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest,
Multiline_SurrogatePairsOrCombiningChars);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_ZeroWidthChars);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, NewlineWithoutMultilineFlag);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GlyphBounds);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, HarfBuzz_GlyphBounds);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest,
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, Multiline_ZeroWidthChars);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, NewlineWithoutMultilineFlag);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextHarfBuzzTest, GlyphBounds);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll,
MoveCursorLeftRight_MeiryoUILigatures);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Win_LogicalClusters);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SameFontForParentheses);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, BreakRunsByUnicodeBlocks);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, PangoAttributes);
- FRIEND_TEST_ALL_PREFIXES(RenderTextTest, StringFitsOwnWidth);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, Win_LogicalClusters);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, SameFontForParentheses);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, BreakRunsByUnicodeBlocks);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, PangoAttributes);
+ FRIEND_TEST_ALL_PREFIXES(RenderTextTestAll, StringFitsOwnWidth);
// Set the cursor to |position|, with the caret trailing the previous
// grapheme, or if there is no previous grapheme, leading the cursor position.

Powered by Google App Engine
This is Rietveld 408576698