| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "ui/gfx/font.h" | 5 #include "ui/gfx/font.h" | 
| 6 | 6 | 
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" | 
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" | 
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" | 
| 10 | 10 | 
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 136 TEST_F(FontTest, DeriveFontKeepsOriginalSizeIfHeightOk) { | 136 TEST_F(FontTest, DeriveFontKeepsOriginalSizeIfHeightOk) { | 
| 137   Font cf("Arial", 8); | 137   Font cf("Arial", 8); | 
| 138   // The minimum font size is set to 5 in browser_main.cc. | 138   // The minimum font size is set to 5 in browser_main.cc. | 
| 139   ScopedMinimumFontSizeCallback minimum_size(5); | 139   ScopedMinimumFontSizeCallback minimum_size(5); | 
| 140 | 140 | 
| 141   Font derived_font = cf.DeriveFont(-2); | 141   Font derived_font = cf.DeriveFont(-2); | 
| 142   EXPECT_EQ(6, derived_font.GetFontSize()); | 142   EXPECT_EQ(6, derived_font.GetFontSize()); | 
| 143 } | 143 } | 
| 144 #endif  // defined(OS_WIN) | 144 #endif  // defined(OS_WIN) | 
| 145 | 145 | 
|  | 146 #if defined(OS_MACOSX) | 
|  | 147 TEST_F(FontTest, FractionalWidth) { | 
|  | 148   Font cf("Arial", 16); | 
|  | 149 | 
|  | 150   float width = cf.GetAverageCharacterWidth(); | 
|  | 151   EXPECT_GT(width - static_cast<int>(width), 0); | 
|  | 152 | 
|  | 153   width = cf.GetExpectedTextWidth(1); | 
|  | 154   EXPECT_GT(width - static_cast<int>(width), 0); | 
|  | 155 | 
|  | 156   width = cf.GetStringWidth(ASCIIToUTF16("This is a test")); | 
|  | 157   EXPECT_GT(width - static_cast<int>(width), 0); | 
|  | 158 } | 
|  | 159 #endif | 
|  | 160 | 
| 146 }  // namespace | 161 }  // namespace | 
| 147 }  // namespace gfx | 162 }  // namespace gfx | 
| OLD | NEW | 
|---|