From b0b0feb71f0841497c041aa4aca2b10e032224e0 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 5 Jun 2014 18:03:39 -0400 Subject: [PATCH] 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 --- src/ports/SkFontMgr_win_dw.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index fe82258c..8633775 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 impl(SkFontMgr_New_DirectWrite()); if (impl.get() == NULL) { return NULL; -- 2.7.4