Blink side of the change to pass the system font metrics from the browser to the renderer on Windo…

Source/core/rendering/RenderThemeChromiumFontProviderWin.cpp

 /*
  * Copyright (C) 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/rendering/RenderThemeChromiumFontProvider.h"
 
 #include "core/CSSValueKeywords.h"
+#include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/win/HWndDC.h"
 #include "platform/win/SystemInfo.h"
 #include "wtf/text/WTFString.h"
 #include <windows.h>
 
 #define SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(structName, member) \
     offsetof(structName, member) + \
     (sizeof static_cast<structName*>(0)->member)
 #define NONCLIENTMETRICS_SIZE_PRE_VISTA \
@@ skipping 60 matching lines @@
 }
 
 // static
 void RenderThemeChromiumFontProvider::systemFont(CSSValueID systemFontID, FontStyle& fontStyle, FontWeight& fontWeight, float& fontSize, AtomicString& fontFamily)
 {
     fontStyle = FontStyleNormal;
     fontWeight = FontWeightNormal;
 
     switch (systemFontID) {
     case CSSValueSmallCaption: {
-        NONCLIENTMETRICS metrics;
-        getNonClientMetrics(&metrics);
-        fontSize = systemFontSize(metrics.lfSmCaptionFont);
-        fontFamily = AtomicString(metrics.lfSmCaptionFont.lfFaceName, wcslen(metrics.lfSmCaptionFont.lfFaceName));
+        fontSize = FontCache::smallCaptionFontHeight();
+        if (fontSize) {
+            fontFamily = AtomicString(FontCache::smallCaptionFontFamily());

[scottmg, 2015/01/06 23:15:23]

Since they're only used as AtomicString, maybe store as AtomicString instead of
String in FontCache?

+        } else {
+            NONCLIENTMETRICS metrics;
+            getNonClientMetrics(&metrics);
+            fontSize = systemFontSize(metrics.lfSmCaptionFont);
+            fontFamily = AtomicString(metrics.lfSmCaptionFont.lfFaceName, wcslen(metrics.lfSmCaptionFont.lfFaceName));
+        }
         break;
     }
     case CSSValueMenu: {
-        NONCLIENTMETRICS metrics;
-        getNonClientMetrics(&metrics);
-        fontSize = systemFontSize(metrics.lfMenuFont);
-        fontFamily = AtomicString(metrics.lfMenuFont.lfFaceName, wcslen(metrics.lfMenuFont.lfFaceName));
+        fontSize = FontCache::menuFontHeight();
+        if (fontSize) {
+            fontFamily = AtomicString(FontCache::menuFontFamily());
+        } else {
+            NONCLIENTMETRICS metrics;
+            getNonClientMetrics(&metrics);
+            fontSize = systemFontSize(metrics.lfMenuFont);
+            fontFamily = AtomicString(metrics.lfMenuFont.lfFaceName, wcslen(metrics.lfMenuFont.lfFaceName));
+        }
         break;
     }
     case CSSValueStatusBar: {
-        NONCLIENTMETRICS metrics;
-        getNonClientMetrics(&metrics);
-        fontSize = systemFontSize(metrics.lfStatusFont);
-        fontFamily = metrics.lfStatusFont.lfFaceName;
+        fontSize = FontCache::statusFontHeight();
+        if (fontSize) {
+            fontFamily = AtomicString(FontCache::statusFontFamily());
+        } else {
+            NONCLIENTMETRICS metrics;
+            getNonClientMetrics(&metrics);
+            fontSize = systemFontSize(metrics.lfStatusFont);
+            fontFamily = metrics.lfStatusFont.lfFaceName;
+        }
         break;
     }
     case CSSValueWebkitMiniControl:
     case CSSValueWebkitSmallControl:
     case CSSValueWebkitControl:
         // Why 2 points smaller? Because that's what Gecko does.
         fontSize = s_defaultFontSize - pointsToPixels(2);
         fontFamily = defaultGUIFont();
         break;
     default:
         fontSize = s_defaultFontSize;
         fontFamily = defaultGUIFont();
         break;
     }
 }
 
 // static
 void RenderThemeChromiumFontProvider::setDefaultFontSize(int fontSize)
 {
     s_defaultFontSize = static_cast<float>(fontSize);
 }
 
 } // namespace blink