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

Unified Diff: third_party/WebKit/Source/platform/fonts/FontPlatformData.h

Issue 1939363002: Remove unused FontRenderStyle from Windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
Index: third_party/WebKit/Source/platform/fonts/FontPlatformData.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformData.h b/third_party/WebKit/Source/platform/fonts/FontPlatformData.h
index 4e85939729e8e1fe33da5574ad31ea7696ab5ed9..cc06575009ec8b7fea3603363e4fae7ffdee7ca3 100644
--- a/third_party/WebKit/Source/platform/fonts/FontPlatformData.h
+++ b/third_party/WebKit/Source/platform/fonts/FontPlatformData.h
@@ -37,7 +37,6 @@
#include "platform/SharedBuffer.h"
#include "platform/fonts/FontDescription.h"
#include "platform/fonts/FontOrientation.h"
-#include "platform/fonts/FontRenderStyle.h"
#include "platform/fonts/SmallCapsIterator.h"
#include "platform/fonts/opentype/OpenTypeVerticalData.h"
#include "wtf/Allocator.h"
@@ -47,6 +46,10 @@
#include "wtf/text/CString.h"
#include "wtf/text/StringImpl.h"
+#if OS(LINUX) || OS(ANDROID)
+#include "platform/fonts/linux/FontRenderStyle.h"
+#endif // OS(LINUX) || OS(ANDROID)
+
#if OS(MACOSX)
OBJC_CLASS NSFont;
@@ -117,18 +120,13 @@ public:
unsigned minSizeForAntiAlias() const { return m_minSizeForAntiAlias; }
void setMinSizeForSubpixel(float size) { m_minSizeForSubpixel = size; }
float minSizeForSubpixel() const { return m_minSizeForSubpixel; }
- void setHinting(SkPaint::Hinting style)
- {
- m_style.useAutoHint = 0;
- m_style.hintStyle = style;
- }
#endif
bool fontContainsCharacter(UChar32 character);
PassRefPtr<OpenTypeVerticalData> verticalData() const;
PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
-#if !OS(MACOSX)
+#if OS(LINUX) || OS(ANDROID)
// The returned styles are all actual styles without FontRenderStyle::NoPreference.
const FontRenderStyle& getFontRenderStyle() const { return m_style; }
#endif
@@ -160,7 +158,7 @@ public:
bool m_syntheticItalic;
FontOrientation m_orientation;
private:
-#if !OS(MACOSX)
+#if OS(LINUX) || OS(ANDROID)
FontRenderStyle m_style;
#endif

Powered by Google App Engine
This is Rietveld 408576698