commit d1bcfc9a1938b051e5948b059a8259cd37fb8229
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 28 20:31:58 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Aug 28 20:31:58 2013 +0000
tree 962b83ddae0a3337d4168df350a20795ab8f7ae0
parent 1a2e71d9a84238f49844ac8020b7bd8a6ede60ce

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

gm/fontmgr.cpp

diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 9c300ab..06288b2 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -12,8 +12,7 @@
 #include "SkTypeface.h"
 
 #ifdef SK_BUILD_FOR_WIN
-    extern SkFontMgr* SkFontMgr_New_GDI();
-    extern SkFontMgr* SkFontMgr_New_DirectWrite();
+    #include "SkTypeface_win.h"
 #endif
 
 // limit this just so we don't take too long to draw

include/ports/SkTypeface_win.h

diff --git a/include/ports/SkTypeface_win.h b/include/ports/SkTypeface_win.h
index fea5f47..e7dd4ab 100644
--- a/include/ports/SkTypeface_win.h
+++ b/include/ports/SkTypeface_win.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2011 Google Inc.
  *
@@ -6,8 +5,6 @@
  * found in the LICENSE file.
  */
 
-
-
 #ifndef SkTypeface_win_DEFINED
 #define SkTypeface_win_DEFINED
 
@@ -36,4 +33,10 @@
   */
 SK_API void SkTypeface_SetEnsureLOGFONTAccessibleProc(void (*)(const LOGFONT&));
 
+// Experimental!
+//
+class SkFontMgr;
+SK_API SkFontMgr* SkFontMgr_New_GDI();
+SK_API SkFontMgr* SkFontMgr_New_DirectWrite();
+
 #endif

src/ports/SkFontHost_win.cpp

diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 7ba14aa..4bce8b0 100755
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -2391,7 +2391,6 @@
 
 #endif
 
-extern SkFontMgr* SkFontMgr_New_GDI();
 SkFontMgr* SkFontMgr_New_GDI() {
     return SkNEW(SkFontMgrGDI);
 }

src/ports/SkFontHost_win_dw.cpp

diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index 41a06f1..cc9674e 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -1899,7 +1899,6 @@
     return S_OK;
 }
 
-extern SkFontMgr* SkFontMgr_New_DirectWrite();
 SkFontMgr* SkFontMgr_New_DirectWrite() {
     IDWriteFactory* factory;
     HRNM(get_dwrite_factory(&factory), "Could not get factory.");

src/ports/SkFontMgr_default_dw.cpp

diff --git a/src/ports/SkFontMgr_default_dw.cpp b/src/ports/SkFontMgr_default_dw.cpp
index 3e09446..e9ad295 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();

src/ports/SkFontMgr_default_gdi.cpp

diff --git a/src/ports/SkFontMgr_default_gdi.cpp b/src/ports/SkFontMgr_default_gdi.cpp
index 243d0cc..c39ab81 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();