diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-14 21:08:43 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-14 21:08:43 -0500 |
| commit | 1d30f6fa8413746ddc408f93710d701493af273d (patch) | |
| tree | abe84e83d704e13c60c90db7ac4b9e363d8a81fc /layout | |
| parent | 9308ec68e863e4c6e650680370a5d7baa9f0d1f3 (diff) | |
| parent | 00573571a226a0c59dd744da67483864a22911aa (diff) | |
| download | UXP-1d30f6fa8413746ddc408f93710d701493af273d.tar UXP-1d30f6fa8413746ddc408f93710d701493af273d.tar.gz UXP-1d30f6fa8413746ddc408f93710d701493af273d.tar.lz UXP-1d30f6fa8413746ddc408f93710d701493af273d.tar.xz UXP-1d30f6fa8413746ddc408f93710d701493af273d.zip | |
Merge branch 'master' into mailnews-work
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/inspector/nsFontFace.cpp | 10 | ||||
| -rw-r--r-- | layout/reftests/fonts/header-totalsfntsize-001.woff2 | bin | 980 -> 980 bytes |
2 files changed, 5 insertions, 5 deletions
diff --git a/layout/inspector/nsFontFace.cpp b/layout/inspector/nsFontFace.cpp index a4a9231e2..abf9f6439 100644 --- a/layout/inspector/nsFontFace.cpp +++ b/layout/inspector/nsFontFace.cpp @@ -9,7 +9,7 @@ #include "gfxUserFontSet.h" #include "nsFontFaceLoader.h" #include "mozilla/gfx/2D.h" -#include "decode.h" +#include "brotli/decode.h" #include "zlib.h" #include "mozilla/dom/FontFaceSet.h" @@ -208,10 +208,10 @@ nsFontFace::GetMetadata(nsAString & aMetadata) case gfxUserFontData::kBrotliCompression: { size_t decodedSize = userFontData->mMetaOrigLen; - if (BrotliDecompressBuffer(userFontData->mMetadata.Length(), - userFontData->mMetadata.Elements(), - &decodedSize, - (uint8_t*)str.BeginWriting()) == 1 && + if (BrotliDecoderDecompress(userFontData->mMetadata.Length(), + userFontData->mMetadata.Elements(), + &decodedSize, + (uint8_t*)str.BeginWriting()) == 1 && decodedSize == userFontData->mMetaOrigLen) { AppendUTF8toUTF16(str, aMetadata); } diff --git a/layout/reftests/fonts/header-totalsfntsize-001.woff2 b/layout/reftests/fonts/header-totalsfntsize-001.woff2 Binary files differindex 738560518..e02a0d867 100644 --- a/layout/reftests/fonts/header-totalsfntsize-001.woff2 +++ b/layout/reftests/fonts/header-totalsfntsize-001.woff2 |