extend FontConfigInterface to start to match new fontmgr design

trunk/include/ports/SkFontConfigInterface.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkFontConfigInterface_DEFINED
 #define SkFontConfigInterface_DEFINED
 
+#include "SkFontStyle.h"
 #include "SkRefCnt.h"
 #include "SkTypeface.h"
 
 /**
  *  \class SkFontConfigInterface
  *
  *  Provides SkFontHost clients with access to fontconfig services. They will
  *  access the global instance found in RefGlobal().
  */
 class SK_API SkFontConfigInterface : public SkRefCnt {
@@ skipping 22 matching lines @@
 
         bool operator==(const FontIdentity& other) const {
             return fID == other.fID &&
                    fTTCIndex == other.fTTCIndex &&
                    fString == other.fString;
         }
 
         uint32_t    fID;
         int32_t     fTTCIndex;
         SkString    fString;
+        SkFontStyle fStyle;
     };
 
     /**
      *  Given a familyName and style, find the best match.
      *
      *  If a match is found, return true and set its outFontIdentifier.
      *      If outFamilyName is not null, assign the found familyName to it
      *          (which may differ from the requested familyName).
      *      If outStyle is not null, assign the found style to it
      *          (which may differ from the requested style).
@@ skipping 11 matching lines @@
      *  if the FontRef's data is not available. The caller is responsible for
      *  calling stream->unref() when it is done accessing the data.
      */
     virtual SkStream* openStream(const FontIdentity&) = 0;
 
     /**
      *  Return a singleton instance of a direct subclass that calls into
      *  libfontconfig. This does not affect the refcnt of the returned instance.
      */
     static SkFontConfigInterface* GetSingletonDirectInterface();
+
+    // New APIS, which have default impls for now (which do nothing)
+
+    virtual int countFamilies();
+    virtual int getFamilySet(int index, SkString* outFamilyName,
+                             FontIdentity outIdentities[], int maxCount);
+    virtual int matchFamilySet(const char familyName[], SkString* outFamilyName,
+                               FontIdentity outIdentities[], int maxCount);
 };

[bungeman-skia, 2013/03/29 21:13:37]

Maybe we also want matchFamilyStyle which does 'system fallback' for styles,
whatever that may mean. This could be seen as a helper, in that the user doesn't
need to do their own matching. On the other hand, DirectWrite doesn't have the
notion of fallback or closest fit styles, it pretty much has exactly what we
have here. So we'd have to write something for that. Then again, maybe it's
better that we write that once than having everyone else implement over and
over.

 
 #endif