diff options
author | Ben Wagner <bungeman@google.com> | 2014-06-05 18:03:39 -0400 |
---|---|---|
committer | Ben Wagner <bungeman@google.com> | 2014-06-05 18:03:39 -0400 |
commit | b0b0feb71f0841497c041aa4aca2b10e032224e0 (patch) | |
tree | cbccd9b23de493ceb607d32e3c4adfeb072d9f73 /src | |
parent | 98875e1abde4339ca29e0ff975f2127ac7e00049 (diff) |
Fix SK_API for DirectWrite port.
The declaration and definition should have the same calling convention.
TBR=reed@google.com
Review URL: https://codereview.chromium.org/317993002
Diffstat (limited to 'src')
-rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index fe82258c68..863377564a 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -728,8 +728,9 @@ SkTypeface* SkFontStyleSet_DirectWrite::matchStyle(const SkFontStyle& pattern) { } //////////////////////////////////////////////////////////////////////////////// +#include "SkTypeface_win.h" -SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) { +SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) { if (NULL == factory) { factory = sk_get_dwrite_factory(); if (NULL == factory) { @@ -761,11 +762,8 @@ SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory) { localeName, localeNameLen)); } -//////////////////////////////////////////////////////////////////////////////// - #include "SkFontMgr_indirect.h" -#include "SkTypeface_win.h" -SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) { +SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) { SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite()); if (impl.get() == NULL) { return NULL; |