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

Unified Diff: Source/platform/fonts/FontCustomPlatformData.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 | « no previous file | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/FontCustomPlatformData.h
diff --git a/Source/platform/fonts/FontCustomPlatformData.h b/Source/platform/fonts/FontCustomPlatformData.h
index e00e83c1f6987450082ea8577d680a9955546e71..f11c2901261f221aa27696e9b0e6401309bdc623 100644
--- a/Source/platform/fonts/FontCustomPlatformData.h
+++ b/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
« no previous file with comments | « no previous file | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698