Add request cache to SkFontHost_fontconfig.

src/ports/SkFontHost_fontconfig.cpp

Index: src/ports/SkFontHost_fontconfig.cpp
diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
index 5c9e89661790be334309527212e2478aef5d92c9..4619493891e2008630fec3123a71e9eab054da66 100644
--- a/src/ports/SkFontHost_fontconfig.cpp
+++ b/src/ports/SkFontHost_fontconfig.cpp
@@ -11,6 +11,7 @@
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
+#include "SkResourceCache.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -56,72 +57,143 @@ SkFontConfigInterface* SkFontHost_fontconfig_ref_global() {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-struct NameStyle {
-    NameStyle(const char* name, const SkFontStyle& style)
-        : fFamilyName(name)  // don't need to make a deep copy
-        , fStyle(style) {}
-
-    const char* fFamilyName;
-    SkFontStyle fStyle;
-};
-
-static bool find_by_NameStyle(SkTypeface* cachedTypeface,
-                              const SkFontStyle& cachedStyle,
-                              void* ctx)
-{
-    FontConfigTypeface* cachedFCTypeface = static_cast<FontConfigTypeface*>(cachedTypeface);
-    const NameStyle* nameStyle = static_cast<const NameStyle*>(ctx);
-
-    return nameStyle->fStyle == cachedStyle &&
-           cachedFCTypeface->isFamilyName(nameStyle->fFamilyName);
-}
-
 static bool find_by_FontIdentity(SkTypeface* cachedTypeface, const SkFontStyle&, void* ctx) {
     typedef SkFontConfigInterface::FontIdentity FontIdentity;
     FontConfigTypeface* cachedFCTypeface = static_cast<FontConfigTypeface*>(cachedTypeface);
-    FontIdentity* indentity = static_cast<FontIdentity*>(ctx);
+    FontIdentity* identity = static_cast<FontIdentity*>(ctx);
 
-    return cachedFCTypeface->getIdentity() == *indentity;
+    return cachedFCTypeface->getIdentity() == *identity;
 }
 
