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

Unified Diff: ui/gfx/render_text_unittest.cc

Issue 988763005: Change for Win XP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed ChromeOS from top bounds checks Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 2233c31e045773ed21d425b6d590d29ca3d9aa28..f141afeb4f908756f46f842172336a4ebe02e35d 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -2701,9 +2701,12 @@ TEST_F(RenderTextTest, TextDoesntClip) {
TestRectangleBuffer rect_buffer(string, buffer, kCanvasSize.width(),
kCanvasSize.height());
{
+#if !defined(OS_CHROMEOS)
+ // TODO(mukai): On ChromeOS text draws above the GetStringSize rect.
Jun Mukai 2015/03/07 02:19:02 Please do not do like this. Excluding specific pla
SCOPED_TRACE("TextDoesntClip Top Side");
rect_buffer.EnsureSolidRect(SK_ColorWHITE, 0, 0, kCanvasSize.width(),
kTestSize);
+#endif
}
{
SCOPED_TRACE("TextDoesntClip Bottom Side");
@@ -2713,8 +2716,11 @@ TEST_F(RenderTextTest, TextDoesntClip) {
}
{
SCOPED_TRACE("TextDoesntClip Left Side");
-#if defined(OS_WIN) || defined(OS_MACOSX)
- // TODO(mukai): On Windows and Mac smoothing draws left of text.
+#if defined(OS_WIN)
+ // TODO(mukai): On Windows XP the Unicode test draws to the left edge as
+ // if it is ignoring the SetDisplayRect shift by kTestSize.
Jun Mukai 2015/03/07 02:19:02 Why not just #if defined(OS_MACOSX) ?
+#elif defined(OS_MACOSX)
+ // TODO(mukai): On Windows (non-XP) and Mac smoothing draws left of text.
rect_buffer.EnsureSolidRect(SK_ColorWHITE, 0, kTestSize, kTestSize - 1,
string_size.height());
#else
@@ -2725,7 +2731,7 @@ TEST_F(RenderTextTest, TextDoesntClip) {
{
SCOPED_TRACE("TextDoesntClip Right Side");
#if !defined(OS_MACOSX)
- // TODO(mukai): On Mac text draws to right of GetStringSize
+ // TODO(mukai): On Mac text draws to right of GetStringSize.
rect_buffer.EnsureSolidRect(SK_ColorWHITE,
kTestSize + string_size.width(), kTestSize,
kTestSize, string_size.height());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698