diff -r 000000000000 -r 6474c204b198 gfx/thebes/gfxFT2FontList.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/thebes/gfxFT2FontList.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,1544 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/MemoryReporting.h"
+
+#if (MOZ_WIDGET_GTK == 2)
+#include "gfxPlatformGtk.h"
+#define gfxToolkitPlatform gfxPlatformGtk
+#elif defined(MOZ_WIDGET_QT)
+#include <qfontinfo.h>
+#include "gfxQtPlatform.h"
+#define gfxToolkitPlatform gfxQtPlatform
+#elif defined(XP_WIN)
+#include "gfxWindowsPlatform.h"
+#define gfxToolkitPlatform gfxWindowsPlatform
+#elif defined(ANDROID)
+#include "mozilla/dom/ContentChild.h"
+#include "gfxAndroidPlatform.h"
+#include "mozilla/Omnijar.h"
+#include "nsIInputStream.h"
+#include "nsNetUtil.h"
+#define gfxToolkitPlatform gfxAndroidPlatform
+#endif
+
+#ifdef ANDROID
+#include "nsXULAppAPI.h"
+#include <dirent.h>
+#include <android/log.h>
+#define ALOG(args...)  __android_log_print(ANDROID_LOG_INFO, "Gecko" , ## args)
+#endif
+
+#include "ft2build.h"
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TAGS_H
+#include FT_TRUETYPE_TABLES_H
+#include "cairo-ft.h"
+
+#include "gfxFT2FontList.h"
+#include "gfxFT2Fonts.h"
+#include "gfxUserFontSet.h"
+#include "gfxFontUtils.h"
+
+#include "nsServiceManagerUtils.h"
+#include "nsTArray.h"
+#include "nsUnicharUtils.h"
+
+#include "nsDirectoryServiceUtils.h"
+#include "nsDirectoryServiceDefs.h"
+#include "nsAppDirectoryServiceDefs.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIMemory.h"
+#include "gfxFontConstants.h"
+
+#include "mozilla/Preferences.h"
+#include "mozilla/scache/StartupCache.h"
+#include <sys/stat.h>
+
+#ifdef XP_WIN
+#include "nsIWindowsRegKey.h"
+#include <windows.h>
+#endif
+
+using namespace mozilla;
+
+#ifdef PR_LOGGING
+static PRLogModuleInfo *
+GetFontInfoLog()
+{
+    static PRLogModuleInfo *sLog;
+    if (!sLog)
+        sLog = PR_NewLogModule("fontInfoLog");
+    return sLog;
+}
+#endif /* PR_LOGGING */
+
+#undef LOG
+#define LOG(args) PR_LOG(GetFontInfoLog(), PR_LOG_DEBUG, args)
+#define LOG_ENABLED() PR_LOG_TEST(GetFontInfoLog(), PR_LOG_DEBUG)
+
+static cairo_user_data_key_t sFTUserFontDataKey;
+
+static __inline void
+BuildKeyNameFromFontName(nsAString &aName)
+{
+#ifdef XP_WIN
+    if (aName.Length() >= LF_FACESIZE)
+        aName.Truncate(LF_FACESIZE - 1);
+#endif
+    ToLowerCase(aName);
+}
+
+// Helper to access the FT_Face for a given FT2FontEntry,
+// creating a temporary face if the entry does not have one yet.
+// This allows us to read font names, tables, etc if necessary
+// without permanently instantiating a freetype face and consuming
+// memory long-term.
+// This may fail (resulting in a null FT_Face), e.g. if it fails to
+// allocate memory to uncompress a font from omnijar.
+class AutoFTFace {
+public:
+    AutoFTFace(FT2FontEntry* aFontEntry)
+        : mFace(nullptr), mFontDataBuf(nullptr), mOwnsFace(false)
+    {
+        if (aFontEntry->mFTFace) {
+            mFace = aFontEntry->mFTFace;
+            return;
+        }
+
+        NS_ASSERTION(!aFontEntry->mFilename.IsEmpty(),
+                     "can't use AutoFTFace for fonts without a filename");
+        FT_Library ft = gfxToolkitPlatform::GetPlatform()->GetFTLibrary();
+
+        // A relative path (no initial "/") means this is a resource in
+        // omnijar, not an installed font on the device.
+        // The NS_ASSERTIONs here should never fail, as the resource must have
+        // been read successfully during font-list initialization or we'd never
+        // have created the font entry. The only legitimate runtime failure
+        // here would be memory allocation, in which case mFace remains null.
+        if (aFontEntry->mFilename[0] != '/') {
+            nsRefPtr<nsZipArchive> reader =
+                Omnijar::GetReader(Omnijar::Type::GRE);
+            nsZipItem *item = reader->GetItem(aFontEntry->mFilename.get());
+            NS_ASSERTION(item, "failed to find zip entry");
+
+            uint32_t bufSize = item->RealSize();
+            mFontDataBuf = static_cast<uint8_t*>(moz_malloc(bufSize));
+            if (mFontDataBuf) {
+                nsZipCursor cursor(item, reader, mFontDataBuf, bufSize);
+                cursor.Copy(&bufSize);
+                NS_ASSERTION(bufSize == item->RealSize(),
+                             "error reading bundled font");
+
+                if (FT_Err_Ok != FT_New_Memory_Face(ft, mFontDataBuf, bufSize,
+                                                    aFontEntry->mFTFontIndex,
+                                                    &mFace)) {
+                    NS_WARNING("failed to create freetype face");
+                }
+            }
+        } else {
+            if (FT_Err_Ok != FT_New_Face(ft, aFontEntry->mFilename.get(),
+                                         aFontEntry->mFTFontIndex, &mFace)) {
+                NS_WARNING("failed to create freetype face");
+            }
+        }
+        if (FT_Err_Ok != FT_Select_Charmap(mFace, FT_ENCODING_UNICODE)) {
+            NS_WARNING("failed to select Unicode charmap");
+        }
+        mOwnsFace = true;
+    }
+
+    ~AutoFTFace() {
+        if (mFace && mOwnsFace) {
+            FT_Done_Face(mFace);
+            if (mFontDataBuf) {
+                moz_free(mFontDataBuf);
+            }
+        }
+    }
+
+    operator FT_Face() { return mFace; }
+
+    // If we 'forget' the FT_Face (used when ownership is handed over to Cairo),
+    // we do -not- free the mFontDataBuf (if used); that also becomes the
+    // responsibility of the new owner of the face.
+    FT_Face forget() {
+        NS_ASSERTION(mOwnsFace, "can't forget() when we didn't own the face");
+        mOwnsFace = false;
+        return mFace;
+    }
+
+    const uint8_t* FontData() const { return mFontDataBuf; }
+
+private:
+    FT_Face  mFace;
+    uint8_t* mFontDataBuf; // Uncompressed data (for fonts stored in a JAR),
+                           // or null for fonts instantiated from a file.
+                           // If non-null, this must survive as long as the
+                           // FT_Face.
+    bool     mOwnsFace;
+};
+
+/*
+ * FT2FontEntry
+ * gfxFontEntry subclass corresponding to a specific face that can be
+ * rendered by freetype. This is associated with a face index in a
+ * file (normally a .ttf/.otf file holding a single face, but in principle
+ * there could be .ttc files with multiple faces).
+ * The FT2FontEntry can create the necessary FT_Face on demand, and can
+ * then create a Cairo font_face and scaled_font for drawing.
+ */
+
+cairo_scaled_font_t *
+FT2FontEntry::CreateScaledFont(const gfxFontStyle *aStyle)
+{
+    cairo_font_face_t *cairoFace = CairoFontFace();
+    if (!cairoFace) {
+        return nullptr;
+    }
+
+    cairo_scaled_font_t *scaledFont = nullptr;
+
+    cairo_matrix_t sizeMatrix;
+    cairo_matrix_t identityMatrix;
+
+    // XXX deal with adjusted size
+    cairo_matrix_init_scale(&sizeMatrix, aStyle->size, aStyle->size);
+    cairo_matrix_init_identity(&identityMatrix);
+
+    // synthetic oblique by skewing via the font matrix
+    bool needsOblique = !IsItalic() &&
+            (aStyle->style & (NS_FONT_STYLE_ITALIC | NS_FONT_STYLE_OBLIQUE));
+
+    if (needsOblique) {
+        const double kSkewFactor = 0.25;
+
+        cairo_matrix_t style;
+        cairo_matrix_init(&style,
+                          1,                //xx
+                          0,                //yx
+                          -1 * kSkewFactor,  //xy
+                          1,                //yy
+                          0,                //x0
+                          0);               //y0
+        cairo_matrix_multiply(&sizeMatrix, &sizeMatrix, &style);
+    }
+
+    cairo_font_options_t *fontOptions = cairo_font_options_create();
+
+    if (gfxPlatform::GetPlatform()->RequiresLinearZoom()) {
+        cairo_font_options_set_hint_metrics(fontOptions, CAIRO_HINT_METRICS_OFF);
+    }
+
+    scaledFont = cairo_scaled_font_create(cairoFace,
+                                          &sizeMatrix,
+                                          &identityMatrix, fontOptions);
+    cairo_font_options_destroy(fontOptions);
+
+    NS_ASSERTION(cairo_scaled_font_status(scaledFont) == CAIRO_STATUS_SUCCESS,
+                 "Failed to make scaled font");
+
+    return scaledFont;
+}
+
+FT2FontEntry::~FT2FontEntry()
+{
+    // Do nothing for mFTFace here since FTFontDestroyFunc is called by cairo.
+    mFTFace = nullptr;
+
+#ifndef ANDROID
+    if (mFontFace) {
+        cairo_font_face_destroy(mFontFace);
+        mFontFace = nullptr;
+    }
+#endif
+}
+
+gfxFont*
+FT2FontEntry::CreateFontInstance(const gfxFontStyle *aFontStyle, bool aNeedsBold)
+{
+    cairo_scaled_font_t *scaledFont = CreateScaledFont(aFontStyle);
+    if (!scaledFont) {
+        return nullptr;
+    }
+    gfxFont *font = new gfxFT2Font(scaledFont, this, aFontStyle, aNeedsBold);
+    cairo_scaled_font_destroy(scaledFont);
+    return font;
+}
+
+/* static */
+FT2FontEntry*
+FT2FontEntry::CreateFontEntry(const gfxProxyFontEntry &aProxyEntry,
+                              const uint8_t *aFontData,
+                              uint32_t aLength)
+{
+    // Ownership of aFontData is passed in here; the fontEntry must
+    // retain it as long as the FT_Face needs it, and ensure it is
+    // eventually deleted.
+    FT_Face face;
+    FT_Error error =
+        FT_New_Memory_Face(gfxToolkitPlatform::GetPlatform()->GetFTLibrary(),
+                           aFontData, aLength, 0, &face);
+    if (error != FT_Err_Ok) {
+        NS_Free((void*)aFontData);
+        return nullptr;
+    }
+    if (FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_UNICODE)) {
+        FT_Done_Face(face);
+        NS_Free((void*)aFontData);
+        return nullptr;
+    }
+    // Create our FT2FontEntry, which inherits the name of the proxy
+    // as it's not guaranteed that the face has valid names (bug 737315)
+    FT2FontEntry* fe =
+        FT2FontEntry::CreateFontEntry(face, nullptr, 0, aProxyEntry.Name(),
+                                      aFontData);
+    if (fe) {
+        fe->mItalic = aProxyEntry.mItalic;
+        fe->mWeight = aProxyEntry.mWeight;
+        fe->mStretch = aProxyEntry.mStretch;
+        fe->mIsUserFont = true;
+    }
+    return fe;
+}
+
+class FTUserFontData {
+public:
+    FTUserFontData(FT_Face aFace, const uint8_t* aData)
+        : mFace(aFace), mFontData(aData)
+    {
+    }
+
+    ~FTUserFontData()
+    {
+        FT_Done_Face(mFace);
+        if (mFontData) {
+            NS_Free((void*)mFontData);
+        }
+    }
+
+    const uint8_t *FontData() const { return mFontData; }
+
+private:
+    FT_Face        mFace;
+    const uint8_t *mFontData;
+};
+
+static void
+FTFontDestroyFunc(void *data)
+{
+    FTUserFontData *userFontData = static_cast<FTUserFontData*>(data);
+    delete userFontData;
+}
+
+/* static */
+FT2FontEntry*
+FT2FontEntry::CreateFontEntry(const FontListEntry& aFLE)
+{
+    FT2FontEntry *fe = new FT2FontEntry(aFLE.faceName());
+    fe->mFilename = aFLE.filepath();
+    fe->mFTFontIndex = aFLE.index();
+    fe->mWeight = aFLE.weight();
+    fe->mStretch = aFLE.stretch();
+    fe->mItalic = aFLE.italic();
+    return fe;
+}
+
+// Helpers to extract font entry properties from an FT_Face
+static bool
+FTFaceIsItalic(FT_Face aFace)
+{
+    return !!(aFace->style_flags & FT_STYLE_FLAG_ITALIC);
+}
+
+static uint16_t
+FTFaceGetWeight(FT_Face aFace)
+{
+    TT_OS2 *os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(aFace, ft_sfnt_os2));
+    uint16_t os2weight = 0;
+    if (os2 && os2->version != 0xffff) {
+        // Technically, only 100 to 900 are valid, but some fonts
+        // have this set wrong -- e.g. "Microsoft Logo Bold Italic" has
+        // it set to 6 instead of 600.  We try to be nice and handle that
+        // as well.
+        if (os2->usWeightClass >= 100 && os2->usWeightClass <= 900) {
+            os2weight = os2->usWeightClass;
+        } else if (os2->usWeightClass >= 1 && os2->usWeightClass <= 9) {
+            os2weight = os2->usWeightClass * 100;
+        }
+    }
+
+    uint16_t result;
+    if (os2weight != 0) {
+        result = os2weight;
+    } else if (aFace->style_flags & FT_STYLE_FLAG_BOLD) {
+        result = 700;
+    } else {
+        result = 400;
+    }
+
+    NS_ASSERTION(result >= 100 && result <= 900, "Invalid weight in font!");
+
+    return result;
+}
+
+// Used to create the font entry for installed faces on the device,
+// when iterating over the fonts directories.
+// We use the FT_Face to retrieve the details needed for the font entry,
+// but unless we have been passed font data (i.e. for a user font),
+// we do *not* save a reference to it, nor create a cairo face,
+// as we don't want to keep a freetype face for every installed font
+// permanently in memory.
+/* static */
+FT2FontEntry*
+FT2FontEntry::CreateFontEntry(FT_Face aFace,
+                              const char* aFilename, uint8_t aIndex,
+                              const nsAString& aName,
+                              const uint8_t *aFontData)
+{
+    FT2FontEntry *fe = new FT2FontEntry(aName);
+    fe->mItalic = FTFaceIsItalic(aFace);
+    fe->mWeight = FTFaceGetWeight(aFace);
+    fe->mFilename = aFilename;
+    fe->mFTFontIndex = aIndex;
+
+    if (aFontData) {
+        fe->mFTFace = aFace;
+        int flags = gfxPlatform::GetPlatform()->FontHintingEnabled() ?
+                    FT_LOAD_DEFAULT :
+                    (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
+        fe->mFontFace = cairo_ft_font_face_create_for_ft_face(aFace, flags);
+        FTUserFontData *userFontData = new FTUserFontData(aFace, aFontData);
+        cairo_font_face_set_user_data(fe->mFontFace, &sFTUserFontDataKey,
+                                      userFontData, FTFontDestroyFunc);
+    }
+
+    return fe;
+}
+
+// construct font entry name for an installed font from names in the FT_Face,
+// and then create our FT2FontEntry
+static FT2FontEntry*
+CreateNamedFontEntry(FT_Face aFace, const char* aFilename, uint8_t aIndex)
+{
+    if (!aFace->family_name) {
+        return nullptr;
+    }
+    nsAutoString fontName;
+    AppendUTF8toUTF16(aFace->family_name, fontName);
+    if (aFace->style_name && strcmp("Regular", aFace->style_name)) {
+        fontName.AppendLiteral(" ");
+        AppendUTF8toUTF16(aFace->style_name, fontName);
+    }
+    return FT2FontEntry::CreateFontEntry(aFace, aFilename, aIndex, fontName);
+}
+
+FT2FontEntry*
+gfxFT2Font::GetFontEntry()
+{
+    return static_cast<FT2FontEntry*> (mFontEntry.get());
+}
+
+cairo_font_face_t *
+FT2FontEntry::CairoFontFace()
+{
+    if (!mFontFace) {
+        AutoFTFace face(this);
+        if (!face) {
+            return nullptr;
+        }
+        mFTFace = face.forget();
+        int flags = gfxPlatform::GetPlatform()->FontHintingEnabled() ?
+                    FT_LOAD_DEFAULT :
+                    (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
+        mFontFace = cairo_ft_font_face_create_for_ft_face(face, flags);
+        FTUserFontData *userFontData = new FTUserFontData(face, face.FontData());
+        cairo_font_face_set_user_data(mFontFace, &sFTUserFontDataKey,
+                                      userFontData, FTFontDestroyFunc);
+    }
+    return mFontFace;
+}
+
+// Copied/modified from similar code in gfxMacPlatformFontList.mm:
+// Complex scripts will not render correctly unless Graphite or OT
+// layout tables are present.
+// For OpenType, we also check that the GSUB table supports the relevant
+// script tag, to avoid using things like Arial Unicode MS for Lao (it has
+// the characters, but lacks OpenType support).
+
+// TODO: consider whether we should move this to gfxFontEntry and do similar
+// cmap-masking on all platforms to avoid using fonts that won't shape
+// properly.
+
+nsresult
+FT2FontEntry::ReadCMAP(FontInfoData *aFontInfoData)
+{
+    if (mCharacterMap) {
+        return NS_OK;
+    }
+
+    nsRefPtr<gfxCharacterMap> charmap = new gfxCharacterMap();
+
+    AutoFallibleTArray<uint8_t,16384> buffer;
+    nsresult rv = CopyFontTable(TTAG_cmap, buffer);
+    
+    if (NS_SUCCEEDED(rv)) {
+        bool unicodeFont;
+        bool symbolFont;
+        rv = gfxFontUtils::ReadCMAP(buffer.Elements(), buffer.Length(),
+                                    *charmap, mUVSOffset,
+                                    unicodeFont, symbolFont);
+    }
+
+    if (NS_SUCCEEDED(rv) && !HasGraphiteTables()) {
+        // We assume a Graphite font knows what it's doing,
+        // and provides whatever shaping is needed for the
+        // characters it supports, so only check/clear the
+        // complex-script ranges for non-Graphite fonts
+
+        // for layout support, check for the presence of opentype layout tables
+        bool hasGSUB = HasFontTable(TRUETYPE_TAG('G','S','U','B'));
+
+        for (const ScriptRange* sr = gfxPlatformFontList::sComplexScriptRanges;
+             sr->rangeStart; sr++) {
+            // check to see if the cmap includes complex script codepoints
+            if (charmap->TestRange(sr->rangeStart, sr->rangeEnd)) {
+                // We check for GSUB here, as GPOS alone would not be ok.
+                if (hasGSUB && SupportsScriptInGSUB(sr->tags)) {
+                    continue;
+                }
+                charmap->ClearRange(sr->rangeStart, sr->rangeEnd);
+            }
+        }
+    }
+
+#ifdef MOZ_WIDGET_ANDROID
+    // Hack for the SamsungDevanagari font, bug 1012365:
+    // pretend the font supports U+0972.
+    if (!charmap->test(0x0972) &&
+        charmap->test(0x0905) && charmap->test(0x0945)) {
+        charmap->set(0x0972);
+    }
+#endif
+
+    mHasCmapTable = NS_SUCCEEDED(rv);
+    if (mHasCmapTable) {
+        gfxPlatformFontList *pfl = gfxPlatformFontList::PlatformFontList();
+        mCharacterMap = pfl->FindCharMap(charmap);
+    } else {
+        // if error occurred, initialize to null cmap
+        mCharacterMap = new gfxCharacterMap();
+    }
+    return rv;
+}
+
+nsresult
+FT2FontEntry::CopyFontTable(uint32_t aTableTag,
+                            FallibleTArray<uint8_t>& aBuffer)
+{
+    AutoFTFace face(this);
+    if (!face) {
+        return NS_ERROR_FAILURE;
+    }
+
+    FT_Error status;
+    FT_ULong len = 0;
+    status = FT_Load_Sfnt_Table(face, aTableTag, 0, nullptr, &len);
+    if (status != FT_Err_Ok || len == 0) {
+        return NS_ERROR_FAILURE;
+    }
+
+    if (!aBuffer.SetLength(len)) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+    uint8_t *buf = aBuffer.Elements();
+    status = FT_Load_Sfnt_Table(face, aTableTag, 0, buf, &len);
+    NS_ENSURE_TRUE(status == FT_Err_Ok, NS_ERROR_FAILURE);
+
+    return NS_OK;
+}
+
+hb_blob_t*
+FT2FontEntry::GetFontTable(uint32_t aTableTag)
+{
+    if (mFontFace) {
+        // if there's a cairo font face, we may be able to return a blob
+        // that just wraps a range of the attached user font data
+        FTUserFontData *userFontData = static_cast<FTUserFontData*>(
+            cairo_font_face_get_user_data(mFontFace, &sFTUserFontDataKey));
+        if (userFontData && userFontData->FontData()) {
+            return GetTableFromFontData(userFontData->FontData(), aTableTag);
+        }
+    }
+
+    // otherwise, use the default method (which in turn will call our
+    // implementation of CopyFontTable)
+    return gfxFontEntry::GetFontTable(aTableTag);
+}
+
+void
+FT2FontEntry::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
+                                     FontListSizes* aSizes) const
+{
+    gfxFontEntry::AddSizeOfExcludingThis(aMallocSizeOf, aSizes);
+    aSizes->mFontListSize +=
+        mFilename.SizeOfExcludingThisIfUnshared(aMallocSizeOf);
+}
+
+void
+FT2FontEntry::AddSizeOfIncludingThis(MallocSizeOf aMallocSizeOf,
+                                     FontListSizes* aSizes) const
+{
+    aSizes->mFontListSize += aMallocSizeOf(this);
+    AddSizeOfExcludingThis(aMallocSizeOf, aSizes);
+}
+
+/*
+ * FT2FontFamily
+ * A standard gfxFontFamily; just adds a method used to support sending
+ * the font list from chrome to content via IPC.
+ */
+
+void
+FT2FontFamily::AddFacesToFontList(InfallibleTArray<FontListEntry>* aFontList)
+{
+    for (int i = 0, n = mAvailableFonts.Length(); i < n; ++i) {
+        const FT2FontEntry *fe =
+            static_cast<const FT2FontEntry*>(mAvailableFonts[i].get());
+        if (!fe) {
+            continue;
+        }
+        
+        aFontList->AppendElement(FontListEntry(Name(), fe->Name(),
+                                               fe->mFilename,
+                                               fe->Weight(), fe->Stretch(),
+                                               fe->IsItalic(),
+                                               fe->mFTFontIndex));
+    }
+}
+
+/*
+ * Startup cache support for the font list:
+ * We store the list of families and faces, with their style attributes and the
+ * corresponding font files, in the startup cache.
+ * This allows us to recreate the gfxFT2FontList collection of families and
+ * faces without instantiating Freetype faces for each font file (in order to
+ * find their attributes), leading to significantly quicker startup.
+ */
+
+#define CACHE_KEY "font.cached-list"
+
+class FontNameCache {
+public:
+    FontNameCache()
+        : mWriteNeeded(false)
+    {
+        mOps = (PLDHashTableOps) {
+            PL_DHashAllocTable,
+            PL_DHashFreeTable,
+            StringHash,
+            HashMatchEntry,
+            MoveEntry,
+            PL_DHashClearEntryStub,
+            PL_DHashFinalizeStub,
+            nullptr
+        };
+
+        PL_DHashTableInit(&mMap, &mOps, nullptr, sizeof(FNCMapEntry), 0);
+
+        NS_ABORT_IF_FALSE(XRE_GetProcessType() == GeckoProcessType_Default,
+                          "StartupCacheFontNameCache should only be used in chrome process");
+        mCache = mozilla::scache::StartupCache::GetSingleton();
+
+        Init();
+    }
+
+    ~FontNameCache()
+    {
+        if (!mMap.ops) {
+            return;
+        }
+        if (!mWriteNeeded || !mCache) {
+            PL_DHashTableFinish(&mMap);
+            return;
+        }
+
+        nsAutoCString buf;
+        PL_DHashTableEnumerate(&mMap, WriteOutMap, &buf);
+        PL_DHashTableFinish(&mMap);
+        mCache->PutBuffer(CACHE_KEY, buf.get(), buf.Length() + 1);
+    }
+
+    void Init()
+    {
+        if (!mMap.ops || !mCache) {
+            return;
+        }
+        uint32_t size;
+        char* buf;
+        if (NS_FAILED(mCache->GetBuffer(CACHE_KEY, &buf, &size))) {
+            return;
+        }
+
+        LOG(("got: %s from the cache", nsDependentCString(buf, size).get()));
+
+        const char* beginning = buf;
+        const char* end = strchr(beginning, ';');
+        while (end) {
+            nsCString filename(beginning, end - beginning);
+            beginning = end + 1;
+            if (!(end = strchr(beginning, ';'))) {
+                break;
+            }
+            nsCString faceList(beginning, end - beginning);
+            beginning = end + 1;
+            if (!(end = strchr(beginning, ';'))) {
+                break;
+            }
+            uint32_t timestamp = strtoul(beginning, nullptr, 10);
+            beginning = end + 1;
+            if (!(end = strchr(beginning, ';'))) {
+                break;
+            }
+            uint32_t filesize = strtoul(beginning, nullptr, 10);
+
+            FNCMapEntry* mapEntry =
+                static_cast<FNCMapEntry*>
+                (PL_DHashTableOperate(&mMap, filename.get(), PL_DHASH_ADD));
+            if (mapEntry) {
+                mapEntry->mFilename.Assign(filename);
+                mapEntry->mTimestamp = timestamp;
+                mapEntry->mFilesize = filesize;
+                mapEntry->mFaces.Assign(faceList);
+                // entries from the startupcache are marked "non-existing"
+                // until we have confirmed that the file still exists
+                mapEntry->mFileExists = false;
+            }
+
+            beginning = end + 1;
+            end = strchr(beginning, ';');
+        }
+
+        // Should we use free() or delete[] here? See bug 684700.
+        free(buf);
+    }
+
+    virtual void
+    GetInfoForFile(const nsCString& aFileName, nsCString& aFaceList,
+                   uint32_t *aTimestamp, uint32_t *aFilesize)
+    {
+        if (!mMap.ops) {
+            return;
+        }
+        PLDHashEntryHdr *hdr =
+            PL_DHashTableOperate(&mMap, aFileName.get(), PL_DHASH_LOOKUP);
+        if (!hdr) {
+            return;
+        }
+        FNCMapEntry* entry = static_cast<FNCMapEntry*>(hdr);
+        if (entry && entry->mFilesize) {
+            *aTimestamp = entry->mTimestamp;
+            *aFilesize = entry->mFilesize;
+            aFaceList.Assign(entry->mFaces);
+            // this entry does correspond to an existing file
+            // (although it might not be up-to-date, in which case
+            // it will get overwritten via CacheFileInfo)
+            entry->mFileExists = true;
+        }
+    }
+
+    virtual void
+    CacheFileInfo(const nsCString& aFileName, const nsCString& aFaceList,
+                  uint32_t aTimestamp, uint32_t aFilesize)
+    {
+        if (!mMap.ops) {
+            return;
+        }
+        FNCMapEntry* entry =
+            static_cast<FNCMapEntry*>
+            (PL_DHashTableOperate(&mMap, aFileName.get(), PL_DHASH_ADD));
+        if (entry) {
+            entry->mFilename.Assign(aFileName);
+            entry->mTimestamp = aTimestamp;
+            entry->mFilesize = aFilesize;
+            entry->mFaces.Assign(aFaceList);
+            entry->mFileExists = true;
+        }
+        mWriteNeeded = true;
+    }
+
+private:
+    mozilla::scache::StartupCache* mCache;
+    PLDHashTable mMap;
+    bool mWriteNeeded;
+
+    PLDHashTableOps mOps;
+
+    static PLDHashOperator WriteOutMap(PLDHashTable *aTable,
+                                       PLDHashEntryHdr *aHdr,
+                                       uint32_t aNumber, void *aData)
+    {
+        FNCMapEntry* entry = static_cast<FNCMapEntry*>(aHdr);
+        if (!entry->mFileExists) {
+            // skip writing entries for files that are no longer present
+            return PL_DHASH_NEXT;
+        }
+
+        nsAutoCString* buf = reinterpret_cast<nsAutoCString*>(aData);
+        buf->Append(entry->mFilename);
+        buf->Append(';');
+        buf->Append(entry->mFaces);
+        buf->Append(';');
+        buf->AppendInt(entry->mTimestamp);
+        buf->Append(';');
+        buf->AppendInt(entry->mFilesize);
+        buf->Append(';');
+        return PL_DHASH_NEXT;
+    }
+
+    typedef struct : public PLDHashEntryHdr {
+    public:
+        nsCString mFilename;
+        uint32_t  mTimestamp;
+        uint32_t  mFilesize;
+        nsCString mFaces;
+        bool      mFileExists;
+    } FNCMapEntry;
+
+    static PLDHashNumber StringHash(PLDHashTable *table, const void *key)
+    {
+        return HashString(reinterpret_cast<const char*>(key));
+    }
+
+    static bool HashMatchEntry(PLDHashTable *table,
+                                 const PLDHashEntryHdr *aHdr, const void *key)
+    {
+        const FNCMapEntry* entry =
+            static_cast<const FNCMapEntry*>(aHdr);
+        return entry->mFilename.Equals(reinterpret_cast<const char*>(key));
+    }
+
+    static void MoveEntry(PLDHashTable *table, const PLDHashEntryHdr *aFrom,
+                          PLDHashEntryHdr *aTo)
+    {
+        FNCMapEntry* to = static_cast<FNCMapEntry*>(aTo);
+        const FNCMapEntry* from = static_cast<const FNCMapEntry*>(aFrom);
+        to->mFilename.Assign(from->mFilename);
+        to->mTimestamp = from->mTimestamp;
+        to->mFilesize = from->mFilesize;
+        to->mFaces.Assign(from->mFaces);
+        to->mFileExists = from->mFileExists;
+    }
+};
+
+/***************************************************************
+ *
+ * gfxFT2FontList
+ *
+ */
+
+// For Mobile, we use gfxFT2Fonts, and we build the font list by directly
+// scanning the system's Fonts directory for OpenType and TrueType files.
+
+gfxFT2FontList::gfxFT2FontList()
+{
+}
+
+void
+gfxFT2FontList::AppendFacesFromCachedFaceList(const nsCString& aFileName,
+                                              bool aStdFile,
+                                              const nsCString& aFaceList)
+{
+    const char *beginning = aFaceList.get();
+    const char *end = strchr(beginning, ',');
+    while (end) {
+        nsString familyName =
+            NS_ConvertUTF8toUTF16(beginning, end - beginning);
+        ToLowerCase(familyName);
+        beginning = end + 1;
+        if (!(end = strchr(beginning, ','))) {
+            break;
+        }
+        nsString faceName =
+            NS_ConvertUTF8toUTF16(beginning, end - beginning);
+        beginning = end + 1;
+        if (!(end = strchr(beginning, ','))) {
+            break;
+        }
+        uint32_t index = strtoul(beginning, nullptr, 10);
+        beginning = end + 1;
+        if (!(end = strchr(beginning, ','))) {
+            break;
+        }
+        bool italic = (*beginning != '0');
+        beginning = end + 1;
+        if (!(end = strchr(beginning, ','))) {
+            break;
+        }
+        uint32_t weight = strtoul(beginning, nullptr, 10);
+        beginning = end + 1;
+        if (!(end = strchr(beginning, ','))) {
+            break;
+        }
+        int32_t stretch = strtol(beginning, nullptr, 10);
+
+        FontListEntry fle(familyName, faceName, aFileName,
+                          weight, stretch, italic, index);
+        AppendFaceFromFontListEntry(fle, aStdFile);
+
+        beginning = end + 1;
+        end = strchr(beginning, ',');
+    }
+}
+
+static void
+AppendToFaceList(nsCString& aFaceList,
+                 nsAString& aFamilyName, FT2FontEntry* aFontEntry)
+{
+    aFaceList.Append(NS_ConvertUTF16toUTF8(aFamilyName));
+    aFaceList.Append(',');
+    aFaceList.Append(NS_ConvertUTF16toUTF8(aFontEntry->Name()));
+    aFaceList.Append(',');
+    aFaceList.AppendInt(aFontEntry->mFTFontIndex);
+    aFaceList.Append(',');
+    aFaceList.Append(aFontEntry->IsItalic() ? '1' : '0');
+    aFaceList.Append(',');
+    aFaceList.AppendInt(aFontEntry->Weight());
+    aFaceList.Append(',');
+    aFaceList.AppendInt(aFontEntry->Stretch());
+    aFaceList.Append(',');
+}
+
+void
+FT2FontEntry::CheckForBrokenFont(gfxFontFamily *aFamily)
+{
+    // note if the family is in the "bad underline" blacklist
+    if (aFamily->IsBadUnderlineFamily()) {
+        mIsBadUnderlineFont = true;
+    }
+
+    // bug 721719 - set the IgnoreGSUB flag on entries for Roboto
+    // because of unwanted on-by-default "ae" ligature.
+    // (See also AppendFaceFromFontListEntry.)
+    if (aFamily->Name().EqualsLiteral("roboto")) {
+        mIgnoreGSUB = true;
+    }
+
+    // bug 706888 - set the IgnoreGSUB flag on the broken version of
+    // Droid Sans Arabic from certain phones, as identified by the
+    // font checksum in the 'head' table
+    else if (aFamily->Name().EqualsLiteral("droid sans arabic")) {
+        AutoFTFace face(this);
+        if (face) {
+            const TT_Header *head = static_cast<const TT_Header*>
+                (FT_Get_Sfnt_Table(face, ft_sfnt_head));
+            if (head && head->CheckSum_Adjust == 0xe445242) {
+                mIgnoreGSUB = true;
+            }
+        }
+    }
+}
+
+void
+gfxFT2FontList::AppendFacesFromFontFile(const nsCString& aFileName,
+                                        bool aStdFile,
+                                        FontNameCache *aCache)
+{
+    nsCString faceList;
+    uint32_t filesize = 0, timestamp = 0;
+    if (aCache) {
+        aCache->GetInfoForFile(aFileName, faceList, &timestamp, &filesize);
+    }
+
+    struct stat s;
+    int statRetval = stat(aFileName.get(), &s);
+    if (!faceList.IsEmpty() && 0 == statRetval &&
+        s.st_mtime == timestamp && s.st_size == filesize)
+    {
+        LOG(("using cached font info for %s", aFileName.get()));
+        AppendFacesFromCachedFaceList(aFileName, aStdFile, faceList);
+        return;
+    }
+
+#ifdef XP_WIN
+    FT_Library ftLibrary = gfxWindowsPlatform::GetPlatform()->GetFTLibrary();
+#elif defined(ANDROID)
+    FT_Library ftLibrary = gfxAndroidPlatform::GetPlatform()->GetFTLibrary();
+#endif
+    FT_Face dummy;
+    if (FT_Err_Ok == FT_New_Face(ftLibrary, aFileName.get(), -1, &dummy)) {
+        LOG(("reading font info via FreeType for %s", aFileName.get()));
+        nsCString faceList;
+        timestamp = s.st_mtime;
+        filesize = s.st_size;
+        for (FT_Long i = 0; i < dummy->num_faces; i++) {
+            FT_Face face;
+            if (FT_Err_Ok != FT_New_Face(ftLibrary, aFileName.get(), i, &face)) {
+                continue;
+            }
+            AddFaceToList(aFileName, i, aStdFile, face, faceList);
+            FT_Done_Face(face);
+        }
+        FT_Done_Face(dummy);
+        if (aCache && 0 == statRetval && !faceList.IsEmpty()) {
+            aCache->CacheFileInfo(aFileName, faceList, timestamp, filesize);
+        }
+    }
+}
+
+#define JAR_LAST_MODIFED_TIME "jar-last-modified-time"
+
+void
+gfxFT2FontList::FindFontsInOmnijar(FontNameCache *aCache)
+{
+    bool jarChanged = false;
+
+    mozilla::scache::StartupCache* cache =
+        mozilla::scache::StartupCache::GetSingleton();
+    char *cachedModifiedTimeBuf;
+    uint32_t longSize;
+    int64_t jarModifiedTime;
+    if (cache &&
+        NS_SUCCEEDED(cache->GetBuffer(JAR_LAST_MODIFED_TIME,
+                                      &cachedModifiedTimeBuf,
+                                      &longSize)) &&
+        longSize == sizeof(int64_t))
+    {
+        nsCOMPtr<nsIFile> jarFile = Omnijar::GetPath(Omnijar::Type::GRE);
+        jarFile->GetLastModifiedTime(&jarModifiedTime);
+        if (jarModifiedTime > *(int64_t*)cachedModifiedTimeBuf) {
+            jarChanged = true;
+        }
+    }
+
+    static const char* sJarSearchPaths[] = {
+        "res/fonts/*.ttf$",
+    };
+    nsRefPtr<nsZipArchive> reader = Omnijar::GetReader(Omnijar::Type::GRE);
+    for (unsigned i = 0; i < ArrayLength(sJarSearchPaths); i++) {
+        nsZipFind* find;
+        if (NS_SUCCEEDED(reader->FindInit(sJarSearchPaths[i], &find))) {
+            const char* path;
+            uint16_t len;
+            while (NS_SUCCEEDED(find->FindNext(&path, &len))) {
+                nsCString entryName(path, len);
+                AppendFacesFromOmnijarEntry(reader, entryName, aCache,
+                                            jarChanged);
+            }
+            delete find;
+        }
+    }
+
+    if (cache) {
+        cache->PutBuffer(JAR_LAST_MODIFED_TIME, (char*)&jarModifiedTime,
+                         sizeof(jarModifiedTime));
+    }
+}
+
+// Given the freetype face corresponding to an entryName and face index,
+// add the face to the available font list and to the faceList string
+void
+gfxFT2FontList::AddFaceToList(const nsCString& aEntryName, uint32_t aIndex,
+                              bool aStdFile, FT_Face aFace,
+                              nsCString& aFaceList)
+{
+    if (FT_Err_Ok != FT_Select_Charmap(aFace, FT_ENCODING_UNICODE)) {
+        // ignore faces that don't support a Unicode charmap
+        return;
+    }
+
+    // build the font entry name and create an FT2FontEntry,
+    // but do -not- keep a reference to the FT_Face
+    FT2FontEntry* fe =
+        CreateNamedFontEntry(aFace, aEntryName.get(), aIndex);
+
+    if (fe) {
+        NS_ConvertUTF8toUTF16 name(aFace->family_name);
+        BuildKeyNameFromFontName(name);
+        gfxFontFamily *family = mFontFamilies.GetWeak(name);
+        if (!family) {
+            family = new FT2FontFamily(name);
+            mFontFamilies.Put(name, family);
+            if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
+                family->SetSkipSpaceFeatureCheck(true);
+            }
+            if (mBadUnderlineFamilyNames.Contains(name)) {
+                family->SetBadUnderlineFamily();
+            }
+        }
+        fe->mStandardFace = aStdFile;
+        family->AddFontEntry(fe);
+
+        fe->CheckForBrokenFont(family);
+
+        AppendToFaceList(aFaceList, name, fe);
+#ifdef PR_LOGGING
+        if (LOG_ENABLED()) {
+            LOG(("(fontinit) added (%s) to family (%s)"
+                 " with style: %s weight: %d stretch: %d",
+                 NS_ConvertUTF16toUTF8(fe->Name()).get(),
+                 NS_ConvertUTF16toUTF8(family->Name()).get(),
+                 fe->IsItalic() ? "italic" : "normal",
+                 fe->Weight(), fe->Stretch()));
+        }
+#endif
+    }
+}
+
+void
+gfxFT2FontList::AppendFacesFromOmnijarEntry(nsZipArchive* aArchive,
+                                            const nsCString& aEntryName,
+                                            FontNameCache *aCache,
+                                            bool aJarChanged)
+{
+    nsCString faceList;
+    if (aCache && !aJarChanged) {
+        uint32_t filesize, timestamp;
+        aCache->GetInfoForFile(aEntryName, faceList, &timestamp, &filesize);
+        if (faceList.Length() > 0) {
+            AppendFacesFromCachedFaceList(aEntryName, true, faceList);
+            return;
+        }
+    }
+
+    nsZipItem *item = aArchive->GetItem(aEntryName.get());
+    NS_ASSERTION(item, "failed to find zip entry");
+
+    uint32_t bufSize = item->RealSize();
+    // We use fallible allocation here; if there's not enough RAM, we'll simply
+    // ignore the bundled fonts and fall back to the device's installed fonts.
+    nsAutoPtr<uint8_t> buf(static_cast<uint8_t*>(moz_malloc(bufSize)));
+    if (!buf) {
+        return;
+    }
+
+    nsZipCursor cursor(item, aArchive, buf, bufSize);
+    uint8_t* data = cursor.Copy(&bufSize);
+    NS_ASSERTION(data && bufSize == item->RealSize(),
+                 "error reading bundled font");
+    if (!data) {
+        return;
+    }
+
+    FT_Library ftLibrary = gfxAndroidPlatform::GetPlatform()->GetFTLibrary();
+
+    FT_Face dummy;
+    if (FT_Err_Ok != FT_New_Memory_Face(ftLibrary, buf, bufSize, 0, &dummy)) {
+        return;
+    }
+
+    for (FT_Long i = 0; i < dummy->num_faces; i++) {
+        FT_Face face;
+        if (FT_Err_Ok != FT_New_Memory_Face(ftLibrary, buf, bufSize, i, &face)) {
+            continue;
+        }
+        AddFaceToList(aEntryName, i, true, face, faceList);
+        FT_Done_Face(face);
+    }
+
+    FT_Done_Face(dummy);
+
+    if (aCache && !faceList.IsEmpty()) {
+        aCache->CacheFileInfo(aEntryName, faceList, 0, bufSize);
+    }
+}
+
+// Called on each family after all fonts are added to the list;
+// this will sort faces to give priority to "standard" font files
+// if aUserArg is non-null (i.e. we're using it as a boolean flag)
+static PLDHashOperator
+FinalizeFamilyMemberList(nsStringHashKey::KeyType aKey,
+                         nsRefPtr<gfxFontFamily>& aFamily,
+                         void* aUserArg)
+{
+    gfxFontFamily *family = aFamily.get();
+    bool sortFaces = (aUserArg != nullptr);
+
+    family->SetHasStyles(true);
+
+    if (sortFaces) {
+        family->SortAvailableFonts();
+    }
+    family->CheckForSimpleFamily();
+
+    return PL_DHASH_NEXT;
+}
+
+void
+gfxFT2FontList::FindFonts()
+{
+#ifdef XP_WIN
+    nsTArray<nsString> searchPaths(3);
+    nsTArray<nsString> fontPatterns(3);
+    fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.ttf"));
+    fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.ttc"));
+    fontPatterns.AppendElement(NS_LITERAL_STRING("\\*.otf"));
+    wchar_t pathBuf[256];
+    SHGetSpecialFolderPathW(0, pathBuf, CSIDL_WINDOWS, 0);
+    searchPaths.AppendElement(pathBuf);
+    SHGetSpecialFolderPathW(0, pathBuf, CSIDL_FONTS, 0);
+    searchPaths.AppendElement(pathBuf);
+    nsCOMPtr<nsIFile> resDir;
+    NS_GetSpecialDirectory(NS_APP_RES_DIR, getter_AddRefs(resDir));
+    if (resDir) {
+        resDir->Append(NS_LITERAL_STRING("fonts"));
+        nsAutoString resPath;
+        resDir->GetPath(resPath);
+        searchPaths.AppendElement(resPath);
+    }
+    WIN32_FIND_DATAW results;
+    for (uint32_t i = 0;  i < searchPaths.Length(); i++) {
+        const nsString& path(searchPaths[i]);
+        for (uint32_t j = 0; j < fontPatterns.Length(); j++) { 
+            nsAutoString pattern(path);
+            pattern.Append(fontPatterns[j]);
+            HANDLE handle = FindFirstFileExW(pattern.get(),
+                                             FindExInfoStandard,
+                                             &results,
+                                             FindExSearchNameMatch,
+                                             nullptr,
+                                             0);
+            bool moreFiles = handle != INVALID_HANDLE_VALUE;
+            while (moreFiles) {
+                nsAutoString filePath(path);
+                filePath.AppendLiteral("\\");
+                filePath.Append(results.cFileName);
+                AppendFacesFromFontFile(NS_ConvertUTF16toUTF8(filePath));
+                moreFiles = FindNextFile(handle, &results);
+            }
+            if (handle != INVALID_HANDLE_VALUE)
+                FindClose(handle);
+        }
+    }
+#elif defined(ANDROID)
+    gfxFontCache *fc = gfxFontCache::GetCache();
+    if (fc)
+        fc->AgeAllGenerations();
+    mPrefFonts.Clear();
+    mCodepointsWithNoFonts.reset();
+
+    mCodepointsWithNoFonts.SetRange(0,0x1f);     // C0 controls
+    mCodepointsWithNoFonts.SetRange(0x7f,0x9f);  // C1 controls
+
+    if (XRE_GetProcessType() != GeckoProcessType_Default) {
+        // Content process: ask the Chrome process to give us the list
+        InfallibleTArray<FontListEntry> fonts;
+        mozilla::dom::ContentChild::GetSingleton()->SendReadFontList(&fonts);
+        for (uint32_t i = 0, n = fonts.Length(); i < n; ++i) {
+            AppendFaceFromFontListEntry(fonts[i], false);
+        }
+        // Passing null for userdata tells Finalize that it does not need
+        // to sort faces (because they were already sorted by chrome,
+        // so we just maintain the existing order)
+        mFontFamilies.Enumerate(FinalizeFamilyMemberList, nullptr);
+        LOG(("got font list from chrome process: %d faces in %d families",
+            fonts.Length(), mFontFamilies.Count()));
+        return;
+    }
+
+    // Chrome process: get the cached list (if any)
+    FontNameCache fnc;
+
+    // ANDROID_ROOT is the root of the android system, typically /system;
+    // font files are in /$ANDROID_ROOT/fonts/
+    nsCString root;
+    char *androidRoot = PR_GetEnv("ANDROID_ROOT");
+    if (androidRoot) {
+        root = androidRoot;
+    } else {
+        root = NS_LITERAL_CSTRING("/system");
+    }
+    root.Append("/fonts");
+
+    FindFontsInDir(root, &fnc);
+
+    if (mFontFamilies.Count() == 0) {
+        // if we can't find/read the font directory, we are doomed!
+        NS_RUNTIMEABORT("Could not read the system fonts directory");
+    }
+#endif // XP_WIN && ANDROID
+
+    // Look for fonts stored in omnijar, unless we're on a low-memory
+    // device where we don't want to spend the RAM to decompress them.
+    // (Prefs may disable this, or force-enable it even with low memory.)
+    bool lowmem;
+    nsCOMPtr<nsIMemory> mem = nsMemory::GetGlobalMemoryService();
+    if ((NS_SUCCEEDED(mem->IsLowMemoryPlatform(&lowmem)) && !lowmem &&
+         Preferences::GetBool("gfx.bundled_fonts.enabled")) ||
+        Preferences::GetBool("gfx.bundled_fonts.force-enabled")) {
+        FindFontsInOmnijar(&fnc);
+    }
+
+    // look for locally-added fonts in a "fonts" subdir of the profile
+    nsCOMPtr<nsIFile> localDir;
+    nsresult rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR,
+                                         getter_AddRefs(localDir));
+    if (NS_SUCCEEDED(rv) &&
+        NS_SUCCEEDED(localDir->Append(NS_LITERAL_STRING("fonts")))) {
+        nsCString localPath;
+        rv = localDir->GetNativePath(localPath);
+        if (NS_SUCCEEDED(rv)) {
+            FindFontsInDir(localPath, &fnc);
+        }
+    }
+
+    // Finalize the families by sorting faces into standard order
+    // and marking "simple" families.
+    // Passing non-null userData here says that we want faces to be sorted.
+    mFontFamilies.Enumerate(FinalizeFamilyMemberList, this);
+}
+
+#ifdef ANDROID
+void
+gfxFT2FontList::FindFontsInDir(const nsCString& aDir, FontNameCache *aFNC)
+{
+    static const char* sStandardFonts[] = {
+        "DroidSans.ttf",
+        "DroidSans-Bold.ttf",
+        "DroidSerif-Regular.ttf",
+        "DroidSerif-Bold.ttf",
+        "DroidSerif-Italic.ttf",
+        "DroidSerif-BoldItalic.ttf",
+        "DroidSansMono.ttf",
+        "DroidSansArabic.ttf",
+        "DroidSansHebrew.ttf",
+        "DroidSansThai.ttf",
+        "MTLmr3m.ttf",
+        "MTLc3m.ttf",
+        "NanumGothic.ttf",
+        "DroidSansJapanese.ttf",
+        "DroidSansFallback.ttf"
+    };
+
+    DIR *d = opendir(aDir.get());
+    if (!d) {
+        return;
+    }
+
+    struct dirent *ent = nullptr;
+    while ((ent = readdir(d)) != nullptr) {
+        const char *ext = strrchr(ent->d_name, '.');
+        if (!ext) {
+            continue;
+        }
+        if (strcasecmp(ext, ".ttf") == 0 ||
+            strcasecmp(ext, ".otf") == 0 ||
+            strcasecmp(ext, ".woff") == 0 ||
+            strcasecmp(ext, ".ttc") == 0) {
+            bool isStdFont = false;
+            for (unsigned int i = 0;
+                 i < ArrayLength(sStandardFonts) && !isStdFont; i++) {
+                isStdFont = strcmp(sStandardFonts[i], ent->d_name) == 0;
+            }
+
+            nsCString s(aDir);
+            s.Append('/');
+            s.Append(ent->d_name);
+
+            // Add the face(s) from this file to our font list;
+            // note that if we have cached info for this file in fnc,
+            // and the file is unchanged, we won't actually need to read it.
+            // If the file is new/changed, this will update the FontNameCache.
+            AppendFacesFromFontFile(s, isStdFont, aFNC);
+        }
+    }
+
+    closedir(d);
+}
+#endif
+
+void
+gfxFT2FontList::AppendFaceFromFontListEntry(const FontListEntry& aFLE,
+                                            bool aStdFile)
+{
+    FT2FontEntry* fe = FT2FontEntry::CreateFontEntry(aFLE);
+    if (fe) {
+        fe->mStandardFace = aStdFile;
+        nsAutoString name(aFLE.familyName());
+        gfxFontFamily *family = mFontFamilies.GetWeak(name);
+        if (!family) {
+            family = new FT2FontFamily(name);
+            mFontFamilies.Put(name, family);
+            if (mSkipSpaceLookupCheckFamilies.Contains(name)) {
+                family->SetSkipSpaceFeatureCheck(true);
+            }
+            if (mBadUnderlineFamilyNames.Contains(name)) {
+                family->SetBadUnderlineFamily();
+            }
+        }
+        family->AddFontEntry(fe);
+
+        fe->CheckForBrokenFont(family);
+    }
+}
+
+static PLDHashOperator
+AddFamilyToFontList(nsStringHashKey::KeyType aKey,
+                    nsRefPtr<gfxFontFamily>& aFamily,
+                    void* aUserArg)
+{
+    InfallibleTArray<FontListEntry>* fontlist =
+        reinterpret_cast<InfallibleTArray<FontListEntry>*>(aUserArg);
+
+    FT2FontFamily *family = static_cast<FT2FontFamily*>(aFamily.get());
+    family->AddFacesToFontList(fontlist);
+
+    return PL_DHASH_NEXT;
+}
+
+void
+gfxFT2FontList::GetFontList(InfallibleTArray<FontListEntry>* retValue)
+{
+    mFontFamilies.Enumerate(AddFamilyToFontList, retValue);
+}
+
+static void
+LoadSkipSpaceLookupCheck(nsTHashtable<nsStringHashKey>& aSkipSpaceLookupCheck)
+{
+    nsAutoTArray<nsString, 5> skiplist;
+    gfxFontUtils::GetPrefsFontList(
+        "font.whitelist.skip_default_features_space_check",
+        skiplist);
+    uint32_t numFonts = skiplist.Length();
+    for (uint32_t i = 0; i < numFonts; i++) {
+        ToLowerCase(skiplist[i]);
+        aSkipSpaceLookupCheck.PutEntry(skiplist[i]);
+    }
+}
+
+nsresult
+gfxFT2FontList::InitFontList()
+{
+    // reset font lists
+    gfxPlatformFontList::InitFontList();
+    
+    LoadSkipSpaceLookupCheck(mSkipSpaceLookupCheckFamilies);
+
+    FindFonts();
+
+    return NS_OK;
+}
+
+struct FullFontNameSearch {
+    FullFontNameSearch(const nsAString& aFullName)
+        : mFullName(aFullName), mFontEntry(nullptr)
+    { }
+
+    nsString     mFullName;
+    FT2FontEntry *mFontEntry;
+};
+
+// callback called for each family name, based on the assumption that the 
+// first part of the full name is the family name
+static PLDHashOperator
+FindFullName(nsStringHashKey::KeyType aKey,
+             nsRefPtr<gfxFontFamily>& aFontFamily,
+             void* userArg)
+{
+    FullFontNameSearch *data = reinterpret_cast<FullFontNameSearch*>(userArg);
+
+    // does the family name match up to the length of the family name?
+    const nsString& family = aFontFamily->Name();
+
+    nsString fullNameFamily;
+    data->mFullName.Left(fullNameFamily, family.Length());
+
+    // if so, iterate over faces in this family to see if there is a match
+    if (family.Equals(fullNameFamily, nsCaseInsensitiveStringComparator())) {
+        nsTArray<nsRefPtr<gfxFontEntry> >& fontList = aFontFamily->GetFontList();
+        int index, len = fontList.Length();
+        for (index = 0; index < len; index++) {
+            gfxFontEntry* fe = fontList[index];
+            if (!fe) {
+                continue;
+            }
+            if (fe->Name().Equals(data->mFullName,
+                                  nsCaseInsensitiveStringComparator())) {
+                data->mFontEntry = static_cast<FT2FontEntry*>(fe);
+                return PL_DHASH_STOP;
+            }
+        }
+    }
+
+    return PL_DHASH_NEXT;
+}
+
+gfxFontEntry* 
+gfxFT2FontList::LookupLocalFont(const gfxProxyFontEntry *aProxyEntry,
+                                const nsAString& aFontName)
+{
+    // walk over list of names
+    FullFontNameSearch data(aFontName);
+
+    mFontFamilies.Enumerate(FindFullName, &data);
+
+    if (!data.mFontEntry) {
+        return nullptr;
+    }
+
+    // Clone the font entry so that we can then set its style descriptors
+    // from the proxy rather than the actual font.
+
+    // Ensure existence of mFTFace in the original entry
+    data.mFontEntry->CairoFontFace();
+    if (!data.mFontEntry->mFTFace) {
+        return nullptr;
+    }
+
+    FT2FontEntry* fe =
+        FT2FontEntry::CreateFontEntry(data.mFontEntry->mFTFace,
+                                      data.mFontEntry->mFilename.get(),
+                                      data.mFontEntry->mFTFontIndex,
+                                      data.mFontEntry->Name(), nullptr);
+    if (fe) {
+        fe->mItalic = aProxyEntry->mItalic;
+        fe->mWeight = aProxyEntry->mWeight;
+        fe->mStretch = aProxyEntry->mStretch;
+        fe->mIsUserFont = fe->mIsLocalUserFont = true;
+    }
+
+    return fe;
+}
+
+gfxFontFamily*
+gfxFT2FontList::GetDefaultFont(const gfxFontStyle* aStyle)
+{
+#ifdef XP_WIN
+    HGDIOBJ hGDI = ::GetStockObject(SYSTEM_FONT);
+    LOGFONTW logFont;
+    if (hGDI && ::GetObjectW(hGDI, sizeof(logFont), &logFont)) {
+        nsAutoString resolvedName;
+        if (ResolveFontName(nsDependentString(logFont.lfFaceName), resolvedName)) {
+            return FindFamily(resolvedName);
+        }
+    }
+#elif defined(MOZ_WIDGET_GONK)
+    nsAutoString resolvedName;
+    if (ResolveFontName(NS_LITERAL_STRING("Fira Sans OT"), resolvedName)) {
+        return FindFamily(resolvedName);
+    }
+#elif defined(MOZ_WIDGET_ANDROID)
+    nsAutoString resolvedName;
+    if (ResolveFontName(NS_LITERAL_STRING("Roboto"), resolvedName) ||
+        ResolveFontName(NS_LITERAL_STRING("Droid Sans"), resolvedName)) {
+        return FindFamily(resolvedName);
+    }
+#endif
+    /* TODO: what about Qt or other platforms that may use this? */
+    return nullptr;
+}
+
+gfxFontEntry*
+gfxFT2FontList::MakePlatformFont(const gfxProxyFontEntry *aProxyEntry,
+                                 const uint8_t *aFontData,
+                                 uint32_t aLength)
+{
+    // The FT2 font needs the font data to persist, so we do NOT free it here
+    // but instead pass ownership to the font entry.
+    // Deallocation will happen later, when the font face is destroyed.
+    return FT2FontEntry::CreateFontEntry(*aProxyEntry, aFontData, aLength);
+}
+