Remove blink::isWindowsVistaOrGreater.

third_party/WebKit/Source/core/layout/LayoutThemeFontProviderWin.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
@@ skipping 11 matching lines @@
  * (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 "core/layout/LayoutThemeFontProvider.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*>(nullptr)->member)
-#define NONCLIENTMETRICS_SIZE_PRE_VISTA \
-    SIZEOF_STRUCT_WITH_SPECIFIED_LAST_MEMBER(NONCLIENTMETRICS, lfMessageFont)
-
 namespace blink {
 
 // Converts |points| to pixels. One point is 1/72 of an inch.
 static float pointsToPixels(float points)
 {
     static float pixelsPerInch = 0.0f;
     if (!pixelsPerInch) {
         HWndDC hdc(0); // What about printing? Is this the right DC?
         if (hdc) // Can this ever actually be 0?
             pixelsPerInch = GetDeviceCaps(hdc, LOGPIXELSY);
         else
             pixelsPerInch = 96.0f;
     }
 
     static const float pointsPerInch = 72.0f;
     return points / pointsPerInch * pixelsPerInch;
 }
 
 static bool getNonClientMetrics(NONCLIENTMETRICS* metrics)
 {
-    static UINT size = isWindowsVistaOrGreater() ?
-        sizeof(NONCLIENTMETRICS) : NONCLIENTMETRICS_SIZE_PRE_VISTA;
-    metrics->cbSize = size;
-    bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, size, metrics, 0);
+    metrics->cbSize = sizeof(NONCLIENTMETRICS);
+    bool success = !!SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), metrics, 0);
     ASSERT_UNUSED(success, success);
     return success;
 }
 
 // Return the height of system font |font| in pixels. We use this size by
 // default for some non-form-control elements.
 static float systemFontSize(const LOGFONT& font)
 {
     float size = -font.lfHeight;
     if (size < 0) {
@@ skipping 86 matching lines @@
     }
 }
 
 // static
 void LayoutThemeFontProvider::setDefaultFontSize(int fontSize)
 {
     s_defaultFontSize = static_cast<float>(fontSize);
 }
 
 } // namespace blink