Get the About panel to align its links correctly,

app/gfx/canvas_linux.cc

 // Copyright (c) 2009 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 "app/gfx/canvas.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
@@ skipping 136 matching lines @@
   cairo_surface_t* surface =
       cairo_image_surface_create(CAIRO_FORMAT_ARGB32, 0, 0);
   cairo_t* cr = cairo_create(surface);
   PangoLayout* layout = pango_cairo_create_layout(cr);
 
   SetupPangoLayout(layout, font, *width, flags);
 
   std::string utf8 = WideToUTF8(text);
   pango_layout_set_text(layout, utf8.data(), utf8.size());
 
-  int chars_height;
-  pango_layout_get_size(layout, width, &chars_height);
-  *width /= PANGO_SCALE;
-  // Pango returns the height of the characters, not the height of the font.
-  *height = font.height();
+  pango_layout_get_pixel_size(layout, width, height);
 
   g_object_unref(layout);
   cairo_destroy(cr);
   cairo_surface_destroy(surface);
 }
 
 void Canvas::DrawStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            const SkColor& color,
                            int x, int y, int w, int h,
                            int flags) {
   cairo_t* cr = beginPlatformPaint();
   PangoLayout* layout = pango_cairo_create_layout(cr);
 
   SetupPangoLayout(layout, font, w, flags);
 
   pango_layout_set_height(layout, h * PANGO_SCALE);
 
   cairo_save(cr);
   cairo_set_source_rgb(cr,
                        SkColorGetR(color) / 255.0,
                        SkColorGetG(color) / 255.0,
                        SkColorGetB(color) / 255.0);
 
   std::string utf8 = WideToUTF8(text);
   pango_layout_set_text(layout, utf8.data(), utf8.size());
 
   int width, height;
-  pango_layout_get_size(layout, &width, &height);
-  width /= PANGO_SCALE;
-  height /= PANGO_SCALE;
+  pango_layout_get_pixel_size(layout, &width, &height);
 
   if (flags & Canvas::TEXT_VALIGN_TOP) {
     // Cairo should draw from the top left corner already.
   } else if (flags & Canvas::TEXT_VALIGN_BOTTOM) {
     y += (h - height);
   } else {
     // Vertically centered.
     y += ((h - height) / 2);
   }
 
@@ skipping 13 matching lines @@
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx