Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Side by Side Diff: ui/gfx/platform_font_linux.h

Issue 2484863005: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Fix another conflict Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/gfx/skbitmap_operations.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef UI_GFX_PLATFORM_FONT_LINUX_H_ 5 #ifndef UI_GFX_PLATFORM_FONT_LINUX_H_
6 #define UI_GFX_PLATFORM_FONT_LINUX_H_ 6 #define UI_GFX_PLATFORM_FONT_LINUX_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "third_party/skia/include/core/SkRefCnt.h" 14 #include "third_party/skia/include/core/SkRefCnt.h"
15 #include "ui/gfx/font_render_params.h" 15 #include "ui/gfx/font_render_params.h"
16 #include "ui/gfx/platform_font.h" 16 #include "ui/gfx/platform_font.h"
17 17
18 class SkTypeface; 18 class SkTypeface;
19 class SkPaint;
20 19
21 namespace gfx { 20 namespace gfx {
22 21
23 class GFX_EXPORT PlatformFontLinux : public PlatformFont { 22 class GFX_EXPORT PlatformFontLinux : public PlatformFont {
24 public: 23 public:
25 // TODO(derat): Get rid of the default constructor in favor of using 24 // TODO(derat): Get rid of the default constructor in favor of using
26 // FontList (which also has the concept of a default font but may contain 25 // FontList (which also has the concept of a default font but may contain
27 // multiple font families) everywhere. See http://crbug.com/398885#c16. 26 // multiple font families) everywhere. See http://crbug.com/398885#c16.
28 PlatformFontLinux(); 27 PlatformFontLinux();
29 PlatformFontLinux(const std::string& font_name, int font_size_pixels); 28 PlatformFontLinux(const std::string& font_name, int font_size_pixels);
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // A font description string of the format used by FontList. 104 // A font description string of the format used by FontList.
106 static std::string* default_font_description_; 105 static std::string* default_font_description_;
107 #endif 106 #endif
108 107
109 DISALLOW_COPY_AND_ASSIGN(PlatformFontLinux); 108 DISALLOW_COPY_AND_ASSIGN(PlatformFontLinux);
110 }; 109 };
111 110
112 } // namespace gfx 111 } // namespace gfx
113 112
114 #endif // UI_GFX_PLATFORM_FONT_LINUX_H_ 113 #endif // UI_GFX_PLATFORM_FONT_LINUX_H_
OLDNEW
« no previous file with comments | « ui/gfx/native_widget_types.h ('k') | ui/gfx/skbitmap_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698