Fix default alignment of drawn text when no alignment flags are passed.

ui/gfx/canvas_skia.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/canvas.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/range/range.h"
@@ skipping 120 matching lines @@
                       SkColor color,
                       gfx::RenderText* render_text) {
   render_text->SetFontList(gfx::FontList(font));
   render_text->SetText(text);
   render_text->SetCursorEnabled(false);
 
   gfx::Rect display_rect = rect;
   display_rect.set_height(font.GetHeight());
   render_text->SetDisplayRect(display_rect);
 
+  // Set the text alignment explicitly based on the directionality of the UI,
+  // if not specified.
+  if (!(flags & (gfx::Canvas::TEXT_ALIGN_CENTER |
+                 gfx::Canvas::TEXT_ALIGN_RIGHT |
+                 gfx::Canvas::TEXT_ALIGN_LEFT))) {
+    flags |= gfx::Canvas::DefaultCanvasTextAlignment();
+  }
+
   if (flags & gfx::Canvas::TEXT_ALIGN_RIGHT)
     render_text->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
   else if (flags & gfx::Canvas::TEXT_ALIGN_CENTER)
     render_text->SetHorizontalAlignment(gfx::ALIGN_CENTER);
   else

[msw, 2012/07/03 20:32:23]

Make this "else if (flags & gfx::Canvas::TEXT_ALIGN_LEFT)", and then make a new
catch-all else case that uses DefaultCanvasTextAlignment and nix the code above.

[Alexei Svitkine (slow), 2012/07/03 20:34:46]

gfx::Canvas::DefaultCanvasTextAlignment() doesn't return something that can just
be passed into render_text->SetHorizontalAlignment().

So we'd need a helper function to convert it. I don't think it would be better.

[msw, 2012/07/03 21:06:10]

Sigh, ok.

     render_text->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
   if (flags & gfx::Canvas::NO_SUBPIXEL_RENDERING)
     render_text->set_background_is_transparent(true);
 
   gfx::StyleRange style;
   style.foreground = color;
   style.font_style = font.GetStyle();
   if (font.GetStyle() & gfx::Font::UNDERLINED)
     style.underline = true;
@@ skipping 307 matching lines @@
   render_text->SetDisplayRect(rect);
 
   canvas_->save(SkCanvas::kClip_SaveFlag);
   ClipRect(display_rect);
   render_text->Draw(this);
   canvas_->restore();
 }
 #endif
 
 }  // namespace gfx