Call Skia's version of SkFontHost_fontconfig

skia/ext/SkFontHost_fontconfig_direct.h

Index: skia/ext/SkFontHost_fontconfig_direct.h
===================================================================
--- skia/ext/SkFontHost_fontconfig_direct.h	(revision 186715)
+++ skia/ext/SkFontHost_fontconfig_direct.h	(working copy)
@@ -1,59 +0,0 @@
-/* libs/graphics/ports/SkFontHost_fontconfig_direct.h
-**
-** Copyright 2009, Google Inc.
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-#ifndef FontConfigDirect_DEFINED
-#define FontConfigDirect_DEFINED
-
-#include <map>
-#include <string>
-
-#include "SkThread.h"
-#include "SkFontHost_fontconfig_impl.h"
-
-class SK_API FontConfigDirect : public FontConfigInterface {
- public:
-  FontConfigDirect();
-  virtual ~FontConfigDirect();
-
-  // FontConfigInterface implementation. Thread safe.
-  virtual bool Match(std::string* result_family, unsigned* result_filefaceid,
-                     bool filefaceid_valid, unsigned filefaceid,
-                     const std::string& family,
-                     const void* characters, size_t characters_bytes,
-                     bool* is_bold, bool* is_italic) SK_OVERRIDE;
-  virtual int Open(unsigned filefaceid) SK_OVERRIDE;
-
- private:
-  SkMutex mutex_;
-  // fileid stored in two maps below are unique per font file.
-  std::map<unsigned, std::string> fileid_to_filename_;
-  std::map<std::string, unsigned> filename_to_fileid_;
-
-  // Cache of |family,style| to |FontMatch| to minimize querying FontConfig.
-  typedef std::pair<std::string, int> FontMatchKey;
-  struct FontMatch {
-    std::string family;
-    bool is_bold;
-    bool is_italic;
-    unsigned filefaceid;
-  };
-  std::map<FontMatchKey, FontMatch> font_match_cache_;
-
-  unsigned next_file_id_;
-};
-
-#endif  // FontConfigDirect_DEFINED