Fix SK_API for DirectWrite port.
authorBen Wagner <bungeman@google.com>
Thu, 5 Jun 2014 22:03:39 +0000 (18:03 -0400)
committerBen Wagner <bungeman@google.com>
Thu, 5 Jun 2014 22:03:39 +0000 (18:03 -0400)
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

index fe82258..8633775 100644 (file)
@@ -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;