Make OTS passthru GDEF/GSUB/GPOS tables

Source/platform/fonts/opentype/OpenTypeSanitizer.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/fonts/opentype/OpenTypeSanitizer.h"
 
+#include "hb.h"
 #include "ots-memory-stream.h"
 #include "platform/SharedBuffer.h"
 #include "platform/TraceEvent.h"
 #include "public/platform/Platform.h"
 #include "wtf/CurrentTime.h"
 
 #include <stdarg.h>
 
 namespace blink {
 
@@ skipping 79 matching lines @@
         unsigned len = result;
         buffer.grow(len + 1);
 
         va_start(args, format);
         vsnprintf(buffer.data(), buffer.size(), format, args);
         va_end(args);
         m_errorString = StringImpl::create(reinterpret_cast<const LChar*>(buffer.data()), len);
     }
 }
 
+#if !defined(HB_VERSION_ATLEAST)
+#define HB_VERSION_ATLEAST(major, minor, micro) 0

[eae, 2015/09/03 23:35:29]

Why is this needed?

[eae, 2015/09/04 00:26:50]

If so I'd prefer the check at line 157 to look something like

#if defined(HB_VERSION_ATLEAST) && HB_VERSION_ATLEAST(1, 0, 0)

+#endif
+
 ots::TableAction BlinkOTSContext::GetTableAction(uint32_t tag)
 {
 #define TABLE_TAG(c1, c2, c3, c4) ((uint32_t)((((uint8_t)(c1)) << 24) | (((uint8_t)(c2)) << 16) | (((uint8_t)(c3)) << 8) | ((uint8_t)(c4))))
 
     const uint32_t cbdtTag = TABLE_TAG('C', 'B', 'D', 'T');
     const uint32_t cblcTag = TABLE_TAG('C', 'B', 'L', 'C');
     const uint32_t colrTag = TABLE_TAG('C', 'O', 'L', 'R');
     const uint32_t cpalTag = TABLE_TAG('C', 'P', 'A', 'L');
+    const uint32_t gdefTag = TABLE_TAG('G', 'D', 'E', 'F');

[achuithb, 2015/09/10 09:11:28]

These need to be surrounded by
#if HB_VERSION_ATLEAST(1, 0, 0)
#endif

I'm getting an unused variable compilation error (-Wunused-variable)

+    const uint32_t gposTag = TABLE_TAG('G', 'P', 'O', 'S');
+    const uint32_t gsubTag = TABLE_TAG('G', 'S', 'U', 'B');
 
     switch (tag) {
     // Google Color Emoji Tables
     case cbdtTag:
     case cblcTag:
     // Windows Color Emoji Tables
     case colrTag:
     case cpalTag:
+#if HB_VERSION_ATLEAST(1, 0, 0)
+    // Let HarfBuzz handle how to deal with broken tables.
+    case gdefTag:
+    case gposTag:
+    case gsubTag:
+#endif
         return ots::TABLE_ACTION_PASSTHRU;
     default:
         return ots::TABLE_ACTION_DEFAULT;
     }
 #undef TABLE_TAG
 }
 
 } // namespace blink