Fix alignment format in multiline mode

ui/gfx/render_text.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/render_text.h"
 
 #include <algorithm>
 #include <climits>
 
 #include "base/command_line.h"
@@ skipping 1068 matching lines @@
 }
 
 HorizontalAlignment RenderText::GetCurrentHorizontalAlignment() {
   if (horizontal_alignment_ != ALIGN_TO_HEAD)
     return horizontal_alignment_;
   return GetTextDirection() == base::i18n::RIGHT_TO_LEFT ? ALIGN_RIGHT
                                                          : ALIGN_LEFT;
 }
 
 Vector2d RenderText::GetAlignmentOffset(size_t line_number) {
-  // TODO(ckocagil): Enable |lines_| usage in other platforms.
-#if defined(OS_WIN)
+  // TODO(ckocagil): Enable |lines_| usage on mac.
+#if defined(OS_WIN) || defined(OS_CHROMEOS)

[msw, 2015/02/19 01:13:50]

This should actually check if the current instance is a RenderTextHarfBuzz
instance... RenderTextMac doesn't support multiline, but Mac also creates
RenderTextHarfBuzz instances via CreateInstanceForEditing. It'd be nice if you
can solve that elegantly, otherwise, I suppose you can just make this "if
!defined(OS_MACOSX)" for now; ditto below.

[oshima, 2015/02/19 04:40:14]

That means this is already broken and should be fixed separately.

This change was missing piece in mukai's@ multiline support CL for RTHB.

[oshima, 2015/02/23 18:50:53]

Used !defined(OS_MACOSX) in this CL. I uploaded the solution w/o ifdef in patch
set #3,
but want to do that in separate CL as I need to merge this to 42.

   DCHECK_LT(line_number, lines_.size());
 #endif
   Vector2d offset;
   HorizontalAlignment horizontal_alignment = GetCurrentHorizontalAlignment();
   if (horizontal_alignment != ALIGN_LEFT) {
-#if defined(OS_WIN)
+#if !defined(OS_WIN) || defined(OS_CHROMEOS)

[msw, 2015/02/19 01:13:50]

This is *definitely* wrong with the "!" added for OS_WIN; see above.

[oshima, 2015/02/23 18:50:53]

Sorry, this was from my experiment. (I was playing with this on/off).

I did clean up as you suggested.

     const int width = std::ceil(lines_[line_number].size.width()) +
         (cursor_enabled_ ? 1 : 0);
 #else
     const int width = GetContentWidth();
 #endif
     offset.set_x(display_rect().width() - width);
     // Put any extra margin pixel on the left to match legacy behavior.
     if (horizontal_alignment == ALIGN_CENTER)
       offset.set_x((offset.x() + 1) / 2);
   }
@@ skipping 318 matching lines @@
   SetDisplayOffset(display_offset_.x() + delta_x);
 }
 
 void RenderText::DrawSelection(Canvas* canvas) {
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, selection_background_focused_color_);
 }
 
 }  // namespace gfx