summaryrefslogtreecommitdiffstats
path: root/layout
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-14 09:07:29 +0100
commit56de283899bc91f7110aba58a3ca174c10852683 (patch)
tree779e6501bbbe4f015509c423ab44f2f40ea97cc8 /layout
parentce0dd36a78814c59950fde6c19413c1f7ea85ee1 (diff)
downloadUXP-56de283899bc91f7110aba58a3ca174c10852683.tar
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.gz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.lz
UXP-56de283899bc91f7110aba58a3ca174c10852683.tar.xz
UXP-56de283899bc91f7110aba58a3ca174c10852683.zip
Issue #1288 - Part 1a: Update brotli to 1.0.7
This also reorganizes the exports in the build system to use `brotli/` as include directory.
Diffstat (limited to 'layout')
-rw-r--r--layout/inspector/nsFontFace.cpp10
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);
}