Merge 13773 - For some Indian locales, the automatic font fallback by Windows...

chrome/browser/views/tabs/tab_renderer.cc

 // Copyright (c) 2006-2008 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 <limits>
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
@@ skipping 28 matching lines @@
 static const int kHoverDurationMs = 90;
 
 // How long the pulse throb takes.
 static const int kPulseDurationMs = 200;
 
 // How opaque to make the hover state (out of 1).
 static const double kHoverOpacity = 0.33;
 static const double kHoverOpacityVista = 0.7;
 
 // TODO(beng): (Cleanup) This stuff should move onto the class.
-static ChromeFont title_font;
+static ChromeFont* title_font = NULL;
 static int title_font_height = 0;
 static SkBitmap* close_button_n = NULL;
 static SkBitmap* close_button_h = NULL;
 static SkBitmap* close_button_p = NULL;
 static int close_button_height = 0;
 static int close_button_width = 0;
 static SkBitmap* waiting_animation_frames = NULL;
 static SkBitmap* loading_animation_frames = NULL;
 static SkBitmap* crashed_fav_icon = NULL;
 static int loading_animation_frame_count = 0;
 static int waiting_animation_frame_count = 0;
 static int waiting_to_loading_frame_count_ratio = 0;
 static SkBitmap* download_icon = NULL;
 static int download_icon_width = 0;
 static int download_icon_height = 0;
 
 TabRenderer::TabImage TabRenderer::tab_active = {0};
 TabRenderer::TabImage TabRenderer::tab_inactive = {0};
 TabRenderer::TabImage TabRenderer::tab_inactive_otr = {0};
 TabRenderer::TabImage TabRenderer::tab_hover = {0};
 
 namespace {
 
 void InitResources() {
   static bool initialized = false;
   if (!initialized) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    title_font = rb.GetFont(ResourceBundle::BaseFont);
-    title_font_height = title_font.height();
+    title_font = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont));
+    title_font_height = title_font->height();
 
     close_button_n = rb.GetBitmapNamed(IDR_TAB_CLOSE);
     close_button_h = rb.GetBitmapNamed(IDR_TAB_CLOSE_H);
     close_button_p = rb.GetBitmapNamed(IDR_TAB_CLOSE_P);
     close_button_width = close_button_n->width();
     close_button_height = close_button_n->height();
 
     TabRenderer::LoadTabImages(win_util::ShouldUseVistaFrame());
 
     // The loading animation image is a strip of states. Each state must be
@@ skipping 317 matching lines @@
       title = l10n_util::GetString(IDS_TAB_LOADING_TITLE);
     } else {
       title = l10n_util::GetString(IDS_TAB_UNTITLED_TITLE);
     }
   } else {
     Browser::FormatTitleForDisplay(&title);
   }
 
   SkColor title_color = IsSelected() ? kSelectedTitleColor
                                      : kUnselectedTitleColor;
-  canvas->DrawStringInt(title, title_font, title_color, title_bounds_.x(),
+  canvas->DrawStringInt(title, *title_font, title_color, title_bounds_.x(),
                         title_bounds_.y(), title_bounds_.width(),
                         title_bounds_.height());
 }
 
 void TabRenderer::Layout() {
   gfx::Rect lb = GetLocalBounds(false);
   if (lb.IsEmpty())
     return;
   lb.Inset(kLeftPadding, kTopPadding, kRightPadding, kBottomPadding);
 
@@ skipping 272 matching lines @@
     tab_inactive_otr.image_l = rb.GetBitmapNamed(IDR_TAB_INACTIVE_LEFT_OTR);
     tab_inactive_otr.image_c = rb.GetBitmapNamed(IDR_TAB_INACTIVE_CENTER_OTR);
     tab_inactive_otr.image_r = rb.GetBitmapNamed(IDR_TAB_INACTIVE_RIGHT_OTR);
   }
 
   tab_inactive.l_width = tab_inactive.image_l->width();
   tab_inactive.r_width = tab_inactive.image_r->width();
   // tab_[hover,inactive_otr] width are not used and are initialized to 0
   // during static initialization.
 }