| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #ifndef APP_GFX_FONT_H_ | 5 #ifndef GFX_FONT_H_ |
| 6 #define APP_GFX_FONT_H_ | 6 #define GFX_FONT_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #if defined(OS_WIN) | 12 #if defined(OS_WIN) |
| 13 typedef struct HFONT__* HFONT; | 13 typedef struct HFONT__* HFONT; |
| 14 #elif !defined(OS_MACOSX) | 14 #elif !defined(OS_MACOSX) |
| 15 #include "third_party/skia/include/core/SkRefCnt.h" | 15 #include "third_party/skia/include/core/SkRefCnt.h" |
| 16 class SkPaint; | 16 class SkPaint; |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 // Cached metrics, generated at construction | 273 // Cached metrics, generated at construction |
| 274 int height_; | 274 int height_; |
| 275 int ascent_; | 275 int ascent_; |
| 276 int avg_width_; | 276 int avg_width_; |
| 277 #endif | 277 #endif |
| 278 | 278 |
| 279 }; | 279 }; |
| 280 | 280 |
| 281 } // namespace gfx | 281 } // namespace gfx |
| 282 | 282 |
| 283 #endif // APP_GFX_FONT_H_ | 283 #endif // GFX_FONT_H_ |
| OLD | NEW |