Merge "Windows: Fix the default font size for form controls in non-1.0 device scale factor." to M56

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 16 matching lines @@
 
 #include "core/CSSValueKeywords.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontDescription.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 // Converts |points| to pixels. One point is 1/72 of an inch.
 static float pointsToPixels(float points) {
-  float pixelsPerInch = 96.0f * FontCache::deviceScaleFactor();
-  static const float pointsPerInch = 72.0f;
+  const float pixelsPerInch = 96.0f;
+  const float pointsPerInch = 72.0f;
   return points / pointsPerInch * pixelsPerInch;
 }
 
 // static
 void LayoutThemeFontProvider::systemFont(CSSValueID systemFontID,
                                          FontStyle& fontStyle,
                                          FontWeight& fontWeight,
                                          float& fontSize,
                                          AtomicString& fontFamily) {
   fontStyle = FontStyleNormal;
@@ skipping 27 matching lines @@
       break;
   }
 }
 
 // static
 void LayoutThemeFontProvider::setDefaultFontSize(int fontSize) {
   s_defaultFontSize = static_cast<float>(fontSize);
 }
 
 }  // namespace blink