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

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

Issue 1021483004: Revert of Remove Mac native font type members from FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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/blink_platform.gypi ('k') | Source/platform/fonts/FontCustomPlatformData.cpp » ('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 30f44b180014d6530223b2c13ee102d58df9b604..c2f7824767e492e52caa4ca54e74e8b394c3c77b 100644
--- a/Source/platform/fonts/FontCustomPlatformData.h
+++ b/Source/platform/fonts/FontCustomPlatformData.h
@@ -39,6 +39,12 @@
#include "wtf/RefPtr.h"
#include "wtf/text/WTFString.h"
+#if OS(MACOSX)
+#include "wtf/RetainPtr.h"
+#include <CoreFoundation/CFBase.h>
+typedef struct CGFont* CGFontRef;
+#endif
+
class SkTypeface;
namespace blink {
@@ -57,7 +63,12 @@
static bool supportsFormat(const String&);
private:
+#if OS(MACOSX)
+ explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>);
+ RetainPtr<CGFontRef> m_cgFont;
+#else
explicit FontCustomPlatformData(PassRefPtr<SkTypeface>);
+#endif
RefPtr<SkTypeface> m_typeface;
};
« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/fonts/FontCustomPlatformData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698