diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-06 23:39:47 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-06 23:39:47 +0100 |
| commit | 642032029f65e9dc0d38fbb6d35ef656c73a292c (patch) | |
| tree | 78a22bd12d679ab532db490d631ee69fa085aec1 /layout/inspector/nsFontFace.cpp | |
| parent | 50ef259a2df60d020ccb02d76dc5aa4835ee319e (diff) | |
| parent | 2529b2edece0a0ed86553d1e73eef13c3848bf64 (diff) | |
| download | UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.gz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.lz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.xz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.zip | |
Merge branch 'master' into release
Diffstat (limited to 'layout/inspector/nsFontFace.cpp')
| -rw-r--r-- | layout/inspector/nsFontFace.cpp | 10 |
1 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); } |