Bug 666664 - Patch to fix warnings in gfx/thebes/gfxUserFontSet.cpp. r=BenWa

This commit is contained in:
Stephen Perry 2012-03-06 16:44:23 -05:00
Родитель 9a19e6358a
Коммит a030cc0197
2 изменённых файлов: 11 добавлений и 3 удалений

Просмотреть файл

@ -402,9 +402,11 @@ StoreUserFontData(gfxFontEntry* aFontEntry, gfxProxyFontEntry* aProxy,
} }
} }
static void void
CopyWOFFMetadata(const PRUint8* aFontData, PRUint32 aLength, gfxUserFontSet::CopyWOFFMetadata(const PRUint8* aFontData,
nsTArray<PRUint8>* aMetadata, PRUint32* aMetaOrigLen) PRUint32 aLength,
nsTArray<PRUint8>* aMetadata,
PRUint32* aMetaOrigLen)
{ {
// This function may be called with arbitrary, unvalidated "font" data // This function may be called with arbitrary, unvalidated "font" data
// from @font-face, so it needs to be careful to bounds-check, etc., // from @font-face, so it needs to be careful to bounds-check, etc.,

Просмотреть файл

@ -281,6 +281,12 @@ protected:
PRUint64 mGeneration; PRUint64 mGeneration;
static PRLogModuleInfo *sUserFontsLog; static PRLogModuleInfo *sUserFontsLog;
private:
static void CopyWOFFMetadata(const PRUint8* aFontData,
PRUint32 aLength,
nsTArray<PRUint8>* aMetadata,
PRUint32* aMetaOrigLen);
}; };
// acts a placeholder until the real font is downloaded // acts a placeholder until the real font is downloaded