author | Stephen Perry <stevoooo@gmail.com> |
Tue, 06 Mar 2012 16:44:23 -0500 | |
changeset 88404 | ecdf3748265e3f244bb39246044659566f7a1105 |
parent 88403 | 6317057db545e4770adc26a5c4a30a414bf97228 |
child 88405 | 1d4397ee1e9a492c3239a90007d7462385070763 |
push id | 22194 |
push user | mak77@bonardo.net |
push date | Wed, 07 Mar 2012 09:33:54 +0000 |
treeherder | mozilla-central@8ef88a69f861 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | BenWa |
bugs | 666664 |
milestone | 13.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
gfx/thebes/gfxUserFontSet.cpp | file | annotate | diff | comparison | revisions | |
gfx/thebes/gfxUserFontSet.h | file | annotate | diff | comparison | revisions |
--- a/gfx/thebes/gfxUserFontSet.cpp +++ b/gfx/thebes/gfxUserFontSet.cpp @@ -397,19 +397,21 @@ StoreUserFontData(gfxFontEntry* aFontEnt userFontData->mFormat = src.mFormatFlags; userFontData->mRealName = aOriginalName; if (aMetadata) { userFontData->mMetadata.SwapElements(*aMetadata); userFontData->mMetaOrigLen = aMetaOrigLen; } } -static void -CopyWOFFMetadata(const PRUint8* aFontData, PRUint32 aLength, - nsTArray<PRUint8>* aMetadata, PRUint32* aMetaOrigLen) +void +gfxUserFontSet::CopyWOFFMetadata(const PRUint8* aFontData, + PRUint32 aLength, + nsTArray<PRUint8>* aMetadata, + PRUint32* aMetaOrigLen) { // This function may be called with arbitrary, unvalidated "font" data // from @font-face, so it needs to be careful to bounds-check, etc., // before trying to read anything. // This just saves a copy of the compressed data block; it does NOT check // that the block can be successfully decompressed, or that it contains // well-formed/valid XML metadata. struct WOFFHeader {
--- a/gfx/thebes/gfxUserFontSet.h +++ b/gfx/thebes/gfxUserFontSet.h @@ -276,16 +276,22 @@ protected: nsresult aStatus = 0) = 0; // font families defined by @font-face rules nsRefPtrHashtable<nsStringHashKey, gfxMixedFontFamily> mFontFamilies; PRUint64 mGeneration; 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 class gfxProxyFontEntry : public gfxFontEntry { friend class gfxUserFontSet; public: