| 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 #include "app/gfx/chrome_font.h" | 5 #include "app/gfx/font.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
| 9 | 9 |
| 10 #include "third_party/skia/include/core/SkTypeface.h" | 10 #include "third_party/skia/include/core/SkTypeface.h" |
| 11 #include "third_party/skia/include/core/SkPaint.h" | 11 #include "third_party/skia/include/core/SkPaint.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 | 14 |
| 15 Font::Font(const Font& other) { | 15 Font::Font(const Font& other) { |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 | 158 |
| 159 int Font::FontSize() { | 159 int Font::FontSize() { |
| 160 return font_size_; | 160 return font_size_; |
| 161 } | 161 } |
| 162 | 162 |
| 163 NativeFont Font::nativeFont() const { | 163 NativeFont Font::nativeFont() const { |
| 164 return typeface_; | 164 return typeface_; |
| 165 } | 165 } |
| 166 | 166 |
| 167 } // namespace gfx | 167 } // namespace gfx |
| OLD | NEW |
|---|
Chromium Code Reviews
