Update woff2 to cbea7b9

third_party/woff2/src/font.h

 // Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 // http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 43 matching lines @@
   };
   std::map<uint32_t, Table> tables;
   std::vector<uint32_t> OutputOrderedTags() const;
 
   Table* FindTable(uint32_t tag);
   const Table* FindTable(uint32_t tag) const;
 };
 
 // Accomodates both singular (OTF, TTF) and collection (TTC) fonts
 struct FontCollection {
+  uint32_t flavor;
   uint32_t header_version;
   // (offset, first use of table*) pairs
   std::map<uint32_t, Font::Table*> tables;
   std::vector<Font> fonts;
 };
 
 // Parses the font from the given data. Returns false on parsing failure or
 // buffer overflow. The font is valid only so long the input data pointer is
 // valid. Does NOT support collections.
 bool ReadFont(const uint8_t* data, size_t len, Font* font);
@@ skipping 29 matching lines @@
 // with the given index. Returns false if the glyph is not found.
 bool GetGlyphData(const Font& font, int glyph_index,
                   const uint8_t** glyph_data, size_t* glyph_size);
 
 // Removes the digital signature (DSIG) table
 bool RemoveDigitalSignature(Font* font);
 
 } // namespace woff2
 
 #endif  // WOFF2_FONT_H_