Workaround bug in Pango that was resulted in incorrect wrapping....

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 149 matching lines @@
 
   PangoFontDescription* desc = gfx::Font::PangoFontFromGfxFont(font);
   pango_layout_set_font_description(layout, desc);
   pango_font_description_free(desc);
 }
 
 // static
 void Canvas::SizeStringInt(const std::wstring& text,
                            const gfx::Font& font,
                            int* width, int* height, int flags) {
+  int org_width = *width;
   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());
 
   pango_layout_get_pixel_size(layout, width, height);
 
+  if (org_width > 0 && flags & Canvas::MULTI_LINE &&
+      pango_layout_is_wrapped(layout)) {
+    // The text wrapped. There seems to be a bug in Pango when this happens
+    // such that the width returned from pango_layout_get_pixel_size is too
+    // small. Using the width from pango_layout_get_pixel_size in this case
+    // results in wrapping across more lines, which requires a bigger height.
+    // As a workaround we use the original width, which is not necessarily
+    // exactly correct, but isn't wrong by much.
+    *width = org_width;
+  }
+
   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) {
@@ skipping 49 matching lines @@
     NOTREACHED();
     return;
   }
 
   cairo_t* cr = beginPlatformPaint();
   gdk_cairo_set_source_pixbuf(cr, pixbuf, x, y);
   cairo_paint(cr);
 }
 
 }  // namespace gfx