| 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/platform_font_linux.h" | 5 #include "ui/gfx/platform_font_linux.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/strings/string_piece.h" | 12 #include "base/strings/string_piece.h" |
| 13 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
| 14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
| 15 #include "build/build_config.h" |
| 15 #include "third_party/skia/include/core/SkPaint.h" | 16 #include "third_party/skia/include/core/SkPaint.h" |
| 16 #include "third_party/skia/include/core/SkString.h" | 17 #include "third_party/skia/include/core/SkString.h" |
| 17 #include "third_party/skia/include/core/SkTypeface.h" | 18 #include "third_party/skia/include/core/SkTypeface.h" |
| 18 #include "ui/gfx/canvas.h" | 19 #include "ui/gfx/canvas.h" |
| 19 #include "ui/gfx/font.h" | 20 #include "ui/gfx/font.h" |
| 20 #include "ui/gfx/font_list.h" | 21 #include "ui/gfx/font_list.h" |
| 21 #include "ui/gfx/linux_font_delegate.h" | 22 #include "ui/gfx/linux_font_delegate.h" |
| 22 #include "ui/gfx/text_utils.h" | 23 #include "ui/gfx/text_utils.h" |
| 23 | 24 |
| 24 namespace gfx { | 25 namespace gfx { |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 return new PlatformFontLinux; | 277 return new PlatformFontLinux; |
| 277 } | 278 } |
| 278 | 279 |
| 279 // static | 280 // static |
| 280 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, | 281 PlatformFont* PlatformFont::CreateFromNameAndSize(const std::string& font_name, |
| 281 int font_size) { | 282 int font_size) { |
| 282 return new PlatformFontLinux(font_name, font_size); | 283 return new PlatformFontLinux(font_name, font_size); |
| 283 } | 284 } |
| 284 | 285 |
| 285 } // namespace gfx | 286 } // namespace gfx |
| OLD | NEW |