Merge 161704 - Don't hang if can't downsize font.

ui/gfx/platform_font_win.cc

Index: ui/gfx/platform_font_win.cc
===================================================================
--- ui/gfx/platform_font_win.cc	(revision 162156)
+++ ui/gfx/platform_font_win.cc	(working copy)
@@ -98,8 +98,14 @@
   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;
   }