Fix crash in fade tab title change

ui/gfx/canvas_skia_win.cc

 // Copyright (c) 2011 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_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 451 matching lines @@
       const gfx::Font& font,
       const SkColor& color,
       const gfx::Rect& display_rect) {
   int flags = NO_ELLIPSIS;
 
   // If the whole string fits in the destination then just draw it directly.
   int total_string_width;
   int total_string_height;
   SizeStringInt(text, font, &total_string_width, &total_string_height,
                 flags | TEXT_VALIGN_TOP);
-  if (total_string_width <= display_rect.width()) {
+  bool should_draw_directly = total_string_width <= display_rect.width();
+
+  // Create a temporary bitmap to draw the gradient to.

[Peter Kasting, 2011/04/09 00:56:44]

If this is really just a temporary hack, you should probably note that in your
comments.

+  scoped_ptr<skia::BitmapPlatformDevice> gradient_bitmap;
+  if (!should_draw_directly) {
+    gradient_bitmap.reset(skia::BitmapPlatformDevice::create(
+        NULL, display_rect.width(), display_rect.height(), false, NULL));
+    should_draw_directly = gradient_bitmap.get() != NULL;
+  }
+
+  if (should_draw_directly) {
     DrawStringInt(text, font, color, display_rect.x(), display_rect.y(),
-                  display_rect.width(), display_rect.height(), flags);
+                  display_rect.width(), display_rect.height(), 0);
     return;
   }
 
   int average_character_width = font.GetAverageCharacterWidth();
   int clipped_string_width = total_string_width - display_rect.width();
 
   // Clip the string by drawing it to the left by |offset_x|.
   int offset_x = 0;
   switch (truncate_mode) {
     case TruncateFadeHead:
@@ skipping 64 matching lines @@
   text_rect.set_width(text_rect.width() + offset_x);
 
   // Disable clear type. This makes the text render in gray scale which
   // makes it easier to compute the alpha value.
   LOGFONT font_info;
   GetObject(font.GetNativeFont(), sizeof(font_info), &font_info);
   font_info.lfQuality = ANTIALIASED_QUALITY;
   HFONT gray_scale_font = CreateFontIndirect(&font_info);
 
   HDC hdc = beginPlatformPaint();
-  scoped_ptr<skia::BitmapPlatformDevice> gradient_bitmap(
-      skia::BitmapPlatformDevice::create(NULL, display_rect.width(),
-                                         display_rect.height(), false, NULL));
   if (is_truncating_head)
     DrawTextGradientPart(hdc, *gradient_bitmap, text, color, gray_scale_font,
                          text_rect, head_part, is_rtl, flags);
   if (is_truncating_tail)
     DrawTextGradientPart(hdc, *gradient_bitmap, text, color, gray_scale_font,
                          text_rect, tail_part, !is_rtl, flags);
   endPlatformPaint();
 
   // Draw the solid part.
   save(kClip_SaveFlag);
   ClipRectInt(solid_part.x(), solid_part.y(),
               solid_part.width(), solid_part.height());
   DrawStringInt(text, font, color,
                 text_rect.x(), text_rect.y(),
                 text_rect.width(), text_rect.height(),
                 flags);
   restore();
   restore();
 }
 
 }  // namespace gfx