Use pixel sizes in PlatformFontWin instead of point sizes.

This matches the PlatformFontPango implementation and the comments for
|GetFontSize()|. Update users of this API appropriately and update header
comments to clarify that sizes are in pixels. Also, a few misc cleanup
changes.

BUG=none
TEST=Existing unit tests pass. Font sizes in Chromium UI do not change.

Review URL: http://codereview.chromium.org/8267009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106282 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 10 deletions

diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc
index 75f7916..06e260e 100644
--- a/ui/gfx/font_unittest.cc
+++ b/ui/gfx/font_unittest.cc
@@ -114,27 +114,21 @@ TEST_F(FontTest, Widths) {
 
 #if defined(OS_WIN)
 TEST_F(FontTest, DeriveFontResizesIfSizeTooSmall) {
-  // This creates font of height -8.
-  Font cf(L"Arial", 6);
+  Font cf(L"Arial", 8);
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.DeriveFont(-4);
-  LOGFONT font_info;
-  GetObject(derived_font.GetNativeFont(), sizeof(LOGFONT), &font_info);
-  EXPECT_EQ(-5, font_info.lfHeight);
+  EXPECT_EQ(5, derived_font.GetFontSize());
 }
 
 TEST_F(FontTest, DeriveFontKeepsOriginalSizeIfHeightOk) {
-  // This creates font of height -8.
-  Font cf(L"Arial", 6);
+  Font cf(L"Arial", 8);
   // The minimum font size is set to 5 in browser_main.cc.
   ScopedMinimumFontSizeCallback minimum_size(5);
 
   Font derived_font = cf.DeriveFont(-2);
-  LOGFONT font_info;
-  GetObject(derived_font.GetNativeFont(), sizeof(LOGFONT), &font_info);
-  EXPECT_EQ(-6, font_info.lfHeight);
+  EXPECT_EQ(6, derived_font.GetFontSize());
 }
 #endif  // defined(OS_WIN)