-SkTypeface* FontConfigTypeface::LegacyCreateTypeface(const char familyName[],
-                                                     SkTypeface::Style style)
+SK_DECLARE_STATIC_MUTEX(gSkFontHostRequestCacheMutex);
+class SkFontHostRequestCache {
+
+    // The value of maxSize here is a compromise between cache hits and cache size.
+    static const size_t gMaxSize = 1 << 12;
+
+    static SkFontHostRequestCache& Get() {
+        gSkFontHostRequestCacheMutex.assertHeld();
+        static SkFontHostRequestCache gCache(gMaxSize);
+        return gCache;
+    }
+
+public:
+    struct Request : public SkResourceCache::Key {
+    private:
+        Request(const char* name, size_t nameLen, const SkFontStyle& style)
+            : fSize(sizeof(Request) + nameLen)
+            , fStyle(style)
+        {
+            char* content = reinterpret_cast<char*>(this + 1);
+            sk_careful_memcpy(content, name, nameLen);
+            sk_bzero(content + nameLen, SkAlign4(nameLen) - nameLen);
+            this->init(&gSkFontHostRequestCacheMutex, 0,
+                       (sizeof(Request) - sizeof(SkResourceCache::Key)) + SkAlign4(nameLen));
+        }
+    public:
+        static Request* Create(const char* name, const SkFontStyle& style) {
+            size_t nameLen = name ? strlen(name) : 0;
+            char* storage = new char [sizeof(Request) + SkAlign4(nameLen)];

[bungeman-skia, 2016/02/11 18:23:36]

The SkResourceCache is going to try to 'delete' this instead of 'delete []'
this. Need different memory management to make this work.

[bungeman-skia, 2016/02/11 19:28:24]

Done.

+            return new (storage) Request(name, nameLen, style);
+        }
+        const uint32_t fSize;
+        const SkFontStyle fStyle;
+
+        static const size_t kSizofFields = sizeof(fSize) + sizeof(fStyle);
+    };
+    static_assert(sizeof(Request) - sizeof(SkResourceCache::Key) == Request::kSizofFields,
+                  "Request is a SkResourceCache::Key and must be packed.");
+
+private:
+    struct Result : public SkResourceCache::Rec {
+        Result(Request* request, SkTypeface* typeface)
+            : fRequest(request)
+            , fFace(SkSafeRef(typeface)) {}
+        Result(Result&&) = default;
+        Result& operator=(Result&&) = default;
+
+        const Key& getKey() const override { return *fRequest; }
+        size_t bytesUsed() const override { return fRequest->fSize + sizeof(fFace); }
+        const char* getCategory() const override { return "request_cache"; }
+        SkDiscardableMemory* diagnostic_only_getDiscardable() const override { return nullptr; }
+
+        SkAutoTDelete<Request> fRequest;
+        SkAutoTUnref<SkTypeface> fFace;
+    };
+
+    SkResourceCache fCachedResults;
+
+public:
+    SkFontHostRequestCache(size_t maxSize) : fCachedResults(maxSize) {}
+
+    /** Takes ownership of request. It will be deleted when no longer needed. */
+    void add(SkTypeface* face, Request* request) {
+        fCachedResults.add(new Result(request, face));
+    }
+    /** Does not take ownership of request. */
+    SkTypeface* findAndRef(Request* request) {
+        SkTypeface* face = nullptr;
+        fCachedResults.find(*request,
+                            [](const SkResourceCache::Rec& rec, void* context) {
+                                const Result& result = static_cast<const Result&>(rec);
+                                SkTypeface** face = static_cast<SkTypeface**>(context);
+
+                                *face = result.fFace;
+                                return true;
+                            },
+                            &face);
+        return SkSafeRef(face);
+    }
+
+    /** Takes ownership of request. It will be deleted when no longer needed. */
+    static void Add(SkTypeface* face, Request* request) {
+        SkAutoMutexAcquire ama(gSkFontHostRequestCacheMutex);
+        Get().add(face, request);
+    }
+
+    /** Does not take ownership of request. */
+    static SkTypeface* FindAndRef(Request* request) {
+        SkAutoMutexAcquire ama(gSkFontHostRequestCacheMutex);
+        return Get().findAndRef(request);
+    }
+};
+
+SkTypeface* FontConfigTypeface::LegacyCreateTypeface(const char requestedFamilyName[],
+                                                     SkTypeface::Style requestedOldStyle)
 {
     SkAutoTUnref<SkFontConfigInterface> fci(RefFCI());
     if (nullptr == fci.get()) {
         return nullptr;
     }
 
-    // Check if requested NameStyle is in the NameStyle cache.
-    SkFontStyle requestedStyle(style);
-    NameStyle nameStyle(familyName, requestedStyle);
-    SkTypeface* face = SkTypefaceCache::FindByProcAndRef(find_by_NameStyle, &nameStyle);
+    // Check if this request is already in the request cache.
+    using Request = SkFontHostRequestCache::Request;
+    SkFontStyle requestedStyle(requestedOldStyle);
+    SkAutoTDelete<Request> request(Request::Create(requestedFamilyName, requestedStyle));
+    SkTypeface* face = SkFontHostRequestCache::FindAndRef(request);
     if (face) {
-        //SkDebugf("found cached face <%s> <%s> %p [%d]\n",
-        //         familyName, ((FontConfigTypeface*)face)->getFamilyName(),
-        //         face, face->getRefCnt());
         return face;
     }
 
-    SkFontConfigInterface::FontIdentity indentity;
+    SkFontConfigInterface::FontIdentity identity;
     SkString outFamilyName;
-    SkTypeface::Style outStyle;
-    if (!fci->matchFamilyName(familyName, style, &indentity, &outFamilyName, &outStyle)) {
+    SkTypeface::Style outOldStyle;
+    if (!fci->matchFamilyName(requestedFamilyName, requestedOldStyle,
+                              &identity, &outFamilyName, &outOldStyle))
+    {
         return nullptr;
     }
 
     // Check if a typeface with this FontIdentity is already in the FontIdentity cache.
-    face = SkTypefaceCache::FindByProcAndRef(find_by_FontIdentity, &indentity);
+    face = SkTypefaceCache::FindByProcAndRef(find_by_FontIdentity, &identity);
     if (!face) {
-        face = FontConfigTypeface::Create(SkFontStyle(outStyle), indentity, outFamilyName);
+        face = FontConfigTypeface::Create(SkFontStyle(outOldStyle), identity, outFamilyName);
         // Add this FontIdentity to the FontIdentity cache.
-        SkTypefaceCache::Add(face, requestedStyle);
+        SkTypefaceCache::Add(face, SkFontStyle(outOldStyle));
     }
-    // TODO: Ensure requested NameStyle and resolved NameStyle are both in the NameStyle cache.
+    // Add this request to the request cache.
+    SkFontHostRequestCache::Add(face, request.release());
 
-    //SkDebugf("add face <%s> <%s> %p [%d]\n",
-    //         familyName, outFamilyName.c_str(),
-    //         face, face->getRefCnt());
     return face;
 }