commit 72cf4fcafa54cfa04c5ec7cb8eaa3acb144712dd
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 21 22:48:32 2014 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 21 22:48:32 2014 +0000
tree f6d0aff66805377067c2345deefcb6a832f29ef4
parent 34ce63ca6b853724c152a116e1467c0eead87003

A remotable font management interface and DirectWrite implementation.

The introduced SkRemotableFontMgr is a font management interface designed for simple and fast proxy support. SkFontMgr_Indirect bridges a SkRemotableFontMgr and a local SkFontMgr to present a SkFontMgr interface.

This change is to be followed by https://codereview.chromium.org/132113015/ and  https://codereview.chromium.org/206693003 .

R=reed@google.com

Review URL: https://codereview.chromium.org/206683002

git-svn-id: http://skia.googlecode.com/svn/trunk@13897 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/ports.gyp

diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 7ecda5f..ee32570 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -27,14 +27,20 @@
         '../src/ports/SkAtomics_none.h',
         '../src/ports/SkAtomics_sync.h',
         '../src/ports/SkAtomics_win.h',
+        '../src/ports/SkMutex_none.h',
+        '../src/ports/SkMutex_pthread.h',
+        '../src/ports/SkMutex_win.h',
         '../src/ports/SkDebug_nacl.cpp',
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
 
+        '../src/fonts/SkFontMgr_indirect.cpp',
+        '../src/fonts/SkRemotableFontMgr.cpp',
         '../src/ports/SkFontHost_win.cpp',
         '../src/ports/SkFontHost_win_dw.cpp',
         '../src/ports/SkFontMgr_default_gdi.cpp',
         '../src/ports/SkFontMgr_default_dw.cpp',
+        '../src/ports/SkRemotableFontMgr_win_dw.cpp',
 
         '../src/ports/SkGlobalInitialization_default.cpp',
         '../src/ports/SkMemory_malloc.cpp',
@@ -52,6 +58,12 @@
         '../src/ports/SkTLS_pthread.cpp',
         '../src/ports/SkTLS_win.cpp',
         '../src/ports/SkXMLParser_empty.cpp',
+
+        '../include/ports/SkFontConfigInterface.h',
+        '../include/ports/SkFontMgr.h',
+        '../include/ports/SkFontMgr_indirect.h',
+        '../include/ports/SkFontStyle.h',
+        '../include/ports/SkRemotableFontMgr.h',
       ],
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"]', {

gyp/utils.gyp

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index d94f4a2..070d18a 100644
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -120,6 +120,8 @@
         '../include/utils/win/SkIStream.h',
         '../include/utils/win/SkTScopedComPtr.h',
         '../src/utils/win/SkAutoCoInitialize.cpp',
+        '../src/utils/win/SkDWrite.h',
+        '../src/utils/win/SkDWrite.cpp',
         '../src/utils/win/SkDWriteFontFileStream.cpp',
         '../src/utils/win/SkDWriteFontFileStream.h',
         '../src/utils/win/SkDWriteGeometrySink.cpp',
@@ -196,6 +198,8 @@
             '../include/utils/win/SkIStream.h',
             '../include/utils/win/SkTScopedComPtr.h',
             '../src/utils/win/SkAutoCoInitialize.cpp',
+            '../src/utils/win/SkDWrite.h',
+            '../src/utils/win/SkDWrite.cpp',
             '../src/utils/win/SkDWriteFontFileStream.cpp',
             '../src/utils/win/SkDWriteFontFileStream.h',
             '../src/utils/win/SkDWriteGeometrySink.cpp',