[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-shape.cc                                                      |    4 ----
 test/shaping/fonts/sha1sum/MANIFEST                                     |    1 +
 test/shaping/fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf |binary
 test/shaping/tests/zero-width-marks.tests                               |    1 +
 4 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 5b5dc2c0406d8180e72d97a54334c722fda325b1
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Feb 11 12:15:38 2016 +0700

    [tests] Add test for advance zeroing of an ASCII letter marked as mark in GDEF

diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index 7bc0384..a94bc51 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -31,6 +31,7 @@
 8454d22037f892e76614e1645d066689a0200e61.ttf
 8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
 a919b33197965846f21074b24e30250d67277bce.ttf
+a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf
 b9e2aaa0d75fcef6971ec3a96d806ba4a6b31fe2.ttf
 bb0c53752e85c3d28973ebc913287b8987d3dfe8.ttf
 bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
diff --git a/test/shaping/fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf b/test/shaping/fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf
new file mode 100644
index 0000000..8bbddb1
Binary files /dev/null and b/test/shaping/fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf differ
diff --git a/test/shaping/tests/zero-width-marks.tests b/test/shaping/tests/zero-width-marks.tests
index a9a7d95..c08f26b 100644
--- a/test/shaping/tests/zero-width-marks.tests
+++ b/test/shaping/tests/zero-width-marks.tests
@@ -8,3 +8,4 @@ fonts/sha1sum/ffa0f5d2d9025486d8469d8b1fdd983e7632499b.ttf::U+0058,U+0303,U+0078
 fonts/sha1sum/cc5f3d2d717fb6bd4dfae1c16d48a2cb8e12233b.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+1200|gid3=2+1083|gid6=2 at -992,0+1200|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+1200|gid5=8+528|gid6=8 at -693,0+1200|gid2=10+528|gid2=11+528]
 fonts/sha1sum/fcdcffbdf1c4c97c05308d7600e4c283eb47dbca.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0+0|gid3=2+1083|gid6=2+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6+0|gid5=8+528|gid6=8+0|gid2=10+528|gid2=11+528]
 fonts/sha1sum/56cfd0e18d07f41c38e9598545a6d369127fc6f9.ttf::U+0058,U+0303,U+0078,U+0303,U+006A,U+006A,U+006A,U+0303,U+006A,U+0303,U+006A,U+006A:[gid1=0+1200|gid6=0 at -1029,340+0|gid3=2+1083|gid6=2 at -992,0+0|gid2=4+528|gid2=5+528|gid5=6+528|gid6=6 at -693,0+0|gid5=8+528|gid6=8 at -693,0+0|gid2=10+528|gid2=11+528]
+fonts/sha1sum/a98e908e2ed21b22228ea59ebcc0f05034c86f2e.ttf::U+0041,U+0042,U+0041:[A=0+1368|B=1+0|A=2+1368]
commit 660c9d3fc21172e8dc340b017122c084dac6334c
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Feb 11 12:14:27 2016 +0700

    Remove font-dependent ASCII-only perf hack
    
    Is confusing.  I already hit it myself.  Remove.  We can optimize
    ASCII based on Unicode properties.  But should not do based on
    assumptions on the font.

diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index faea7a9..656e356 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -618,10 +618,6 @@ zero_mark_width (hb_glyph_position_t *pos)
 static inline void
 zero_mark_widths_by_gdef (hb_buffer_t *buffer, bool adjust_offsets)
 {
-  /* This one is a hack; Technically GDEF can mark ASCII glyphs as marks, but we don't listen. */
-  if (!(buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_NON_ASCII))
-    return;
-
   unsigned int count = buffer->len;
   hb_glyph_info_t *info = buffer->info;
   for (unsigned int i = 0; i < count; i++)