Create font with DEFAULT_CHARSET instead of ANSI_CHARSET.

ui/gfx/platform_font_win.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/platform_font_win.h"
 
 #include <windows.h>
 #include <math.h>
 
 #include <algorithm>
@@ skipping 80 matching lines @@
 Font PlatformFontWin::DeriveFontWithHeight(int height, int style) {
   DCHECK_GE(height, 0);
   if (GetHeight() == height && GetStyle() == style)
     return Font(this);
 
   // CreateFontIndirect() doesn't return the largest size for the given height
   // when decreasing the height. Iterate to find it.
   if (GetHeight() > height) {
     const int min_font_size = GetMinimumFontSize();
     Font font = DeriveFont(-1, style);
-    while (font.GetHeight() > height && font.GetFontSize() != min_font_size) {
+    int font_height = font.GetHeight();
+    int font_size = font.GetFontSize();
+    while (font_height > height && font_size != min_font_size) {
       font = font.DeriveFont(-1, style);
+      if (font_height == font.GetHeight() && font_size == font.GetFontSize())
+        break;
+      font_height = font.GetHeight();
+      font_size = font.GetFontSize();
     }
     return font;
   }
 
   LOGFONT font_info;
   GetObject(GetNativeFont(), sizeof(LOGFONT), &font_info);
   font_info.lfHeight = height;
   SetLogFontStyle(style, &font_info);
 
   HFONT hfont = CreateFontIndirect(&font_info);
@@ skipping 72 matching lines @@
 // Font, private:
 
 void PlatformFontWin::InitWithCopyOfHFONT(HFONT hfont) {
   DCHECK(hfont);
   LOGFONT font_info;
   GetObject(hfont, sizeof(LOGFONT), &font_info);
   font_ref_ = CreateHFontRef(CreateFontIndirect(&font_info));
 }
 
 void PlatformFontWin::InitWithFontNameAndSize(const std::string& font_name,
                                               int font_size) {

[Vitaly Buka (NO REVIEWS), 2012/10/09 06:09:42]

This also fixes hang and makes visible work.
I still think we should fix DeriveFontWithHeight to avoid infinite loop.

-  HFONT hf = ::CreateFont(-font_size, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                          UTF8ToUTF16(font_name).c_str());
+  HFONT hf = ::CreateFont(-font_size, 0, 0, 0, 0, 0, 0, 0, DEFAULT_CHARSET, 0,

[msw, 2012/10/12 20:50:57]

MSDN indicates that this picks a char set "based on the current system locale",
which sounds good, but goes on to say "To ensure consistent results when
creating a font, do not specify... DEFAULT_CHARSET" and "make sure that the
fdwCharSet value matches the character set of the typeface specified in
lpszFace". Do you think this might fail on font-name/charset conflict or
similar? How is a NULL HFONT return value ultimately handled? (it looks like
it's not a special case...) Can we add some tests for this?

[Vitaly Buka (NO REVIEWS), 2012/10/12 21:11:33]

I guess with ANSI_CHARSET it's consistent in sense that it does not work on any
system for JA chars.
With DEFAULT_CHARSET it works at least where system locale is set.

On 2012/10/12 20:50:57, msw wrote:

+                          0, 0, 0, UTF8ToUTF16(font_name).c_str());
   font_ref_ = CreateHFontRef(hf);
 }
 
 // static
 PlatformFontWin::HFontRef* PlatformFontWin::GetBaseFontRef() {
   if (base_font_ref_ == NULL) {
     NONCLIENTMETRICS metrics;
     base::win::GetNonClientMetrics(&metrics);
 
     if (adjust_font_callback)
@@ skipping 101 matching lines @@
   return new PlatformFontWin(native_font);
 }
 
 // static
 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name,
                                                   int font_size) {
   return new PlatformFontWin(font_name, font_size);
 }
 
 }  // namespace gfx