diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 20:31:58 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-28 20:31:58 +0000 |
| commit | d1bcfc9a1938b051e5948b059a8259cd37fb8229 (patch) | |
| tree | 962b83ddae0a3337d4168df350a20795ab8f7ae0 /src/ports | |
| parent | 1a2e71d9a84238f49844ac8020b7bd8a6ede60ce (diff) | |
export SkFontMgr_New_... experimental functions for testing in chrome
BUG=
R=eae@chromium.org
Review URL: https://codereview.chromium.org/23555004
git-svn-id: http://skia.googlecode.com/svn/trunk@10991 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports')
| -rwxr-xr-x | src/ports/SkFontHost_win.cpp | 1 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win_dw.cpp | 1 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_default_dw.cpp | 3 | ||||
| -rw-r--r-- | src/ports/SkFontMgr_default_gdi.cpp | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 7ba14aac4f..4bce8b04c3 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -2391,7 +2391,6 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { #endif -extern SkFontMgr* SkFontMgr_New_GDI(); SkFontMgr* SkFontMgr_New_GDI() { return SkNEW(SkFontMgrGDI); } diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 41a06f1ece..cc9674e946 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -1899,7 +1899,6 @@ static HRESULT GetGetUserDefaultLocaleNameProc(GetUserDefaultLocaleNameProc* pro return S_OK; } -extern SkFontMgr* SkFontMgr_New_DirectWrite(); SkFontMgr* SkFontMgr_New_DirectWrite() { IDWriteFactory* factory; HRNM(get_dwrite_factory(&factory), "Could not get factory."); diff --git a/src/ports/SkFontMgr_default_dw.cpp b/src/ports/SkFontMgr_default_dw.cpp index 3e09446e48..e9ad295d6d 100644 --- a/src/ports/SkFontMgr_default_dw.cpp +++ b/src/ports/SkFontMgr_default_dw.cpp @@ -1,6 +1,5 @@ #include "SkFontMgr.h" - -extern SkFontMgr* SkFontMgr_New_DirectWrite(); +#include "SkTypeface_win.h" SkFontMgr* SkFontMgr::Factory() { return SkFontMgr_New_DirectWrite(); diff --git a/src/ports/SkFontMgr_default_gdi.cpp b/src/ports/SkFontMgr_default_gdi.cpp index 243d0cc983..c39ab81120 100644 --- a/src/ports/SkFontMgr_default_gdi.cpp +++ b/src/ports/SkFontMgr_default_gdi.cpp @@ -1,6 +1,5 @@ #include "SkFontMgr.h" - -extern SkFontMgr* SkFontMgr_New_GDI(); +#include "SkTypeface_win.h" SkFontMgr* SkFontMgr::Factory() { return SkFontMgr_New_GDI(); |