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

Unified Diff: Source/platform/fonts/SimpleFontData.h

Issue 209083003: Remove unnecessary ifdefs from font code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/platform/fonts/FontCustomPlatformData.h ('k') | Source/platform/fonts/skia/SimpleFontDataSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/SimpleFontData.h
diff --git a/Source/platform/fonts/SimpleFontData.h b/Source/platform/fonts/SimpleFontData.h
index a4259f6d5d1b4937384392ab4b41fde9f4276ee5..efdefeabe7645aa196baa6c6980c8f77293e94bc 100644
--- a/Source/platform/fonts/SimpleFontData.h
+++ b/Source/platform/fonts/SimpleFontData.h
@@ -165,9 +165,7 @@ public:
CFDictionaryRef getCFStringAttributes(TypesettingFeatures, FontOrientation) const;
#endif
-#if OS(MACOSX) || USE(HARFBUZZ)
bool canRenderCombiningCharacterSequence(const UChar*, size_t) const;
-#endif
bool applyTransforms(GlyphBufferGlyph*, GlyphBufferAdvance*, size_t, TypesettingFeatures) const
{
@@ -249,9 +247,7 @@ private:
mutable HashMap<unsigned, RetainPtr<CFDictionaryRef> > m_CFStringAttributes;
#endif
-#if OS(MACOSX) || USE(HARFBUZZ)
mutable OwnPtr<HashMap<String, bool> > m_combiningCharacterSequenceSupport;
-#endif
};
ALWAYS_INLINE FloatRect SimpleFontData::boundsForGlyph(Glyph glyph) const
« no previous file with comments | « Source/platform/fonts/FontCustomPlatformData.h ('k') | Source/platform/fonts/skia/SimpleFontDataSkia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698