Use pango underline metrics in RenderTextLinux.

ui/gfx/render_text_linux.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_linux.h"
 
 #include <fontconfig/fontconfig.h>
 #include <pango/pangocairo.h>
 #include <algorithm>
 #include <string>
@@ skipping 52 matching lines @@
   int fc_rgba = FC_RGBA_RGB;
   FcPatternGetInteger(match, FC_RGBA, 0, &fc_rgba);
   FcPatternDestroy(pattern);
   FcPatternDestroy(match);
 
   already_queried = true;
   subpixel_enabled = (fc_rgba != FC_RGBA_NONE);
   return subpixel_enabled;
 }
 
+// Sets underline metrics on |renderer| according to Pango font |desc|.
+void SetPangoUnderlineMetrics(PangoFontDescription *desc,
+                              internal::SkiaTextRenderer* renderer) {
+  PangoFontMetrics* metrics = GetPangoFontMetrics(desc);
+  const int underline_thickness =

[msw, 2012/06/06 01:12:51]

nit: nix "underline_" from the names to fit each on one line.

[Alexei Svitkine (slow), 2012/06/06 14:46:27]

Done.

+      pango_font_metrics_get_underline_thickness(metrics);
+  const int underline_position =
+      pango_font_metrics_get_underline_position(metrics);
+  renderer->SetUnderlineMetrics(pango_units_to_double(underline_thickness),
+                                pango_units_to_double(underline_position));
+}
+
 }  // namespace
 
 // TODO(xji): index saved in upper layer is utf16 index. Pango uses utf8 index.
 // Since caret_pos is used internally, we could save utf8 index for caret_pos
 // to avoid conversion.
 
 RenderTextLinux::RenderTextLinux()
     : layout_(NULL),
       current_line_(NULL),
       log_attrs_(NULL),
@@ skipping 355 matching lines @@
       DCHECK_GE(style, 0);
       DCHECK_LT(style, static_cast<int>(styles.size()));
       if (!IndexInRange(style_ranges_utf8[style], glyph_byte_index)) {
         // TODO(asvitkine): For cases like "fi", where "fi" is a single glyph
         //                  but can span multiple styles, Pango splits the
         //                  styles evenly over the glyph. We can do this too by
         //                  clipping and drawing the glyph several times.
         renderer.SetForegroundColor(styles[style].foreground);
         renderer.SetFontFamilyWithStyle(family_name, styles[style].font_style);
         renderer.DrawPosText(&pos[start], &glyphs[start], i - start);
+        if (styles[style].underline)
+          SetPangoUnderlineMetrics(desc.get(), &renderer);
         renderer.DrawDecorations(start_x, y, glyph_x - start_x, styles[style]);
 
         start = i;
         start_x = glyph_x;
         // Loop to find the next style, in case the glyph spans multiple styles.
         do {
           style += style_increment;
         } while (style >= 0 && style < static_cast<int>(styles.size()) &&
                  !IndexInRange(style_ranges_utf8[style], glyph_byte_index));
       }
     }
 
     // Draw the remaining glyphs.
     renderer.SetForegroundColor(styles[style].foreground);
     renderer.SetFontFamilyWithStyle(family_name, styles[style].font_style);
     renderer.DrawPosText(&pos[start], &glyphs[start], glyph_count - start);
+    if (styles[style].underline)
+      SetPangoUnderlineMetrics(desc.get(), &renderer);
     renderer.DrawDecorations(start_x, y, glyph_x - start_x, styles[style]);
     x = glyph_x;
   }
 }
 
 GSList* RenderTextLinux::GetRunContainingCaret(
     const SelectionModel& caret) const {
   size_t position = TextIndexToLayoutIndex(caret.caret_pos());
   LogicalCursorDirection affinity = caret.caret_affinity();
   GSList* run = current_line_->runs;
@@ skipping 67 matching lines @@
   return bounds;
 }
 
 std::vector<Rect> RenderTextLinux::GetSelectionBounds() {
   if (selection_visual_bounds_.empty())
     selection_visual_bounds_ = CalculateSubstringBounds(selection());
   return selection_visual_bounds_;
 }
 
 }  // namespace gfx