Fix Google3 fonts.

src/ports/SkFontConfigInterfaceDirect.h

+/*
+ * Copyright 2009-2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
+
+#include "SkFontConfigInterface.h"
+#include "SkMutex.h"
+
+#include <fontconfig/fontconfig.h>

[bungeman-skia, 2015/11/30 17:54:40]

Can this just be forward declarations, like

struct FcFontSet;
struct FcPattern;

since these types are only used privately.

[dogben, 2015/11/30 18:20:21]

FcPattern is a typedef. Is there a way to forward-declare a typedef in C++?

[bungeman-skia, 2015/11/30 18:25:39]

Ah, yes, ick. Ok, we can leave this alone then.

+
+class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
+public:
+    SkFontConfigInterfaceDirect();
+    ~SkFontConfigInterfaceDirect() override;
+
+    bool matchFamilyName(const char familyName[],
+                         SkTypeface::Style requested,
+                         FontIdentity* outFontIdentifier,
+                         SkString* outFamilyName,
+                         SkTypeface::Style* outStyle) override;
+    SkStreamAsset* openStream(const FontIdentity&) override;
+
+    // new APIs
+    SkDataTable* getFamilyNames() override;
+    bool matchFamilySet(const char inFamilyName[],
+                        SkString* outFamilyName,
+                        SkTArray<FontIdentity>*) override;
+
+protected:
+    virtual bool isAccessible(const char* filename);

[bungeman-skia, 2015/11/30 17:54:40]

As documentation, isAccessible should be private. We don't ever expect a derived
class to need to call it, just define it.

[dogben, 2015/11/30 18:20:21]

I called it in src/ports/SkFontConfigInterface_direct_google3.cpp.

I think I need to support loading fonts both from the cache and from disk. I can
investigate further if that seems like a bad idea.

[bungeman-skia, 2015/11/30 18:25:40]

Ah, I see. The code before just defined out the 'access' call I thought. Though
if we want to do both, sgtm.

+
+private:
+    SkMutex mutex_;
+
+    bool isValidPattern(FcPattern* pattern);
+    FcPattern* MatchFont(FcFontSet* font_set, const char* post_config_family,
+                         const SkString& family);
+    typedef SkFontConfigInterface INHERITED;
+};