Remove unnecessary ifdefs from font code

Remove unnecessary precompiler conditional statements from the font
platform code that always evaluate to true or are no longer needed.

R=dglazkov@chromium.org
BUG=

Review URL: https://codereview.chromium.org/209083003

git-svn-id: svn://svn.chromium.org/blink/trunk@169785 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h

@@ -37,6 +37,7 @@
 #include "platform/fonts/FontWidthVariant.h"
 #include "wtf/Forward.h"
 #include "wtf/Noncopyable.h"
+#include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
 
 #if OS(MACOSX)
@@ -45,10 +46,7 @@
 typedef struct CGFont* CGFontRef;
 #endif
 
-#if OS(MACOSX) || OS(POSIX) || OS(WIN)
-#include "wtf/RefPtr.h"
 class SkTypeface;
-#endif
 
 namespace WebCore {
 
@@ -69,11 +67,10 @@ private:
 #if OS(MACOSX)
     explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>);
     RetainPtr<CGFontRef> m_cgFont;
-    RefPtr<SkTypeface> m_typeface;
-#elif OS(POSIX) || OS(WIN)
+#else
     explicit FontCustomPlatformData(PassRefPtr<SkTypeface>);
-    RefPtr<SkTypeface> m_typeface;
 #endif
+    RefPtr<SkTypeface> m_typeface;
 };
 
 } // namespace WebCore

third_party/WebKit/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

third_party/WebKit/Source/platform/fonts/skia/SimpleFontDataSkia.cpp

@@ -41,10 +41,6 @@
 #include "platform/geometry/FloatRect.h"
 #include "wtf/unicode/Unicode.h"
 
-#if OS(WIN)
-#include "platform/win/HWndDC.h"
-#endif
-
 namespace WebCore {
 
 // This is the largest VDMX table which we'll try to load and parse.