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

Unified Diff: Source/core/platform/graphics/FontDescription.h

Issue 18551004: Miscellaneous cleanup to reduce number of includes in platform/graphics/ Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/graphics/FontCache.cpp ('k') | Source/core/platform/graphics/FontDescription.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/FontDescription.h
diff --git a/Source/core/platform/graphics/FontDescription.h b/Source/core/platform/graphics/FontDescription.h
index 304d1829c46847ea3c39e22d93ed159b582cdb4a..227c5b1a6f9a0ab6312370d933353b2a4a7954f9 100644
--- a/Source/core/platform/graphics/FontDescription.h
+++ b/Source/core/platform/graphics/FontDescription.h
@@ -25,7 +25,6 @@
#ifndef FontDescription_h
#define FontDescription_h
-#include "FontFamilyNames.h"
#include "core/platform/graphics/FontFamily.h"
#include "core/platform/graphics/FontFeatureSettings.h"
#include "core/platform/graphics/FontOrientation.h"
@@ -41,8 +40,6 @@
namespace WebCore {
-using namespace FontFamilyNames;
-
enum FontWeight {
FontWeight100,
FontWeight200,
@@ -117,8 +114,7 @@ public:
FontWeight bolderWeight() const;
GenericFamilyType genericFamily() const { return static_cast<GenericFamilyType>(m_genericFamily); }
bool usePrinterFont() const { return m_usePrinterFont; }
- // only use fixed default size when there is only one font family, and that family is "monospace"
- bool useFixedDefaultSize() const { return genericFamily() == MonospaceFamily && !family().next() && family().family() == monospaceFamily; }
+ bool useFixedDefaultSize() const;
FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); }
Kerning kerning() const { return static_cast<Kerning>(m_kerning); }
LigaturesState commonLigaturesState() const { return static_cast<LigaturesState>(m_commonLigaturesState); }
« no previous file with comments | « Source/core/platform/graphics/FontCache.cpp ('k') | Source/core/platform/graphics/FontDescription.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698