diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-18 16:01:48 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-10-20 09:53:13 +0000 |
| commit | f5345badaeefac7c03c8a26dea6b89706871c3fe (patch) | |
| tree | bc863fadf9ec8869690fa51f7e7e63ec2ad60294 /Source/WebCore/platform/graphics/WOFFFileFormat.cpp | |
| parent | 778e0c7c940f8a22f9a43290aef378fb707ca088 (diff) | |
Import WebKit commit e89cea5f01479652674d3c24b2f387eb0987d0a1
Change-Id: Ifc00865ceeb5b83b7990f91af7dbbd1a05df1c30
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform/graphics/WOFFFileFormat.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/WOFFFileFormat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp index c2323cf04..d8f4a5da7 100644 --- a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp +++ b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp @@ -31,8 +31,8 @@ #include <wtf/ByteOrder.h> #if USE(WOFF2) -#include "woff2_common.h" -#include "woff2_dec.h" +#include <woff2/decode.h> +static const uint32_t kWoff2Signature = 0x774f4632; // "wOF2" #endif namespace WebCore { @@ -84,7 +84,7 @@ bool isWOFF(SharedBuffer& buffer) return false; #if USE(WOFF2) - return signature == woffSignature || signature == woff2::kWoff2Signature; + return signature == woffSignature || signature == kWoff2Signature; #else return signature == woffSignature; #endif @@ -140,7 +140,7 @@ bool convertWOFFToSfnt(SharedBuffer& woff, Vector<char>& sfnt) } #if USE(WOFF2) - if (signature == woff2::kWoff2Signature) { + if (signature == kWoff2Signature) { const uint8_t* woffData = reinterpret_cast_ptr<const uint8_t*>(woff.data()); const size_t woffSize = woff.size(); const size_t sfntSize = woff2::ComputeWOFF2FinalSize(woffData, woffSize); |