Remove unused custom vertical text alignment in CanvasSkia.

ui/gfx/canvas_skia.cc

Index: ui/gfx/canvas_skia.cc
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc
index 6748c6a7c32c5160ad741fcf70eb51193b62377c..baa4db9133bf64c63a5f80d39367130315bee4d3 100644
--- a/ui/gfx/canvas_skia.cc
+++ b/ui/gfx/canvas_skia.cc
@@ -80,20 +80,6 @@ bool PixelShouldGetHalo(const SkBitmap& bitmap,
   return false;
 }
 
-// Apply vertical alignment per |flags|. Returns y-coordinate delta.
-int VAlignText(int text_height,
-               int flags,
-               int available_height) {
-  if (flags & gfx::Canvas::TEXT_VALIGN_TOP)
-    return 0;
-
-  if (flags & gfx::Canvas::TEXT_VALIGN_BOTTOM)
-    return available_height - text_height;
-
-  // Default case: TEXT_VALIGN_MIDDLE.
-  return (available_height - text_height) / 2;
-}
-
 // Strips accelerator character prefixes in |text| if needed, based on |flags|.
 // Returns a range in |text| to underline or ui::Range::InvalidRange() if
 // underlining is not needed.
@@ -262,15 +248,6 @@ void Canvas::DrawStringWithShadows(const string16& text,
 
   flags = AdjustPlatformSpecificFlags(text, flags);
 
-#if defined(OS_WIN)
-  // TODO(asvitkine): On Windows, MULTI_LINE implies top alignment.
-  //                  http://crbug.com/107357

[Alexei Svitkine (slow), 2012/11/05 15:44:42]

Last time I attempted to remove this block, it caused a regression with the SSL
settings bubble on Windows with the paragraph that described the current
connection (I believe that bubble has now been changed to have that paragraph in
a 2nd tab inside the bubble).

Can you verify that your ifdef added below doesn't cause a regression? (From
reading the code, it looks correct - so just pointing out a way to test this, if
you haven't seen already.)

[msw, 2012/11/05 22:40:50]

The website settings bubble's connection tab doesn't change on Win/CrOS.

-  if (flags & MULTI_LINE) {
-    flags &= ~(TEXT_VALIGN_MIDDLE | TEXT_VALIGN_BOTTOM);
-    flags |= TEXT_VALIGN_TOP;
-  }
-#endif
-
   gfx::Rect clip_rect(text_bounds);
   clip_rect.Inset(ShadowValue::GetMargin(shadows));
 
@@ -304,16 +281,17 @@ void Canvas::DrawStringWithShadows(const string16& text,
     for (size_t i = 0; i < strings.size(); i++) {
       ui::Range range = StripAcceleratorChars(flags, &strings[i]);
       UpdateRenderText(rect, strings[i], font, flags, color, render_text.get());
-
-      // Apply vertical alignment over the block of text using the height of the
-      // first line. This may not be correct if different lines in the text have
-      // different heights, but avoids needing to do two passes.
       const int line_height = render_text->GetStringSize().height();
+
+      // TODO(msw|asvitkine): Center Windows multi-line text: crbug.com/107357
+#if !defined(OS_WIN)
       if (i == 0) {
-        rect.Offset(0, VAlignText(strings.size() * line_height,
-                                  flags,
-                                  text_bounds.height()));
+        // TODO(msw|asvitkine): Support multi-line text with varied heights.
+        const int aggregate_height = strings.size() * line_height;
+        rect.Offset(0, (text_bounds.height() - aggregate_height) / 2);
       }
+#endif
+
       rect.set_height(line_height);
 
       ApplyUnderlineStyle(range, render_text.get());
@@ -348,7 +326,8 @@ void Canvas::DrawStringWithShadows(const string16& text,
                      render_text.get());
 
     const int line_height = render_text->GetStringSize().height();
-    rect.Offset(0, VAlignText(line_height, flags, text_bounds.height()));
+    // Center the text vertically.
+    rect.Offset(0, (text_bounds.height() - line_height) / 2);
     rect.set_height(line_height);
     render_text->SetDisplayRect(rect);
 
@@ -466,7 +445,8 @@ void Canvas::DrawFadeTruncatingString(
   UpdateRenderText(rect, clipped_text, font, flags, color, render_text.get());
 
   const int line_height = render_text->GetStringSize().height();

[Alexei Svitkine (slow), 2012/11/05 15:44:42]

Nit: This block is the same as above. Can you make a helper function?

[msw, 2012/11/05 22:40:50]

I'd rather follow up with bigger vertical placement changes.

-  rect.Offset(0, VAlignText(line_height, flags, display_rect.height()));
+  // Center the text vertically.
+  rect.Offset(0, (display_rect.height() - line_height) / 2);
   rect.set_height(line_height);
   render_text->SetDisplayRect(rect);