Initialize font fallback when creating DWrite font manager

src/ports/SkFontMgr_win_dw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 246 matching lines @@
     *fontFileEnumerator = enumerator.release();
     return S_OK;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 class SkFontMgr_DirectWrite : public SkFontMgr {
 public:
     /** localeNameLength must include the null terminator. */
     SkFontMgr_DirectWrite(IDWriteFactory* factory, IDWriteFontCollection* fontCollection,
-                          WCHAR* localeName, int localeNameLength)
+                          WCHAR* localeName, int localeNameLength, IDWriteFontFallback* fallback)
         : fFactory(SkRefComPtr(factory))
         , fFontCollection(SkRefComPtr(fontCollection))
         , fLocaleName(localeNameLength)
+#if SK_HAS_DWRITE_2_H
+        , fFontFallback(SkSafeRefComPtr(fallback))
+#endif
     {
 #if SK_HAS_DWRITE_2_H
         if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) {
             // IUnknown::QueryInterface states that if it fails, punk will be set to nullptr.
             // http://blogs.msdn.com/b/oldnewthing/archive/2004/03/26/96777.aspx
             SkASSERT_RELEASE(nullptr == fFactory2.get());
         }
 #endif
         memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR));
     }
@@ skipping 21 matching lines @@
     HRESULT getDefaultFontFamily(IDWriteFontFamily** fontFamily) const;
 
     /** Creates a typeface using a typeface cache. */
     SkTypeface* createTypefaceFromDWriteFont(IDWriteFontFace* fontFace,
                                              IDWriteFont* font,
                                              IDWriteFontFamily* fontFamily) const;
 
     SkTScopedComPtr<IDWriteFactory> fFactory;
 #if SK_HAS_DWRITE_2_H
     SkTScopedComPtr<IDWriteFactory2> fFactory2;
+    SkTScopedComPtr<IDWriteFontFallback> fFontFallback;
 #endif
     SkTScopedComPtr<IDWriteFontCollection> fFontCollection;
     SkSMallocWCHAR fLocaleName;
     mutable SkMutex fTFCacheMutex;
     mutable SkTypefaceCache fTFCache;
 
     friend class SkFontStyleSet_DirectWrite;
     friend class FontFallbackRenderer;
 };
 
@@ skipping 433 matching lines @@
         dwBcp47 = &fLocaleName;
     } else {
         // TODO: support fallback stack.
         // TODO: DirectWrite supports 'zh-CN' or 'zh-Hans', but 'zh' misses completely
         // and may produce a Japanese font.
         HRN(sk_cstring_to_wchar(bcp47[bcp47Count - 1], &dwBcp47Local));
         dwBcp47 = &dwBcp47Local;
     }
 
 #if SK_HAS_DWRITE_2_H
-    if (fFactory2.get()) {
-        SkTScopedComPtr<IDWriteFontFallback> fontFallback;
-        HRNM(fFactory2->GetSystemFontFallback(&fontFallback), "Could not get system fallback.");
+    if (fFactory2.get() || fFontFallback.get()) {

[bungeman-skia, 2016/03/01 16:09:24]

As this code stands, this test actually needs to be

if (fFactory2.get()) {

we're still using fFactory2 below to create the number substitution, so it must
be non-null. Whether or not fFontFallback is nullptr at this point does not make
a difference.

[Ilya Kulshin, 2016/03/07 23:42:04]

Acknowledged.

+        SkTScopedComPtr<IDWriteFontFallback> systemFontFallback;
+        IDWriteFontFallback* fontFallback = fFontFallback.get();
+        if (!fontFallback) {
+          HRNM(fFactory2->GetSystemFontFallback(&systemFontFallback), "Could not get system fallback.");
+          fontFallback = systemFontFallback.get();
+        }

[bungeman-skia, 2016/03/01 16:09:24]

This code (resolving an IDWriteFontFallback) should be done either in the in the
SkFontMgr_DirectWrite constructor or the SkFontMgr_New_DirectWrite factory.

Note that this means the above test (line 769, just after #if SK_HAS_DWRITE_2_H)
would become

if (fFactory2.get() && fFontFallback.get()) {

[Ilya Kulshin, 2016/03/07 23:42:04]

Moved it to SkfontMgr_New_DirectWrite, since that function already has other
code that does similar things.

 
         SkTScopedComPtr<IDWriteNumberSubstitution> numberSubstitution;
         HRNM(fFactory2->CreateNumberSubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, nullptr, TRUE,
                                                  &numberSubstitution),
              "Could not create number substitution.");
         SkTScopedComPtr<FontFallbackSource> fontFallbackSource(
             new FontFallbackSource(str, strLen, *dwBcp47, numberSubstitution.get()));
 
         UINT32 mappedLength;
         SkTScopedComPtr<IDWriteFont> font;
@@ skipping 283 matching lines @@
     HRNM(font->CreateFontFace(&fontFace), "Could not create font face.");
 
     return fFontMgr->createTypefaceFromDWriteFont(fontFace.get(), font.get(),
                                                   fFontFamily.get());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 #include "SkTypeface_win.h"
 
 SK_API SkFontMgr* SkFontMgr_New_DirectWrite(IDWriteFactory* factory,
-                                            IDWriteFontCollection* collection) {
+                                            IDWriteFontCollection* collection,
+                                            IDWriteFontFallback* fallback) {
     if (nullptr == factory) {
         factory = sk_get_dwrite_factory();
         if (nullptr == factory) {
             return nullptr;
         }
     }
 
     SkTScopedComPtr<IDWriteFontCollection> systemFontCollection;
     if (nullptr == collection) {
         HRNM(factory->GetSystemFontCollection(&systemFontCollection, FALSE),
@@ skipping 10 matching lines @@
     HRESULT hr = SkGetGetUserDefaultLocaleNameProc(&getUserDefaultLocaleNameProc);
     if (nullptr == getUserDefaultLocaleNameProc) {
         SK_TRACEHR(hr, "Could not get GetUserDefaultLocaleName.");
     } else {
         localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
         if (localeNameLen) {
             localeName = localeNameStorage;
         };
     }
 
-    return new SkFontMgr_DirectWrite(factory, collection, localeName, localeNameLen);
+    return new SkFontMgr_DirectWrite(factory, collection, localeName, localeNameLen, fallback);
 }
 
 #include "SkFontMgr_indirect.h"
 SK_API SkFontMgr* SkFontMgr_New_DirectWriteRenderer(SkRemotableFontMgr* proxy) {
     SkAutoTUnref<SkFontMgr> impl(SkFontMgr_New_DirectWrite());
     if (impl.get() == nullptr) {
         return nullptr;
     }
     return new SkFontMgr_Indirect(impl.get(), proxy);
 }
 #endif//defined(SK_BUILD_FOR_WIN32)