summaryrefslogtreecommitdiff
path: root/libre/icedove
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-07-22 03:34:39 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-07-22 03:34:39 -0300
commitaa3166624c6bfd73ec8e1faef2948ffd0f422f4c (patch)
tree7e0077e453cf5537f9f62a04874fa7ac5174d4d9 /libre/icedove
parentdeb914c690586190496465c822cfa188233b1a55 (diff)
icedove-1:45.2.0.deb1-1{,.nonprism1}: updating version
Diffstat (limited to 'libre/icedove')
-rw-r--r--libre/icedove/PKGBUILD21
-rw-r--r--libre/icedove/mozconfig1
-rw-r--r--libre/icedove/mozilla-1228540.patch5342
-rw-r--r--libre/icedove/vendor.js3
4 files changed, 1130 insertions, 4237 deletions
diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 976f7391b..fbeeeb216 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Sid
_debname=icedove
-_debver=45.1.0
+_debver=45.2.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -12,7 +12,7 @@ _pkgname=thunderbird
pkgname=icedove
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail and news reader based on Mozilla Thunderbird."
arch=(i686 x86_64 armv7h)
@@ -34,15 +34,15 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.xz"
firefox-gcc-6.0.patch mozilla-1228540.patch mozilla-1228540-1.patch
vendor.js
fix-missing-files.patch)
-sha256sums=('2dbb5007b1e0bd23714aec5edfe108a303bc9223576cd0545fcd73dc519978f6'
- '886e81e42d8d12826be44bb13e39ef86f357c91dcdf90ca32721f1631d45a996'
- 'cafe29302adcfd6ab4bfb13e6aeef2b405c48877e3c31879945b81e1e3b55cb3'
+sha256sums=('923e7e7a2b9c2e3bdb4424ab0517b93123ee16a1ad9bd55c3ccaa0f0f7796ad0'
+ 'cda15ca945669950bc45704189129a00beecc10c9591f5a84175c4fc0f0328f6'
+ 'aaca37bcca176d1b8ebe7c18d3fb0c61e3d21769fbf8e994a189eb3263257d3d'
'0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
'e1f72c44e31f191271207fc874dcfbf3d504b6b42dc1bb063ba8c7c9ee032130'
'4d1e1ddabc9e975ed39f49e134559a29e01cd49439e358233f1ede43bf5a52bf'
- '2588c567fec88b44b65f0cd111e8769361c138d4c964310684f7bb80066f8f9f'
+ '3a3e84c702ee31450a3e84698441aceb11cf44e64c9fedcaddb8cb50db759417'
'd1ccbaf0973615c57f7893355e5cd3a89efb4e91071d0ec376e429b50cf6ed19'
- '283095a636985e5cbec4056ac23438eafcf9703c3174fcc2bb759bdc40883ab3'
+ '058b58074368b57acf8a6df9a9ffac848b7d7b39f5abd84cb2039bcee42b73e2'
'294a2cc7b0477ad285af10ac2a04b767cabec07f03b23da23014bda71caea510')
prepare() {
@@ -120,9 +120,12 @@ build() {
# _FORTIFY_SOURCE causes configure failures
CPPFLAGS+=" -O2"
+ # Hardening
+ LDFLAGS+=" -Wl,-z,now"
+
# GCC 6
- CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse"
- CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse"
+ CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+ CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
export PATH="$srcdir/path:$PATH"
diff --git a/libre/icedove/mozconfig b/libre/icedove/mozconfig
index e09f2c16b..972b9ac0d 100644
--- a/libre/icedove/mozconfig
+++ b/libre/icedove/mozconfig
@@ -24,7 +24,6 @@ ac_add_options --enable-system-ffi
ac_add_options --enable-system-pixman
# Features
-ac_add_options --enable-calendar
ac_add_options --enable-startup-notification
ac_add_options --disable-gstreamer
ac_add_options --disable-updater
diff --git a/libre/icedove/mozilla-1228540.patch b/libre/icedove/mozilla-1228540.patch
index 3fac3de05..9f6c46077 100644
--- a/libre/icedove/mozilla-1228540.patch
+++ b/libre/icedove/mozilla-1228540.patch
@@ -1,85 +1,7 @@
-# HG changeset patch
-# User Jonathan Kew <jkew@mozilla.com>
-# Date 1452639380 0
-# Tue Jan 12 22:56:20 2016 +0000
-# Node ID 3c9f357598e86c2f593e9895d5725bf3498f8f5a
-# Parent e790bba372f14241addda469a4bdb7ab00786ab3
-Bug 1228540 - Update harfbuzz to release 1.1.3.
-
-diff --git a/gfx/harfbuzz/src/Makefile.am b/gfx/harfbuzz/src/Makefile.am
---- a/gfx/harfbuzz/src/Makefile.am
-+++ b/gfx/harfbuzz/src/Makefile.am
-@@ -43,16 +43,17 @@ HBSOURCES = \
- hb-open-type-private.hh \
- hb-ot-cmap-table.hh \
- hb-ot-glyf-table.hh \
- hb-ot-head-table.hh \
- hb-ot-hhea-table.hh \
- hb-ot-hmtx-table.hh \
- hb-ot-maxp-table.hh \
- hb-ot-name-table.hh \
-+ hb-ot-os2-table.hh \
- hb-ot-tag.cc \
- hb-private.hh \
- hb-set-private.hh \
- hb-set.cc \
- hb-shape.cc \
- hb-shape-plan-private.hh \
- hb-shape-plan.cc \
- hb-shaper-list.hh \
-@@ -387,17 +388,24 @@ dist_check_SCRIPTS = \
- check-defs.sh \
- check-header-guards.sh \
- check-includes.sh \
- check-libstdc++.sh \
- check-static-inits.sh \
- check-symbols.sh \
- $(NULL)
-
--TESTS = $(dist_check_SCRIPTS)
-+check_PROGRAMS = \
-+ test-ot-tag \
-+ $(NULL)
-+test_ot_tag_SOURCES = hb-ot-tag.cc
-+test_ot_tag_CPPFLAGS = $(HBCFLAGS) -DMAIN
-+test_ot_tag_LDADD = libharfbuzz.la $(HBLIBS)
-+
-+TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS)
- TESTS_ENVIRONMENT = \
- srcdir="$(srcdir)" \
- MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
- HBSOURCES="$(HBSOURCES)" \
- HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \
- $(NULL)
-
- if HAVE_INTROSPECTION
-@@ -414,16 +422,17 @@ HarfBuzz_0_0_gir_CFLAGS = \
- $(INCLUDES) \
- $(HBCFLAGS) \
- -DHB_H \
- -DHB_H_IN \
- -DHB_OT_H \
- -DHB_OT_H_IN \
- -DHB_GOBJECT_H \
- -DHB_GOBJECT_H_IN \
-+ -DHB_EXTERN= \
- $(NULL)
- HarfBuzz_0_0_gir_LIBS = \
- libharfbuzz.la \
- libharfbuzz-gobject.la \
- $(NULL)
- HarfBuzz_0_0_gir_FILES = \
- $(HBHEADERS) \
- $(HBNODISTHEADERS) \
-diff --git a/gfx/harfbuzz/src/check-header-guards.sh b/gfx/harfbuzz/src/check-header-guards.sh
---- a/gfx/harfbuzz/src/check-header-guards.sh
-+++ b/gfx/harfbuzz/src/check-header-guards.sh
-@@ -4,22 +4,21 @@ LC_ALL=C
- export LC_ALL
-
- test -z "$srcdir" && srcdir=.
- stat=0
-
+diff -u -r mozilla/gfx/harfbuzz/src/check-header-guards.sh mozilla-1228540/gfx/harfbuzz/src/check-header-guards.sh
+--- mozilla/gfx/harfbuzz/src/check-header-guards.sh 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/check-header-guards.sh 2016-07-09 23:52:22.089763061 +0200
+@@ -9,13 +9,12 @@
test "x$HBHEADERS" = x && HBHEADERS=`cd "$srcdir"; find . -maxdepth 1 -name 'hb*.h'`
test "x$HBSOURCES" = x && HBSOURCES=`cd "$srcdir"; find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'`
@@ -95,19 +17,10 @@ diff --git a/gfx/harfbuzz/src/check-header-guards.sh b/gfx/harfbuzz/src/check-he
if test "x$lines" != x3; then
echo "Ouch, header file $x does not have correct preprocessor guards"
stat=1
- fi
- done
-
- exit $stat
-diff --git a/gfx/harfbuzz/src/gen-indic-table.py b/gfx/harfbuzz/src/gen-indic-table.py
---- a/gfx/harfbuzz/src/gen-indic-table.py
-+++ b/gfx/harfbuzz/src/gen-indic-table.py
-@@ -86,16 +86,17 @@ short = [{
- "Bindu": 'Bi',
- "Cantillation_Mark": 'Ca',
- "Joiner": 'ZWJ',
- "Non_Joiner": 'ZWNJ',
- "Number": 'Nd',
+diff -u -r mozilla/gfx/harfbuzz/src/gen-indic-table.py mozilla-1228540/gfx/harfbuzz/src/gen-indic-table.py
+--- mozilla/gfx/harfbuzz/src/gen-indic-table.py 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/gen-indic-table.py 2016-07-09 23:52:22.089763061 +0200
+@@ -91,6 +91,7 @@
"Visarga": 'Vs',
"Vowel": 'Vo',
"Vowel_Dependent": 'M',
@@ -115,20 +28,10 @@ diff --git a/gfx/harfbuzz/src/gen-indic-table.py b/gfx/harfbuzz/src/gen-indic-ta
"Other": 'x',
},{
"Not_Applicable": 'x',
- }]
- all_shorts = [{},{}]
-
- # Add some of the values, to make them more readable, and to avoid duplicates
-
-diff --git a/gfx/harfbuzz/src/hb-atomic-private.hh b/gfx/harfbuzz/src/hb-atomic-private.hh
---- a/gfx/harfbuzz/src/hb-atomic-private.hh
-+++ b/gfx/harfbuzz/src/hb-atomic-private.hh
-@@ -114,16 +114,41 @@ typedef int hb_atomic_int_impl_t;
- typedef unsigned int hb_atomic_int_impl_t;
- #define HB_ATOMIC_INT_IMPL_INIT(V) (V)
- #define hb_atomic_int_impl_add(AI, V) ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V))
-
- #define hb_atomic_ptr_impl_get(P) ( ({__machine_rw_barrier ();}), (void *) *(P))
+diff -u -r mozilla/gfx/harfbuzz/src/hb-atomic-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-atomic-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-atomic-private.hh 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-atomic-private.hh 2016-07-09 23:52:22.089763061 +0200
+@@ -119,6 +119,31 @@
#define hb_atomic_ptr_impl_cmpexch(P,O,N) ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false)
@@ -160,20 +63,10 @@ diff --git a/gfx/harfbuzz/src/hb-atomic-private.hh b/gfx/harfbuzz/src/hb-atomic-
#elif !defined(HB_NO_MT)
#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */
-
- typedef volatile int hb_atomic_int_impl_t;
- #define HB_ATOMIC_INT_IMPL_INIT(V) (V)
- #define hb_atomic_int_impl_add(AI, V) (((AI) += (V)) - (V))
-
-diff --git a/gfx/harfbuzz/src/hb-blob.h b/gfx/harfbuzz/src/hb-blob.h
---- a/gfx/harfbuzz/src/hb-blob.h
-+++ b/gfx/harfbuzz/src/hb-blob.h
-@@ -59,68 +59,68 @@ typedef enum {
- HB_MEMORY_MODE_DUPLICATE,
- HB_MEMORY_MODE_READONLY,
- HB_MEMORY_MODE_WRITABLE,
- HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE
- } hb_memory_mode_t;
+diff -u -r mozilla/gfx/harfbuzz/src/hb-blob.h mozilla-1228540/gfx/harfbuzz/src/hb-blob.h
+--- mozilla/gfx/harfbuzz/src/hb-blob.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-blob.h 2016-07-09 23:52:22.089763061 +0200
+@@ -64,7 +64,7 @@
typedef struct hb_blob_t hb_blob_t;
@@ -182,12 +75,7 @@ diff --git a/gfx/harfbuzz/src/hb-blob.h b/gfx/harfbuzz/src/hb-blob.h
hb_blob_create (const char *data,
unsigned int length,
hb_memory_mode_t mode,
- void *user_data,
- hb_destroy_func_t destroy);
-
- /* Always creates with MEMORY_MODE_READONLY.
- * Even if the parent blob is writable, we don't
- * want the user of the sub-blob to be able to
+@@ -77,21 +77,21 @@
* modify the parent data as that data may be
* shared among multiple sub-blobs.
*/
@@ -214,7 +102,7 @@ diff --git a/gfx/harfbuzz/src/hb-blob.h b/gfx/harfbuzz/src/hb-blob.h
hb_blob_set_user_data (hb_blob_t *blob,
hb_user_data_key_t *key,
void * data,
- hb_destroy_func_t destroy,
+@@ -99,25 +99,25 @@
hb_bool_t replace);
@@ -246,306 +134,10 @@ diff --git a/gfx/harfbuzz/src/hb-blob.h b/gfx/harfbuzz/src/hb-blob.h
hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length);
- HB_END_DECLS
-
- #endif /* HB_BLOB_H */
-diff --git a/gfx/harfbuzz/src/hb-buffer-private.hh b/gfx/harfbuzz/src/hb-buffer-private.hh
---- a/gfx/harfbuzz/src/hb-buffer-private.hh
-+++ b/gfx/harfbuzz/src/hb-buffer-private.hh
-@@ -119,16 +119,21 @@ struct hb_buffer_t {
-
- /* Text before / after the main buffer contents.
- * Always in Unicode, and ordered outward.
- * Index 0 is for "pre-context", 1 for "post-context". */
- static const unsigned int CONTEXT_LENGTH = 5;
- hb_codepoint_t context[2][CONTEXT_LENGTH];
- unsigned int context_len[2];
-
-+ /* Debugging */
-+ hb_buffer_message_func_t message_func;
-+ void *message_data;
-+ hb_destroy_func_t message_destroy;
-+
-
- /* Methods */
-
- HB_INTERNAL void reset (void);
- HB_INTERNAL void clear (void);
-
- inline unsigned int backtrack_len (void) const
- { return have_output? out_len : idx; }
-@@ -169,23 +174,22 @@ struct hb_buffer_t {
- /* Copies glyph at idx to output and advance idx.
- * If there's no output, just advance idx. */
- inline void
- next_glyph (void)
- {
- if (have_output)
- {
- if (unlikely (out_info != info || out_len != idx)) {
-- if (unlikely (!make_room_for (1, 1)))
-- goto done;
-+ if (unlikely (!make_room_for (1, 1))) return;
- out_info[out_len] = info[idx];
- }
- out_len++;
- }
-- done:
-+
- idx++;
- }
-
- /* Advance idx without copying to output. */
- inline void skip_glyph (void) { idx++; }
-
- inline void reset_masks (hb_mask_t mask)
- {
-@@ -229,16 +233,29 @@ struct hb_buffer_t {
- HB_INTERNAL bool shift_forward (unsigned int count);
-
- typedef long scratch_buffer_t;
- HB_INTERNAL scratch_buffer_t *get_scratch_buffer (unsigned int *size);
-
- inline void clear_context (unsigned int side) { context_len[side] = 0; }
-
- HB_INTERNAL void sort (unsigned int start, unsigned int end, int(*compar)(const hb_glyph_info_t *, const hb_glyph_info_t *));
-+
-+ inline bool messaging (void) { return unlikely (message_func); }
-+ inline bool message (hb_font_t *font, const char *fmt, ...) HB_PRINTF_FUNC(3, 4)
-+ {
-+ if (!messaging ())
-+ return true;
-+ va_list ap;
-+ va_start (ap, fmt);
-+ bool ret = message_impl (font, fmt, ap);
-+ va_end (ap);
-+ return ret;
-+ }
-+ HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
- };
-
-
- #define HB_BUFFER_XALLOCATE_VAR(b, func, var, owner) \
- b->func (offsetof (hb_glyph_info_t, var) - offsetof(hb_glyph_info_t, var1), \
- sizeof (b->info[0].var), owner)
- #define HB_BUFFER_ALLOCATE_VAR(b, var) \
- HB_BUFFER_XALLOCATE_VAR (b, allocate_var, var (), #var)
-diff --git a/gfx/harfbuzz/src/hb-buffer-serialize.cc b/gfx/harfbuzz/src/hb-buffer-serialize.cc
---- a/gfx/harfbuzz/src/hb-buffer-serialize.cc
-+++ b/gfx/harfbuzz/src/hb-buffer-serialize.cc
-@@ -31,55 +31,61 @@ static const char *serialize_formats[] =
- "text",
- "json",
- NULL
- };
-
- /**
- * hb_buffer_serialize_list_formats:
- *
-- *
-+ * Returns a list of supported buffer serialization formats.
- *
- * Return value: (transfer none):
-+ * A string array of buffer serialization formats. Should not be freed.
- *
-- * Since: 0.9.2
-+ * Since: 0.9.7
- **/
- const char **
- hb_buffer_serialize_list_formats (void)
- {
- return serialize_formats;
- }
-
- /**
- * hb_buffer_serialize_format_from_string:
-- * @str:
-- * @len:
-+ * @str: (array length=len) (element-type uint8_t): a string to parse
-+ * @len: length of @str, or -1 if string is %NULL terminated
- *
-- *
-+ * Parses a string into an #hb_buffer_serialize_format_t. Does not check if
-+ * @str is a valid buffer serialization format, use
-+ * hb_buffer_serialize_list_formats() to get the list of supported formats.
- *
- * Return value:
-+ * The parsed #hb_buffer_serialize_format_t.
- *
-- * Since: 0.9.2
-+ * Since: 0.9.7
- **/
- hb_buffer_serialize_format_t
- hb_buffer_serialize_format_from_string (const char *str, int len)
- {
- /* Upper-case it. */
- return (hb_buffer_serialize_format_t) (hb_tag_from_string (str, len) & ~0x20202020u);
- }
-
- /**
- * hb_buffer_serialize_format_to_string:
-- * @format:
-+ * @format: an #hb_buffer_serialize_format_t to convert.
- *
-- *
-+ * Converts @format to the string corresponding it, or %NULL if it is not a valid
-+ * #hb_buffer_serialize_format_t.
- *
-- * Return value:
-+ * Return value: (transfer none):
-+ * A %NULL terminated string corresponding to @format. Should not be freed.
- *
-- * Since: 0.9.2
-+ * Since: 0.9.7
- **/
- const char *
- hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format)
- {
- switch (format)
- {
- case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0];
- case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1];
-@@ -237,56 +243,86 @@ static unsigned int
- *buf = '\0';
- } else
- return i - start;
- }
-
- return end - start;
- }
-
--/* Returns number of items, starting at start, that were serialized. */
- /**
- * hb_buffer_serialize_glyphs:
-- * @buffer: a buffer.
-- * @start:
-- * @end:
-- * @buf: (array length=buf_size):
-- * @buf_size:
-- * @buf_consumed: (out):
-- * @font:
-- * @format:
-- * @flags:
-+ * @buffer: an #hb_buffer_t buffer.
-+ * @start: the first item in @buffer to serialize.
-+ * @end: the last item in @buffer to serialize.
-+ * @buf: (out) (array length=buf_size) (element-type uint8_t): output string to
-+ * write serialized buffer into.
-+ * @buf_size: the size of @buf.
-+ * @buf_consumed: (out) (allow-none): if not %NULL, will be set to the number of byes written into @buf.
-+ * @font: (allow-none): the #hb_font_t used to shape this buffer, needed to
-+ * read glyph names and extents. If %NULL, and empty font will be used.
-+ * @format: the #hb_buffer_serialize_format_t to use for formatting the output.
-+ * @flags: the #hb_buffer_serialize_flags_t that control what glyph properties
-+ * to serialize.
- *
-- *
-+ * Serializes @buffer into a textual representation of its glyph content,
-+ * useful for showing the contents of the buffer, for example during debugging.
-+ * There are currently two supported serialization formats:
-+ *
-+ * ## text
-+ * A human-readable, plain text format.
-+ * The serialized glyphs will look something like:
-+ *
-+ * ```
-+ * [uni0651=0@518,0+0|uni0628=0+1897]
-+ * ```
-+ * - The serialized glyphs are delimited with `[` and `]`.
-+ * - Glyphs are separated with `|`
-+ * - Each glyph starts with glyph name, or glyph index if
-+ * #HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then,
-+ * - If #HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS is not set, `=` then #hb_glyph_info_t.cluster.
-+ * - If #HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS is not set, the #hb_glyph_position_t in the format:
-+ * - If both #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not 0, `@x_offset,y_offset`. Then,
-+ * - `+x_advance`, then `,y_advance` if #hb_glyph_position_t.y_advance is not 0. Then,
-+ * - If #HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS is set, the
-+ * #hb_glyph_extents_t in the format
-+ * `&lt;x_bearing,y_bearing,width,height&gt;`
-+ *
-+ * ## json
-+ * TODO.
- *
- * Return value:
-+ * The number of serialized items.
- *
-- * Since: 0.9.2
-+ * Since: 0.9.7
- **/
- unsigned int
- hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
- unsigned int start,
- unsigned int end,
- char *buf,
- unsigned int buf_size,
-- unsigned int *buf_consumed, /* May be NULL */
-- hb_font_t *font, /* May be NULL */
-+ unsigned int *buf_consumed,
-+ hb_font_t *font,
- hb_buffer_serialize_format_t format,
- hb_buffer_serialize_flags_t flags)
- {
- assert (start <= end && end <= buffer->len);
-
- unsigned int sconsumed;
- if (!buf_consumed)
- buf_consumed = &sconsumed;
- *buf_consumed = 0;
-
- assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) ||
- buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS);
-
-+ if (!buffer->have_positions)
-+ flags |= HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS;
-+
- if (unlikely (start == end))
- return 0;
-
- if (!font)
- font = hb_font_get_empty ();
-
- switch (format)
- {
-@@ -350,28 +386,28 @@ parse_int (const char *pp, const char *e
- return true;
- }
-
- #include "hb-buffer-deserialize-json.hh"
- #include "hb-buffer-deserialize-text.hh"
-
- /**
- * hb_buffer_deserialize_glyphs:
-- * @buffer: a buffer.
-+ * @buffer: an #hb_buffer_t buffer.
- * @buf: (array length=buf_len):
- * @buf_len:
- * @end_ptr: (out):
- * @font:
- * @format:
- *
- *
- *
- * Return value:
- *
-- * Since: 0.9.2
-+ * Since: 0.9.7
- **/
- hb_bool_t
- hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
- const char *buf,
- int buf_len, /* -1 means nul-terminated */
- const char **end_ptr, /* May be NULL */
- hb_font_t *font, /* May be NULL */
- hb_buffer_serialize_format_t format)
-diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
---- a/gfx/harfbuzz/src/hb-buffer.cc
-+++ b/gfx/harfbuzz/src/hb-buffer.cc
-@@ -30,33 +30,59 @@
- #include "hb-buffer-private.hh"
- #include "hb-utf-private.hh"
-
-
- #ifndef HB_DEBUG_BUFFER
+diff -u -r mozilla/gfx/harfbuzz/src/hb-buffer.cc mozilla-1228540/gfx/harfbuzz/src/hb-buffer.cc
+--- mozilla/gfx/harfbuzz/src/hb-buffer.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-buffer.cc 2016-07-09 23:52:22.089763061 +0200
+@@ -35,8 +35,26 @@
#define HB_DEBUG_BUFFER (HB_DEBUG+0)
#endif
@@ -572,15 +164,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* Since: 0.9.7
**/
hb_bool_t
- hb_segment_properties_equal (const hb_segment_properties_t *a,
- const hb_segment_properties_t *b)
- {
- return a->direction == b->direction &&
- a->script == b->script &&
- a->language == b->language &&
- a->reserved1 == b->reserved1 &&
- a->reserved2 == b->reserved2;
-
+@@ -52,6 +70,14 @@
}
/**
@@ -595,17 +179,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* Since: 0.9.7
**/
unsigned int
- hb_segment_properties_hash (const hb_segment_properties_t *p)
- {
- return (unsigned int) p->direction ^
- (unsigned int) p->script ^
- (intptr_t) (p->language);
-@@ -319,75 +345,62 @@ hb_buffer_t::swap_buffers (void)
- }
-
-
- void
- hb_buffer_t::replace_glyphs (unsigned int num_in,
+@@ -324,9 +350,7 @@
unsigned int num_out,
const uint32_t *glyph_data)
{
@@ -616,20 +190,15 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
merge_clusters (idx, idx + num_in);
- hb_glyph_info_t orig_info = info[idx];
- hb_glyph_info_t *pinfo = &out_info[out_len];
- for (unsigned int i = 0; i < num_out; i++)
- {
- *pinfo = orig_info;
- pinfo->codepoint = glyph_data[i];
+@@ -339,50 +363,39 @@
pinfo++;
}
-+ idx += num_in;
- out_len += num_out;
+- out_len += num_out;
- }
-done:
-- idx += num_in;
+ idx += num_in;
++ out_len += num_out;
}
void
@@ -676,17 +245,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
}
bool
- hb_buffer_t::move_to (unsigned int i)
- {
- if (!have_output)
- {
- assert (i <= len);
-@@ -395,17 +408,17 @@ hb_buffer_t::move_to (unsigned int i)
- return true;
- }
-
- assert (i <= out_len + (len - idx));
-
+@@ -400,7 +413,7 @@
if (out_len < i)
{
unsigned int count = i - out_len;
@@ -695,17 +254,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
memmove (out_info + out_len, info + idx, count * sizeof (out_info[0]));
idx += count;
- out_len += count;
- }
- else if (out_len > i)
- {
- /* Tricky part: rewinding... */
-@@ -422,25 +435,23 @@ hb_buffer_t::move_to (unsigned int i)
-
- return true;
- }
-
- void
+@@ -427,15 +440,13 @@
hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index)
{
if (unlikely (out_info != info || out_len != idx)) {
@@ -716,24 +265,14 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
}
out_info[out_len].codepoint = glyph_index;
-+ idx++;
- out_len++;
+- out_len++;
-out:
-- idx++;
- }
-
-
- void
- hb_buffer_t::set_masks (hb_mask_t value,
- hb_mask_t mask,
- unsigned int cluster_start,
- unsigned int cluster_end)
-@@ -716,19 +727,24 @@ void hb_buffer_t::deallocate_var_all (vo
- memset (allocated_var_owner, 0, sizeof (allocated_var_owner));
+ idx++;
++ out_len++;
}
- /* Public API */
+@@ -721,9 +732,14 @@
/**
* hb_buffer_create: (Xconstructor)
*
@@ -750,17 +289,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_buffer_t *
- hb_buffer_create (void)
- {
- hb_buffer_t *buffer;
-
-@@ -773,54 +789,60 @@ hb_buffer_get_empty (void)
- /* Zero is good enough for everything else. */
- };
-
- return const_cast<hb_buffer_t *> (&_hb_buffer_nil);
- }
+@@ -778,11 +794,13 @@
/**
* hb_buffer_reference: (skip)
@@ -776,11 +305,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_buffer_t *
- hb_buffer_reference (hb_buffer_t *buffer)
- {
- return hb_object_reference (buffer);
- }
+@@ -794,9 +812,11 @@
/**
* hb_buffer_destroy: (skip)
@@ -794,12 +319,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_destroy (hb_buffer_t *buffer)
- {
- if (!hb_object_destroy (buffer)) return;
-
- hb_unicode_funcs_destroy (buffer->unicode);
+@@ -809,13 +829,15 @@
free (buffer->info);
free (buffer->pos);
@@ -816,17 +336,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* @key:
* @data:
* @destroy:
- * @replace:
- *
- *
- *
- * Return value:
-@@ -834,17 +856,17 @@ hb_buffer_set_user_data (hb_buffer_t
- hb_destroy_func_t destroy,
- hb_bool_t replace)
- {
- return hb_object_set_user_data (buffer, key, data, destroy, replace);
- }
+@@ -839,7 +861,7 @@
/**
* hb_buffer_get_user_data: (skip)
@@ -835,17 +345,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* @key:
*
*
- *
- * Return value:
- *
- * Since: 0.9.2
- **/
-@@ -853,50 +875,52 @@ hb_buffer_get_user_data (hb_buffer_t
- hb_user_data_key_t *key)
- {
- return hb_object_get_user_data (buffer, key);
- }
-
+@@ -858,10 +880,11 @@
/**
* hb_buffer_set_content_type:
@@ -860,12 +360,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.5
**/
- void
- hb_buffer_set_content_type (hb_buffer_t *buffer,
- hb_buffer_content_type_t content_type)
- {
- buffer->content_type = content_type;
- }
+@@ -874,11 +897,12 @@
/**
* hb_buffer_get_content_type:
@@ -881,12 +376,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.5
**/
- hb_buffer_content_type_t
- hb_buffer_get_content_type (hb_buffer_t *buffer)
- {
- return buffer->content_type;
- }
-
+@@ -891,7 +915,7 @@
/**
* hb_buffer_set_unicode_funcs:
@@ -895,17 +385,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* @unicode_funcs:
*
*
- *
- * Since: 0.9.2
- **/
- void
- hb_buffer_set_unicode_funcs (hb_buffer_t *buffer,
-@@ -911,210 +935,238 @@ hb_buffer_set_unicode_funcs (hb_buffer_t
-
- hb_unicode_funcs_reference (unicode_funcs);
- hb_unicode_funcs_destroy (buffer->unicode);
- buffer->unicode = unicode_funcs;
- }
+@@ -916,7 +940,7 @@
/**
* hb_buffer_get_unicode_funcs:
@@ -914,15 +394,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
*
*
- * Return value:
- *
- * Since: 0.9.2
- **/
- hb_unicode_funcs_t *
- hb_buffer_get_unicode_funcs (hb_buffer_t *buffer)
- {
- return buffer->unicode;
- }
+@@ -932,10 +956,16 @@
/**
* hb_buffer_set_direction:
@@ -942,16 +414,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_set_direction (hb_buffer_t *buffer,
- hb_direction_t direction)
-
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->props.direction = direction;
- }
+@@ -952,11 +982,12 @@
/**
* hb_buffer_get_direction:
@@ -967,11 +430,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_direction_t
- hb_buffer_get_direction (hb_buffer_t *buffer)
- {
- return buffer->props.direction;
- }
+@@ -968,10 +999,18 @@
/**
* hb_buffer_set_script:
@@ -993,15 +452,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_set_script (hb_buffer_t *buffer,
- hb_script_t script)
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->props.script = script;
- }
+@@ -987,11 +1026,12 @@
/**
* hb_buffer_get_script:
@@ -1017,11 +468,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_script_t
- hb_buffer_get_script (hb_buffer_t *buffer)
- {
- return buffer->props.script;
- }
+@@ -1003,10 +1043,18 @@
/**
* hb_buffer_set_language:
@@ -1043,15 +490,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_set_language (hb_buffer_t *buffer,
- hb_language_t language)
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->props.language = language;
- }
+@@ -1022,11 +1070,12 @@
/**
* hb_buffer_get_language:
@@ -1066,11 +505,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_language_t
- hb_buffer_get_language (hb_buffer_t *buffer)
- {
- return buffer->props.language;
- }
+@@ -1038,10 +1087,12 @@
/**
* hb_buffer_set_segment_properties:
@@ -1086,15 +521,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.7
**/
- void
- hb_buffer_set_segment_properties (hb_buffer_t *buffer,
- const hb_segment_properties_t *props)
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->props = *props;
- }
+@@ -1057,10 +1108,10 @@
/**
* hb_buffer_get_segment_properties:
@@ -1108,13 +535,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.7
**/
- void
- hb_buffer_get_segment_properties (hb_buffer_t *buffer,
- hb_segment_properties_t *props)
- {
- *props = buffer->props;
- }
-
+@@ -1074,10 +1125,10 @@
/**
* hb_buffer_set_flags:
@@ -1128,15 +549,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.7
**/
- void
- hb_buffer_set_flags (hb_buffer_t *buffer,
- hb_buffer_flags_t flags)
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->flags = flags;
- }
+@@ -1093,11 +1144,12 @@
/**
* hb_buffer_get_flags:
@@ -1151,11 +564,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.7
**/
- hb_buffer_flags_t
- hb_buffer_get_flags (hb_buffer_t *buffer)
- {
- return buffer->flags;
- }
+@@ -1109,7 +1161,7 @@
/**
* hb_buffer_set_cluster_level:
@@ -1164,17 +573,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* @cluster_level:
*
*
- *
- * Since: 0.9.42
- **/
- void
- hb_buffer_set_cluster_level (hb_buffer_t *buffer,
-@@ -1123,155 +1175,172 @@ hb_buffer_set_cluster_level (hb_buffer_t
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->cluster_level = cluster_level;
- }
+@@ -1128,7 +1180,7 @@
/**
* hb_buffer_get_cluster_level:
@@ -1183,16 +582,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
*
*
- * Return value:
- *
- * Since: 0.9.42
- **/
- hb_buffer_cluster_level_t
- hb_buffer_get_cluster_level (hb_buffer_t *buffer)
- {
- return buffer->cluster_level;
- }
-
+@@ -1145,10 +1197,13 @@
/**
* hb_buffer_set_replacement_codepoint:
@@ -1209,15 +599,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.31
**/
- void
- hb_buffer_set_replacement_codepoint (hb_buffer_t *buffer,
- hb_codepoint_t replacement)
- {
- if (unlikely (hb_object_is_inert (buffer)))
- return;
-
- buffer->replacement = replacement;
- }
+@@ -1164,11 +1219,12 @@
/**
* hb_buffer_get_replacement_codepoint:
@@ -1232,12 +614,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.31
**/
- hb_codepoint_t
- hb_buffer_get_replacement_codepoint (hb_buffer_t *buffer)
- {
- return buffer->replacement;
- }
-
+@@ -1181,9 +1237,10 @@
/**
* hb_buffer_reset:
@@ -1250,11 +627,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_reset (hb_buffer_t *buffer)
- {
- buffer->reset ();
- }
+@@ -1195,9 +1252,10 @@
/**
* hb_buffer_clear_contents:
@@ -1267,11 +640,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.11
**/
- void
- hb_buffer_clear_contents (hb_buffer_t *buffer)
- {
- buffer->clear ();
- }
+@@ -1209,12 +1267,13 @@
/**
* hb_buffer_pre_allocate:
@@ -1289,11 +658,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_bool_t
- hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size)
- {
- return buffer->ensure (size);
- }
+@@ -1226,11 +1285,12 @@
/**
* hb_buffer_allocation_successful:
@@ -1309,11 +674,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_bool_t
- hb_buffer_allocation_successful (hb_buffer_t *buffer)
- {
- return !buffer->in_error;
- }
+@@ -1242,11 +1302,18 @@
/**
* hb_buffer_add:
@@ -1323,27 +684,20 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
+ * @buffer: an #hb_buffer_t.
+ * @codepoint: a Unicode code point.
+ * @cluster: the cluster value of @codepoint.
- *
-- *
++ *
+ * Appends a character with the Unicode value of @codepoint to @buffer, and
+ * gives it the initial cluster value of @cluster. Clusters can be any thing
+ * the client wants, they are usually used to refer to the index of the
+ * character in the input text stream and are output in
+ * #hb_glyph_info_t.cluster field.
-+ *
+ *
+- *
+ * This function does not check the validity of @codepoint, it is up to the
+ * caller to ensure it is a valid Unicode code point.
*
* Since: 0.9.7
**/
- void
- hb_buffer_add (hb_buffer_t *buffer,
- hb_codepoint_t codepoint,
- unsigned int cluster)
- {
- buffer->add (codepoint, cluster);
- buffer->clear_context (1);
- }
+@@ -1261,12 +1328,14 @@
/**
* hb_buffer_set_length:
@@ -1361,17 +715,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_bool_t
- hb_buffer_set_length (hb_buffer_t *buffer,
- unsigned int length)
- {
- if (unlikely (hb_object_is_inert (buffer)))
-@@ -1296,61 +1365,67 @@ hb_buffer_set_length (hb_buffer_t *buff
- }
- buffer->clear_context (1);
-
- return true;
- }
+@@ -1301,11 +1370,13 @@
/**
* hb_buffer_get_length:
@@ -1387,11 +731,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- unsigned int
- hb_buffer_get_length (hb_buffer_t *buffer)
- {
- return buffer->len;
- }
+@@ -1317,13 +1388,15 @@
/**
* hb_buffer_get_glyph_infos:
@@ -1411,15 +751,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_glyph_info_t *
- hb_buffer_get_glyph_infos (hb_buffer_t *buffer,
- unsigned int *length)
- {
- if (length)
- *length = buffer->len;
-
- return (hb_glyph_info_t *) buffer->info;
- }
+@@ -1339,13 +1412,15 @@
/**
* hb_buffer_get_glyph_positions:
@@ -1439,17 +771,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- hb_glyph_position_t *
- hb_buffer_get_glyph_positions (hb_buffer_t *buffer,
- unsigned int *length)
- {
- if (!buffer->have_positions)
-@@ -1359,64 +1434,64 @@ hb_buffer_get_glyph_positions (hb_buffer
- if (length)
- *length = buffer->len;
-
- return (hb_glyph_position_t *) buffer->pos;
- }
+@@ -1364,7 +1439,7 @@
/**
* hb_buffer_reverse:
@@ -1458,13 +780,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Reverses buffer contents.
*
- * Since: 0.9.2
- **/
- void
- hb_buffer_reverse (hb_buffer_t *buffer)
- {
- buffer->reverse ();
- }
+@@ -1378,7 +1453,7 @@
/**
* hb_buffer_reverse_range:
@@ -1473,16 +789,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
* @start: start index.
* @end: end index.
*
- * Reverses buffer contents between start to end.
- *
- * Since: 0.9.41
- **/
- void
- hb_buffer_reverse_range (hb_buffer_t *buffer,
- unsigned int start, unsigned int end)
- {
- buffer->reverse_range (start, end);
- }
+@@ -1395,7 +1470,7 @@
/**
* hb_buffer_reverse_clusters:
@@ -1491,15 +798,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Reverses buffer clusters. That is, the buffer contents are
* reversed, then each cluster (consecutive items having the
- * same cluster number) are reversed again.
- *
- * Since: 0.9.2
- **/
- void
- hb_buffer_reverse_clusters (hb_buffer_t *buffer)
- {
- buffer->reverse_clusters ();
- }
+@@ -1411,7 +1486,7 @@
/**
* hb_buffer_guess_segment_properties:
@@ -1508,17 +807,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Sets unset buffer segment properties based on buffer Unicode
* contents. If buffer is not empty, it must have content type
- * %HB_BUFFER_CONTENT_TYPE_UNICODE.
- *
- * If buffer script is not set (ie. is %HB_SCRIPT_INVALID), it
- * will be set to the Unicode script of the first character in
- * the buffer that has a script other than %HB_SCRIPT_COMMON,
-@@ -1505,111 +1580,141 @@ hb_buffer_add_utf (hb_buffer_t *buffer,
- buffer->context[1][buffer->context_len[1]++] = u;
- }
-
- buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE;
- }
+@@ -1510,13 +1585,18 @@
/**
* hb_buffer_add_utf8:
@@ -1543,15 +832,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_add_utf8 (hb_buffer_t *buffer,
- const char *text,
- int text_length,
- unsigned int item_offset,
- int item_length)
- {
- hb_buffer_add_utf<hb_utf8_t> (buffer, (const uint8_t *) text, text_length, item_offset, item_length);
- }
+@@ -1532,13 +1612,17 @@
/**
* hb_buffer_add_utf16:
@@ -1575,15 +856,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_add_utf16 (hb_buffer_t *buffer,
- const uint16_t *text,
- int text_length,
- unsigned int item_offset,
- int item_length)
- {
- hb_buffer_add_utf<hb_utf16_t> (buffer, text, text_length, item_offset, item_length);
- }
+@@ -1554,13 +1638,17 @@
/**
* hb_buffer_add_utf32:
@@ -1607,15 +880,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_add_utf32 (hb_buffer_t *buffer,
- const uint32_t *text,
- int text_length,
- unsigned int item_offset,
- int item_length)
- {
- hb_buffer_add_utf<hb_utf32_t<> > (buffer, text, text_length, item_offset, item_length);
- }
+@@ -1576,13 +1664,18 @@
/**
* hb_buffer_add_latin1:
@@ -1640,15 +905,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.39
**/
- void
- hb_buffer_add_latin1 (hb_buffer_t *buffer,
- const uint8_t *text,
- int text_length,
- unsigned int item_offset,
- int item_length)
- {
- hb_buffer_add_utf<hb_latin1_t> (buffer, text, text_length, item_offset, item_length);
- }
+@@ -1598,13 +1691,25 @@
/**
* hb_buffer_add_codepoints:
@@ -1663,8 +920,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
+ * @item_offset: the offset of the first code point to add to the @buffer.
+ * @item_length: the number of code points to add to the @buffer, or -1 for the
+ * end of @text (assuming it is %NULL terminated).
- *
-- *
++ *
+ * Appends characters from @text array to @buffer. The @item_offset is the
+ * position of the first character from @text that will be appended, and
+ * @item_length is the number of character. When shaping part of a larger text
@@ -1674,23 +930,14 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
+ * @item_length, respectively, to give HarfBuzz the full context to be able,
+ * for example, to do cross-run Arabic shaping or properly handle combining
+ * marks at stat of run.
-+ *
+ *
+- *
+ * This function does not check the validity of @text, it is up to the caller
+ * to ensure it contains a valid Unicode code points.
*
* Since: 0.9.31
**/
- void
- hb_buffer_add_codepoints (hb_buffer_t *buffer,
- const hb_codepoint_t *text,
- int text_length,
- unsigned int item_offset,
-@@ -1671,19 +1776,22 @@ normalize_glyphs_cluster (hb_buffer_t *b
- pos[i].y_offset -= total_y_advance;
- }
- hb_stable_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1);
- }
- }
+@@ -1676,9 +1781,12 @@
/**
* hb_buffer_normalize_glyphs:
@@ -1705,17 +952,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
*
* Since: 0.9.2
**/
- void
- hb_buffer_normalize_glyphs (hb_buffer_t *buffer)
- {
- assert (buffer->have_positions);
- assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS);
-@@ -1719,8 +1827,50 @@ hb_buffer_t::sort (unsigned int start, u
- merge_clusters (j, i + 1);
- {
- hb_glyph_info_t t = info[i];
- memmove (&info[j + 1], &info[j], (i - j) * sizeof (hb_glyph_info_t));
- info[j] = t;
+@@ -1724,3 +1832,45 @@
}
}
}
@@ -1761,15 +998,10 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.cc b/gfx/harfbuzz/src/hb-buffer.cc
+ vsnprintf (buf, sizeof (buf), fmt, ap);
+ return (bool) this->message_func (this, font, buf, this->message_data);
+}
-diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
---- a/gfx/harfbuzz/src/hb-buffer.h
-+++ b/gfx/harfbuzz/src/hb-buffer.h
-@@ -35,344 +35,438 @@
- #define HB_BUFFER_H
-
- #include "hb-common.h"
- #include "hb-unicode.h"
- #include "hb-font.h"
+diff -u -r mozilla/gfx/harfbuzz/src/hb-buffer.h mozilla-1228540/gfx/harfbuzz/src/hb-buffer.h
+--- mozilla/gfx/harfbuzz/src/hb-buffer.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-buffer.h 2016-07-09 23:52:22.089763061 +0200
+@@ -40,7 +40,27 @@
HB_BEGIN_DECLS
@@ -1798,10 +1030,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
typedef struct hb_glyph_info_t {
hb_codepoint_t codepoint;
hb_mask_t mask;
- uint32_t cluster;
-
- /*< private >*/
- hb_var_int_t var1;
+@@ -51,6 +71,22 @@
hb_var_int_t var2;
} hb_glyph_info_t;
@@ -1824,10 +1053,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
typedef struct hb_glyph_position_t {
hb_position_t x_advance;
hb_position_t y_advance;
- hb_position_t x_offset;
- hb_position_t y_offset;
-
- /*< private >*/
+@@ -61,7 +97,16 @@
hb_var_int_t var;
} hb_glyph_position_t;
@@ -1845,15 +1071,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
typedef struct hb_segment_properties_t {
hb_direction_t direction;
hb_script_t script;
- hb_language_t language;
- /*< private >*/
- void *reserved1;
- void *reserved2;
- } hb_segment_properties_t;
-
- #define HB_SEGMENT_PROPERTIES_DEFAULT {HB_DIRECTION_INVALID, \
- HB_SCRIPT_INVALID, \
- HB_LANGUAGE_INVALID, \
+@@ -77,101 +122,125 @@
NULL, \
NULL}
@@ -2004,9 +1222,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
* Since: 0.9.20
*/
typedef enum { /*< flags >*/
- HB_BUFFER_FLAG_DEFAULT = 0x00000000u,
- HB_BUFFER_FLAG_BOT = 0x00000001u, /* Beginning-of-text */
- HB_BUFFER_FLAG_EOT = 0x00000002u, /* End-of-text */
+@@ -181,11 +250,11 @@
HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004u
} hb_buffer_flags_t;
@@ -2020,12 +1236,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
hb_buffer_get_flags (hb_buffer_t *buffer);
/*
- * Since: 0.9.42
- */
- typedef enum {
- HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES = 0,
- HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS = 1,
- HB_BUFFER_CLUSTER_LEVEL_CHARACTERS = 2,
+@@ -198,93 +267,92 @@
HB_BUFFER_CLUSTER_LEVEL_DEFAULT = HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES
} hb_buffer_cluster_level_t;
@@ -2144,7 +1355,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
hb_buffer_add_codepoints (hb_buffer_t *buffer,
const hb_codepoint_t *text,
int text_length,
- unsigned int item_offset,
+@@ -292,32 +360,25 @@
int item_length);
@@ -2182,7 +1393,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
hb_buffer_normalize_glyphs (hb_buffer_t *buffer);
- /*
+@@ -325,7 +386,16 @@
* Serialize
*/
@@ -2200,10 +1411,7 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
* Since: 0.9.20
*/
typedef enum { /*< flags >*/
- HB_BUFFER_SERIALIZE_FLAG_DEFAULT = 0x00000000u,
- HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS = 0x00000001u,
- HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS = 0x00000002u,
- HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES = 0x00000004u,
+@@ -336,43 +406,67 @@
HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS = 0x00000008u
} hb_buffer_serialize_flags_t;
@@ -2283,15 +1491,224 @@ diff --git a/gfx/harfbuzz/src/hb-buffer.h b/gfx/harfbuzz/src/hb-buffer.h
HB_END_DECLS
#endif /* HB_BUFFER_H */
-diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
---- a/gfx/harfbuzz/src/hb-common.cc
-+++ b/gfx/harfbuzz/src/hb-common.cc
-@@ -276,22 +276,25 @@ retry:
- #endif
+diff -u -r mozilla/gfx/harfbuzz/src/hb-buffer-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-buffer-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-buffer-private.hh 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-buffer-private.hh 2016-07-09 23:52:22.089763061 +0200
+@@ -124,6 +124,11 @@
+ hb_codepoint_t context[2][CONTEXT_LENGTH];
+ unsigned int context_len[2];
+
++ /* Debugging */
++ hb_buffer_message_func_t message_func;
++ void *message_data;
++ hb_destroy_func_t message_destroy;
++
+
+ /* Methods */
- return lang;
+@@ -174,13 +179,12 @@
+ if (have_output)
+ {
+ if (unlikely (out_info != info || out_len != idx)) {
+- if (unlikely (!make_room_for (1, 1)))
+- goto done;
++ if (unlikely (!make_room_for (1, 1))) return;
+ out_info[out_len] = info[idx];
+ }
+ out_len++;
+ }
+- done:
++
+ idx++;
+ }
+
+@@ -234,6 +238,19 @@
+ inline void clear_context (unsigned int side) { context_len[side] = 0; }
+
+ HB_INTERNAL void sort (unsigned int start, unsigned int end, int(*compar)(const hb_glyph_info_t *, const hb_glyph_info_t *));
++
++ inline bool messaging (void) { return unlikely (message_func); }
++ inline bool message (hb_font_t *font, const char *fmt, ...) HB_PRINTF_FUNC(3, 4)
++ {
++ if (!messaging ())
++ return true;
++ va_list ap;
++ va_start (ap, fmt);
++ bool ret = message_impl (font, fmt, ap);
++ va_end (ap);
++ return ret;
++ }
++ HB_INTERNAL bool message_impl (hb_font_t *font, const char *fmt, va_list ap) HB_PRINTF_FUNC(3, 0);
+ };
+
+
+diff -u -r mozilla/gfx/harfbuzz/src/hb-buffer-serialize.cc mozilla-1228540/gfx/harfbuzz/src/hb-buffer-serialize.cc
+--- mozilla/gfx/harfbuzz/src/hb-buffer-serialize.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-buffer-serialize.cc 2016-07-09 23:52:22.089763061 +0200
+@@ -36,11 +36,12 @@
+ /**
+ * hb_buffer_serialize_list_formats:
+ *
+- *
++ * Returns a list of supported buffer serialization formats.
+ *
+ * Return value: (transfer none):
++ * A string array of buffer serialization formats. Should not be freed.
+ *
+- * Since: 0.9.2
++ * Since: 0.9.7
+ **/
+ const char **
+ hb_buffer_serialize_list_formats (void)
+@@ -50,14 +51,17 @@
+
+ /**
+ * hb_buffer_serialize_format_from_string:
+- * @str:
+- * @len:
++ * @str: (array length=len) (element-type uint8_t): a string to parse
++ * @len: length of @str, or -1 if string is %NULL terminated
+ *
+- *
++ * Parses a string into an #hb_buffer_serialize_format_t. Does not check if
++ * @str is a valid buffer serialization format, use
++ * hb_buffer_serialize_list_formats() to get the list of supported formats.
+ *
+ * Return value:
++ * The parsed #hb_buffer_serialize_format_t.
+ *
+- * Since: 0.9.2
++ * Since: 0.9.7
+ **/
+ hb_buffer_serialize_format_t
+ hb_buffer_serialize_format_from_string (const char *str, int len)
+@@ -68,13 +72,15 @@
+
+ /**
+ * hb_buffer_serialize_format_to_string:
+- * @format:
++ * @format: an #hb_buffer_serialize_format_t to convert.
+ *
+- *
++ * Converts @format to the string corresponding it, or %NULL if it is not a valid
++ * #hb_buffer_serialize_format_t.
+ *
+- * Return value:
++ * Return value: (transfer none):
++ * A %NULL terminated string corresponding to @format. Should not be freed.
+ *
+- * Since: 0.9.2
++ * Since: 0.9.7
+ **/
+ const char *
+ hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format)
+@@ -242,24 +248,51 @@
+ return end - start;
}
+-/* Returns number of items, starting at start, that were serialized. */
+ /**
+ * hb_buffer_serialize_glyphs:
+- * @buffer: a buffer.
+- * @start:
+- * @end:
+- * @buf: (array length=buf_size):
+- * @buf_size:
+- * @buf_consumed: (out):
+- * @font:
+- * @format:
+- * @flags:
++ * @buffer: an #hb_buffer_t buffer.
++ * @start: the first item in @buffer to serialize.
++ * @end: the last item in @buffer to serialize.
++ * @buf: (out) (array length=buf_size) (element-type uint8_t): output string to
++ * write serialized buffer into.
++ * @buf_size: the size of @buf.
++ * @buf_consumed: (out) (allow-none): if not %NULL, will be set to the number of byes written into @buf.
++ * @font: (allow-none): the #hb_font_t used to shape this buffer, needed to
++ * read glyph names and extents. If %NULL, and empty font will be used.
++ * @format: the #hb_buffer_serialize_format_t to use for formatting the output.
++ * @flags: the #hb_buffer_serialize_flags_t that control what glyph properties
++ * to serialize.
++ *
++ * Serializes @buffer into a textual representation of its glyph content,
++ * useful for showing the contents of the buffer, for example during debugging.
++ * There are currently two supported serialization formats:
++ *
++ * ## text
++ * A human-readable, plain text format.
++ * The serialized glyphs will look something like:
++ *
++ * ```
++ * [uni0651=0@518,0+0|uni0628=0+1897]
++ * ```
++ * - The serialized glyphs are delimited with `[` and `]`.
++ * - Glyphs are separated with `|`
++ * - Each glyph starts with glyph name, or glyph index if
++ * #HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES flag is set. Then,
++ * - If #HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS is not set, `=` then #hb_glyph_info_t.cluster.
++ * - If #HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS is not set, the #hb_glyph_position_t in the format:
++ * - If both #hb_glyph_position_t.x_offset and #hb_glyph_position_t.y_offset are not 0, `@x_offset,y_offset`. Then,
++ * - `+x_advance`, then `,y_advance` if #hb_glyph_position_t.y_advance is not 0. Then,
++ * - If #HB_BUFFER_SERIALIZE_FLAG_GLYPH_EXTENTS is set, the
++ * #hb_glyph_extents_t in the format
++ * `&lt;x_bearing,y_bearing,width,height&gt;`
+ *
+- *
++ * ## json
++ * TODO.
+ *
+ * Return value:
++ * The number of serialized items.
+ *
+- * Since: 0.9.2
++ * Since: 0.9.7
+ **/
+ unsigned int
+ hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
+@@ -267,8 +300,8 @@
+ unsigned int end,
+ char *buf,
+ unsigned int buf_size,
+- unsigned int *buf_consumed, /* May be NULL */
+- hb_font_t *font, /* May be NULL */
++ unsigned int *buf_consumed,
++ hb_font_t *font,
+ hb_buffer_serialize_format_t format,
+ hb_buffer_serialize_flags_t flags)
+ {
+@@ -282,6 +315,9 @@
+ assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) ||
+ buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS);
+
++ if (!buffer->have_positions)
++ flags |= HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS;
++
+ if (unlikely (start == end))
+ return 0;
+
+@@ -355,7 +391,7 @@
+
+ /**
+ * hb_buffer_deserialize_glyphs:
+- * @buffer: a buffer.
++ * @buffer: an #hb_buffer_t buffer.
+ * @buf: (array length=buf_len):
+ * @buf_len:
+ * @end_ptr: (out):
+@@ -366,7 +402,7 @@
+ *
+ * Return value:
+ *
+- * Since: 0.9.2
++ * Since: 0.9.7
+ **/
+ hb_bool_t
+ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
+diff -u -r mozilla/gfx/harfbuzz/src/hb-common.cc mozilla-1228540/gfx/harfbuzz/src/hb-common.cc
+--- mozilla/gfx/harfbuzz/src/hb-common.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-common.cc 2016-07-09 23:52:22.089763061 +0200
+@@ -281,12 +281,15 @@
/**
* hb_language_from_string:
@@ -2310,17 +1727,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
*
* Since: 0.9.2
**/
- hb_language_t
- hb_language_from_string (const char *str, int len)
- {
- if (!str || !len || !*str)
- return HB_LANGUAGE_INVALID;
-@@ -309,21 +312,23 @@ hb_language_from_string (const char *str
- else
- item = lang_find_or_insert (str);
-
- return likely (item) ? item->lang : HB_LANGUAGE_INVALID;
- }
+@@ -314,11 +317,13 @@
/**
* hb_language_to_string:
@@ -2337,17 +1744,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
*
* Since: 0.9.2
**/
- const char *
- hb_language_to_string (hb_language_t language)
- {
- /* This is actually NULL-safe! */
- return language->s;
-@@ -352,21 +357,22 @@ hb_language_get_default (void)
- return default_language;
- }
-
-
- /* hb_script_t */
+@@ -357,11 +362,12 @@
/**
* hb_script_from_iso15924_tag:
@@ -2362,27 +1759,18 @@ diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
*
* Since: 0.9.2
**/
- hb_script_t
- hb_script_from_iso15924_tag (hb_tag_t tag)
- {
- if (unlikely (tag == HB_TAG_NONE))
- return HB_SCRIPT_INVALID;
-@@ -396,38 +402,43 @@ hb_script_from_iso15924_tag (hb_tag_t ta
- return (hb_script_t) tag;
-
- /* Otherwise, return unknown */
- return HB_SCRIPT_UNKNOWN;
- }
+@@ -401,28 +407,33 @@
/**
* hb_script_from_string:
- * @s: (array length=len) (element-type uint8_t):
- * @len:
+- *
+- *
+ * @str: (array length=len) (element-type uint8_t): a string representing an
+ * ISO 15924 tag.
+ * @len: length of the @str, or -1 if it is %NULL-terminated.
- *
-- *
++ *
+ * Converts a string @str representing an ISO 15924 script tag to a
+ * corresponding #hb_script_t. Shorthand for hb_tag_from_string() then
+ * hb_script_from_iso15924_tag().
@@ -2414,17 +1802,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
*
* Since: 0.9.2
**/
- hb_tag_t
- hb_script_to_iso15924_tag (hb_script_t script)
- {
- return (hb_tag_t) script;
- }
-@@ -516,17 +527,17 @@ hb_user_data_array_t::set (hb_user_data_
-
- if (replace) {
- if (!data && !destroy) {
- items.remove (key, lock);
- return true;
+@@ -521,7 +532,7 @@
}
}
hb_user_data_item_t item = {key, data, destroy};
@@ -2433,20 +1811,10 @@ diff --git a/gfx/harfbuzz/src/hb-common.cc b/gfx/harfbuzz/src/hb-common.cc
return ret;
}
-
- void *
- hb_user_data_array_t::get (hb_user_data_key_t *key)
- {
- hb_user_data_item_t item = {NULL };
-diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
---- a/gfx/harfbuzz/src/hb-common.h
-+++ b/gfx/harfbuzz/src/hb-common.h
-@@ -93,64 +93,69 @@ typedef uint32_t hb_tag_t;
- #define HB_TAG(c1,c2,c3,c4) ((hb_tag_t)((((uint8_t)(c1))<<24)|(((uint8_t)(c2))<<16)|(((uint8_t)(c3))<<8)|((uint8_t)(c4))))
- #define HB_UNTAG(tag) ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag))
-
- #define HB_TAG_NONE HB_TAG(0,0,0,0)
- #define HB_TAG_MAX HB_TAG(0xff,0xff,0xff,0xff)
+diff -u -r mozilla/gfx/harfbuzz/src/hb-common.h mozilla-1228540/gfx/harfbuzz/src/hb-common.h
+--- mozilla/gfx/harfbuzz/src/hb-common.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-common.h 2016-07-09 23:52:22.089763061 +0200
+@@ -98,16 +98,22 @@
#define HB_TAG_MAX_SIGNED HB_TAG(0x7f,0xff,0xff,0xff)
/* len=-1 means str is NUL-terminated. */
@@ -2473,9 +1841,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
typedef enum {
HB_DIRECTION_INVALID = 0,
HB_DIRECTION_LTR = 4,
- HB_DIRECTION_RTL,
- HB_DIRECTION_TTB,
- HB_DIRECTION_BTT
+@@ -117,10 +123,10 @@
} hb_direction_t;
/* len=-1 means str is NUL-terminated */
@@ -2488,15 +1854,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
hb_direction_to_string (hb_direction_t direction);
#define HB_DIRECTION_IS_VALID(dir) ((((unsigned int) (dir)) & ~3U) == 4)
- /* Direction must be valid for the following */
- #define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4)
- #define HB_DIRECTION_IS_VERTICAL(dir) ((((unsigned int) (dir)) & ~1U) == 6)
- #define HB_DIRECTION_IS_FORWARD(dir) ((((unsigned int) (dir)) & ~2U) == 4)
- #define HB_DIRECTION_IS_BACKWARD(dir) ((((unsigned int) (dir)) & ~2U) == 5)
- #define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1))
-
-
- /* hb_language_t */
+@@ -136,16 +142,15 @@
typedef const struct hb_language_impl_t *hb_language_t;
@@ -2516,17 +1874,7 @@ diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
hb_language_get_default (void);
- /* hb_script_t */
-
- /* http://unicode.org/iso15924/ */
- /* http://goo.gl/x9ilM */
- /* Unicode Character Database property: Script (sc) */
-@@ -319,28 +324,26 @@ typedef enum
- _HB_SCRIPT_MAX_VALUE = HB_TAG_MAX, /*< skip >*/
- _HB_SCRIPT_MAX_VALUE_SIGNED = HB_TAG_MAX_SIGNED /*< skip >*/
-
- } hb_script_t;
-
+@@ -324,18 +329,16 @@
/* Script functions */
@@ -2550,20 +1898,10 @@ diff --git a/gfx/harfbuzz/src/hb-common.h b/gfx/harfbuzz/src/hb-common.h
hb_script_get_horizontal_direction (hb_script_t script);
- /* User data */
-
- typedef struct hb_user_data_key_t {
- /*< private >*/
- char unused;
-diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
---- a/gfx/harfbuzz/src/hb-coretext.cc
-+++ b/gfx/harfbuzz/src/hb-coretext.cc
-@@ -171,16 +171,53 @@ hb_coretext_shaper_font_data_t *
- data->y_mult = (CGFloat) font->y_scale / font_size;
- data->ct_font = CTFontCreateWithGraphicsFont (face_data, font_size, NULL, NULL);
- if (unlikely (!data->ct_font)) {
- DEBUG_MSG (CORETEXT, font, "Font CTFontCreateWithGraphicsFont() failed");
- free (data);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-coretext.cc mozilla-1228540/gfx/harfbuzz/src/hb-coretext.cc
+--- mozilla/gfx/harfbuzz/src/hb-coretext.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-coretext.cc 2016-07-09 23:52:22.089763061 +0200
+@@ -176,6 +176,43 @@
return NULL;
}
@@ -2607,17 +1945,7 @@ diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
return data;
}
- void
- _hb_coretext_shaper_font_data_destroy (hb_coretext_shaper_font_data_t *data)
- {
- CFRelease (data->ct_font);
- free (data);
-@@ -688,17 +725,16 @@ resize_and_retry:
- /* Adjust scratch, pchars, and log_cluster arrays. This is ugly, but really the
- * cleanest way to do without completely restructuring the rest of this shaper. */
- scratch = buffer->get_scratch_buffer (&scratch_size);
- pchars = reinterpret_cast<UniChar *> (((char *) scratch + ((char *) pchars - (char *) old_scratch)));
- log_clusters = reinterpret_cast<unsigned int *> (((char *) scratch + ((char *) log_clusters - (char *) old_scratch)));
+@@ -693,7 +730,6 @@
scratch += old_scratch_used;
scratch_size -= old_scratch_used;
}
@@ -2625,17 +1953,7 @@ diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
{
string_ref = CFStringCreateWithCharactersNoCopy (NULL,
pchars, chars_len,
- kCFAllocatorNull);
- if (unlikely (!string_ref))
- FAIL ("CFStringCreateWithCharactersNoCopy failed");
-
- /* Create an attributed string, populate it, and create a line from it, then release attributed string. */
-@@ -843,21 +879,19 @@ retry:
- *
- * Looks like if we really want to be sure here we have to modify the
- * font to change the name table, similar to what we do in the uniscribe
- * backend.
- *
+@@ -848,11 +884,9 @@
* However, even that wouldn't work if we were passed in the CGFont to
* begin with.
*
@@ -2650,17 +1968,7 @@ diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
*
* See: http://github.com/behdad/harfbuzz/pull/36
*/
- bool matched = false;
- for (unsigned int i = 0; i < range_records.len; i++)
- if (range_records[i].font && CFEqual (run_ct_font, range_records[i].font))
- {
- matched = true;
-@@ -1124,20 +1158,16 @@ fail:
- return ret;
- }
-
-
- /*
+@@ -1129,10 +1163,6 @@
* AAT shaper
*/
@@ -2671,20 +1979,10 @@ diff --git a/gfx/harfbuzz/src/hb-coretext.cc b/gfx/harfbuzz/src/hb-coretext.cc
/*
* shaper face data
*/
-
- struct hb_coretext_aat_shaper_face_data_t {};
-
- hb_coretext_aat_shaper_face_data_t *
- _hb_coretext_aat_shaper_face_data_create (hb_face_t *face)
-diff --git a/gfx/harfbuzz/src/hb-coretext.h b/gfx/harfbuzz/src/hb-coretext.h
---- a/gfx/harfbuzz/src/hb-coretext.h
-+++ b/gfx/harfbuzz/src/hb-coretext.h
-@@ -39,22 +39,22 @@
-
- HB_BEGIN_DECLS
-
-
- #define HB_CORETEXT_TAG_MORT HB_TAG('m','o','r','t')
+diff -u -r mozilla/gfx/harfbuzz/src/hb-coretext.h mozilla-1228540/gfx/harfbuzz/src/hb-coretext.h
+--- mozilla/gfx/harfbuzz/src/hb-coretext.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-coretext.h 2016-07-09 23:52:22.089763061 +0200
+@@ -44,14 +44,14 @@
#define HB_CORETEXT_TAG_MORX HB_TAG('m','o','r','x')
@@ -2702,889 +2000,12 @@ diff --git a/gfx/harfbuzz/src/hb-coretext.h b/gfx/harfbuzz/src/hb-coretext.h
hb_coretext_font_get_ct_font (hb_font_t *font);
- HB_END_DECLS
-
- #endif /* HB_CORETEXT_H */
-diff --git a/gfx/harfbuzz/src/hb-directwrite.cc b/gfx/harfbuzz/src/hb-directwrite.cc
-new file mode 100644
---- /dev/null
-+++ b/gfx/harfbuzz/src/hb-directwrite.cc
-@@ -0,0 +1,827 @@
-+/*
-+ * Copyright © 2015 Ebrahim Byagowi
-+ *
-+ * This is part of HarfBuzz, a text shaping library.
-+ *
-+ * Permission is hereby granted, without written agreement and without
-+ * license or royalty fees, to use, copy, modify, and distribute this
-+ * software and its documentation for any purpose, provided that the
-+ * above copyright notice and the following two paragraphs appear in
-+ * all copies of this software.
-+ *
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
-+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+ */
-+
-+#define HB_SHAPER directwrite
-+#include "hb-shaper-impl-private.hh"
-+
-+#include <dwrite.h>
-+
-+#include "hb-directwrite.h"
-+
-+#include "hb-open-file-private.hh"
-+#include "hb-ot-name-table.hh"
-+#include "hb-ot-tag.h"
-+
-+
-+#ifndef HB_DEBUG_DIRECTWRITE
-+#define HB_DEBUG_DIRECTWRITE (HB_DEBUG+0)
-+#endif
-+
-+HB_SHAPER_DATA_ENSURE_DECLARE(directwrite, face)
-+HB_SHAPER_DATA_ENSURE_DECLARE(directwrite, font)
-+
-+/*
-+* shaper face data
-+*/
-+
-+struct hb_directwrite_shaper_face_data_t {
-+ HANDLE fh;
-+ wchar_t face_name[LF_FACESIZE];
-+};
-+
-+/* face_name should point to a wchar_t[LF_FACESIZE] object. */
-+static void
-+_hb_generate_unique_face_name(wchar_t *face_name, unsigned int *plen)
-+{
-+ /* We'll create a private name for the font from a UUID using a simple,
-+ * somewhat base64-like encoding scheme */
-+ const char *enc = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-";
-+ UUID id;
-+ UuidCreate ((UUID*)&id);
-+ ASSERT_STATIC (2 + 3 * (16 / 2) < LF_FACESIZE);
-+ unsigned int name_str_len = 0;
-+ face_name[name_str_len++] = 'F';
-+ face_name[name_str_len++] = '_';
-+ unsigned char *p = (unsigned char *)&id;
-+ for (unsigned int i = 0; i < 16; i += 2)
-+ {
-+ /* Spread the 16 bits from two bytes of the UUID across three chars of face_name,
-+ * using the bits in groups of 5,5,6 to select chars from enc.
-+ * This will generate 24 characters; with the 'F_' prefix we already provided,
-+ * the name will be 26 chars (plus the NUL terminator), so will always fit within
-+ * face_name (LF_FACESIZE = 32). */
-+ face_name[name_str_len++] = enc[p[i] >> 3];
-+ face_name[name_str_len++] = enc[((p[i] << 2) | (p[i + 1] >> 6)) & 0x1f];
-+ face_name[name_str_len++] = enc[p[i + 1] & 0x3f];
-+ }
-+ face_name[name_str_len] = 0;
-+ if (plen)
-+ *plen = name_str_len;
-+}
-+
-+/* Destroys blob. */
-+static hb_blob_t *
-+_hb_rename_font(hb_blob_t *blob, wchar_t *new_name)
-+{
-+ /* Create a copy of the font data, with the 'name' table replaced by a
-+ * table that names the font with our private F_* name created above.
-+ * For simplicity, we just append a new 'name' table and update the
-+ * sfnt directory; the original table is left in place, but unused.
-+ *
-+ * The new table will contain just 5 name IDs: family, style, unique,
-+ * full, PS. All of them point to the same name data with our unique name.
-+ */
-+
-+ blob = OT::Sanitizer<OT::OpenTypeFontFile>::sanitize (blob);
-+
-+ unsigned int length, new_length, name_str_len;
-+ const char *orig_sfnt_data = hb_blob_get_data (blob, &length);
-+
-+ _hb_generate_unique_face_name (new_name, &name_str_len);
-+
-+ static const uint16_t name_IDs[] = { 1, 2, 3, 4, 6 };
-+
-+ unsigned int name_table_length = OT::name::min_size +
-+ ARRAY_LENGTH(name_IDs) * OT::NameRecord::static_size +
-+ name_str_len * 2; /* for name data in UTF16BE form */
-+ unsigned int name_table_offset = (length + 3) & ~3;
-+
-+ new_length = name_table_offset + ((name_table_length + 3) & ~3);
-+ void *new_sfnt_data = calloc(1, new_length);
-+ if (!new_sfnt_data)
-+ {
-+ hb_blob_destroy (blob);
-+ return NULL;
-+ }
-+
-+ memcpy(new_sfnt_data, orig_sfnt_data, length);
-+
-+ OT::name &name = OT::StructAtOffset<OT::name> (new_sfnt_data, name_table_offset);
-+ name.format.set (0);
-+ name.count.set (ARRAY_LENGTH (name_IDs));
-+ name.stringOffset.set (name.get_size());
-+ for (unsigned int i = 0; i < ARRAY_LENGTH (name_IDs); i++)
-+ {
-+ OT::NameRecord &record = name.nameRecord[i];
-+ record.platformID.set(3);
-+ record.encodingID.set(1);
-+ record.languageID.set(0x0409u); /* English */
-+ record.nameID.set(name_IDs[i]);
-+ record.length.set(name_str_len * 2);
-+ record.offset.set(0);
-+ }
-+
-+ /* Copy string data from new_name, converting wchar_t to UTF16BE. */
-+ unsigned char *p = &OT::StructAfter<unsigned char>(name);
-+ for (unsigned int i = 0; i < name_str_len; i++)
-+ {
-+ *p++ = new_name[i] >> 8;
-+ *p++ = new_name[i] & 0xff;
-+ }
-+
-+ /* Adjust name table entry to point to new name table */
-+ const OT::OpenTypeFontFile &file = *(OT::OpenTypeFontFile *) (new_sfnt_data);
-+ unsigned int face_count = file.get_face_count ();
-+ for (unsigned int face_index = 0; face_index < face_count; face_index++)
-+ {
-+ /* Note: doing multiple edits (ie. TTC) can be unsafe. There may be
-+ * toe-stepping. But we don't really care. */
-+ const OT::OpenTypeFontFace &face = file.get_face (face_index);
-+ unsigned int index;
-+ if (face.find_table_index (HB_OT_TAG_name, &index))
-+ {
-+ OT::TableRecord &record = const_cast<OT::TableRecord &> (face.get_table (index));
-+ record.checkSum.set_for_data (&name, name_table_length);
-+ record.offset.set (name_table_offset);
-+ record.length.set (name_table_length);
-+ }
-+ else if (face_index == 0) /* Fail if first face doesn't have 'name' table. */
-+ {
-+ free (new_sfnt_data);
-+ hb_blob_destroy (blob);
-+ return NULL;
-+ }
-+ }
-+
-+ /* The checkSumAdjustment field in the 'head' table is now wrong,
-+ * but that doesn't actually seem to cause any problems so we don't
-+ * bother. */
-+
-+ hb_blob_destroy (blob);
-+ return hb_blob_create ((const char *)new_sfnt_data, new_length,
-+ HB_MEMORY_MODE_WRITABLE, NULL, free);
-+}
-+
-+hb_directwrite_shaper_face_data_t *
-+_hb_directwrite_shaper_face_data_create(hb_face_t *face)
-+{
-+ hb_directwrite_shaper_face_data_t *data = (hb_directwrite_shaper_face_data_t *)calloc(1, sizeof (hb_directwrite_shaper_face_data_t));
-+ if (unlikely (!data))
-+ return NULL;
-+
-+ hb_blob_t *blob = hb_face_reference_blob (face);
-+ if (unlikely (!hb_blob_get_length (blob)))
-+ DEBUG_MSG(DIRECTWRITE, face, "Face has empty blob");
-+
-+ blob = _hb_rename_font (blob, data->face_name);
-+ if (unlikely (!blob))
-+ {
-+ free(data);
-+ return NULL;
-+ }
-+
-+ DWORD num_fonts_installed;
-+ data->fh = AddFontMemResourceEx ((void *)hb_blob_get_data(blob, NULL),
-+ hb_blob_get_length (blob),
-+ 0, &num_fonts_installed);
-+ if (unlikely (!data->fh))
-+ {
-+ DEBUG_MSG (DIRECTWRITE, face, "Face AddFontMemResourceEx() failed");
-+ free (data);
-+ return NULL;
-+ }
-+
-+ return data;
-+}
-+
-+void
-+_hb_directwrite_shaper_face_data_destroy(hb_directwrite_shaper_face_data_t *data)
-+{
-+ RemoveFontMemResourceEx(data->fh);
-+ free(data);
-+}
-+
-+
-+/*
-+ * shaper font data
-+ */
-+
-+struct hb_directwrite_shaper_font_data_t {
-+ HDC hdc;
-+ LOGFONTW log_font;
-+ HFONT hfont;
-+};
-+
-+static bool
-+populate_log_font (LOGFONTW *lf,
-+ hb_font_t *font)
-+{
-+ memset (lf, 0, sizeof (*lf));
-+ lf->lfHeight = -font->y_scale;
-+ lf->lfCharSet = DEFAULT_CHARSET;
-+
-+ hb_face_t *face = font->face;
-+ hb_directwrite_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
-+
-+ memcpy (lf->lfFaceName, face_data->face_name, sizeof (lf->lfFaceName));
-+
-+ return true;
-+}
-+
-+hb_directwrite_shaper_font_data_t *
-+_hb_directwrite_shaper_font_data_create (hb_font_t *font)
-+{
-+ if (unlikely (!hb_directwrite_shaper_face_data_ensure (font->face))) return NULL;
-+
-+ hb_directwrite_shaper_font_data_t *data = (hb_directwrite_shaper_font_data_t *) calloc (1, sizeof (hb_directwrite_shaper_font_data_t));
-+ if (unlikely (!data))
-+ return NULL;
-+
-+ data->hdc = GetDC (NULL);
-+
-+ if (unlikely (!populate_log_font (&data->log_font, font))) {
-+ DEBUG_MSG (DIRECTWRITE, font, "Font populate_log_font() failed");
-+ _hb_directwrite_shaper_font_data_destroy (data);
-+ return NULL;
-+ }
-+
-+ data->hfont = CreateFontIndirectW (&data->log_font);
-+ if (unlikely (!data->hfont)) {
-+ DEBUG_MSG (DIRECTWRITE, font, "Font CreateFontIndirectW() failed");
-+ _hb_directwrite_shaper_font_data_destroy (data);
-+ return NULL;
-+ }
-+
-+ if (!SelectObject (data->hdc, data->hfont)) {
-+ DEBUG_MSG (DIRECTWRITE, font, "Font SelectObject() failed");
-+ _hb_directwrite_shaper_font_data_destroy (data);
-+ return NULL;
-+ }
-+
-+ return data;
-+}
-+
-+void
-+_hb_directwrite_shaper_font_data_destroy (hb_directwrite_shaper_font_data_t *data)
-+{
-+ if (data->hdc)
-+ ReleaseDC (NULL, data->hdc);
-+ if (data->hfont)
-+ DeleteObject (data->hfont);
-+ free (data);
-+}
-+
-+LOGFONTW *
-+hb_directwrite_font_get_logfontw (hb_font_t *font)
-+{
-+ if (unlikely (!hb_directwrite_shaper_font_data_ensure (font))) return NULL;
-+ hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
-+ return &font_data->log_font;
-+}
-+
-+HFONT
-+hb_directwrite_font_get_hfont (hb_font_t *font)
-+{
-+ if (unlikely (!hb_directwrite_shaper_font_data_ensure (font))) return NULL;
-+ hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
-+ return font_data->hfont;
-+}
-+
-+
-+/*
-+ * shaper shape_plan data
-+ */
-+
-+struct hb_directwrite_shaper_shape_plan_data_t {};
-+
-+hb_directwrite_shaper_shape_plan_data_t *
-+_hb_directwrite_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED,
-+ const hb_feature_t *user_features HB_UNUSED,
-+ unsigned int num_user_features HB_UNUSED)
-+{
-+ return (hb_directwrite_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED;
-+}
-+
-+void
-+_hb_directwrite_shaper_shape_plan_data_destroy (hb_directwrite_shaper_shape_plan_data_t *data HB_UNUSED)
-+{
-+}
-+
-+// Most of here TextAnalysis is originally written by Bas Schouten for Mozilla project
-+// but now is relicensed to MIT for HarfBuzz use
-+class TextAnalysis
-+ : public IDWriteTextAnalysisSource, public IDWriteTextAnalysisSink
-+{
-+public:
-+
-+ IFACEMETHOD(QueryInterface)(IID const& iid, OUT void** ppObject) { return S_OK; }
-+ IFACEMETHOD_(ULONG, AddRef)() { return 1; }
-+ IFACEMETHOD_(ULONG, Release)() { return 1; }
-+
-+ // A single contiguous run of characters containing the same analysis
-+ // results.
-+ struct Run
-+ {
-+ UINT32 mTextStart; // starting text position of this run
-+ UINT32 mTextLength; // number of contiguous code units covered
-+ UINT32 mGlyphStart; // starting glyph in the glyphs array
-+ UINT32 mGlyphCount; // number of glyphs associated with this run of
-+ // text
-+ DWRITE_SCRIPT_ANALYSIS mScript;
-+ UINT8 mBidiLevel;
-+ bool mIsSideways;
-+
-+ inline bool ContainsTextPosition(UINT32 aTextPosition) const
-+ {
-+ return aTextPosition >= mTextStart
-+ && aTextPosition < mTextStart + mTextLength;
-+ }
-+
-+ Run *nextRun;
-+ };
-+
-+public:
-+ TextAnalysis(const wchar_t* text,
-+ UINT32 textLength,
-+ const wchar_t* localeName,
-+ DWRITE_READING_DIRECTION readingDirection)
-+ : mText(text)
-+ , mTextLength(textLength)
-+ , mLocaleName(localeName)
-+ , mReadingDirection(readingDirection)
-+ , mCurrentRun(NULL) { };
-+
-+ ~TextAnalysis() {
-+ // delete runs, except mRunHead which is part of the TextAnalysis object
-+ for (Run *run = mRunHead.nextRun; run;) {
-+ Run *origRun = run;
-+ run = run->nextRun;
-+ delete origRun;
-+ }
-+ }
-+
-+ STDMETHODIMP GenerateResults(IDWriteTextAnalyzer* textAnalyzer,
-+ Run **runHead) {
-+ // Analyzes the text using the script analyzer and returns
-+ // the result as a series of runs.
-+
-+ HRESULT hr = S_OK;
-+
-+ // Initially start out with one result that covers the entire range.
-+ // This result will be subdivided by the analysis processes.
-+ mRunHead.mTextStart = 0;
-+ mRunHead.mTextLength = mTextLength;
-+ mRunHead.mBidiLevel =
-+ (mReadingDirection == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT);
-+ mRunHead.nextRun = NULL;
-+ mCurrentRun = &mRunHead;
-+
-+ // Call each of the analyzers in sequence, recording their results.
-+ if (SUCCEEDED(hr = textAnalyzer->AnalyzeScript(this,
-+ 0,
-+ mTextLength,
-+ this))) {
-+ *runHead = &mRunHead;
-+ }
-+
-+ return hr;
-+ }
-+
-+ // IDWriteTextAnalysisSource implementation
-+
-+ IFACEMETHODIMP GetTextAtPosition(UINT32 textPosition,
-+ OUT WCHAR const** textString,
-+ OUT UINT32* textLength)
-+ {
-+ if (textPosition >= mTextLength) {
-+ // No text at this position, valid query though.
-+ *textString = NULL;
-+ *textLength = 0;
-+ }
-+ else {
-+ *textString = mText + textPosition;
-+ *textLength = mTextLength - textPosition;
-+ }
-+ return S_OK;
-+ }
-+
-+ IFACEMETHODIMP GetTextBeforePosition(UINT32 textPosition,
-+ OUT WCHAR const** textString,
-+ OUT UINT32* textLength)
-+ {
-+ if (textPosition == 0 || textPosition > mTextLength) {
-+ // Either there is no text before here (== 0), or this
-+ // is an invalid position. The query is considered valid thouh.
-+ *textString = NULL;
-+ *textLength = 0;
-+ }
-+ else {
-+ *textString = mText;
-+ *textLength = textPosition;
-+ }
-+ return S_OK;
-+ }
-+
-+ IFACEMETHODIMP_(DWRITE_READING_DIRECTION)
-+ GetParagraphReadingDirection() { return mReadingDirection; }
-+
-+ IFACEMETHODIMP GetLocaleName(UINT32 textPosition,
-+ UINT32* textLength,
-+ WCHAR const** localeName) {
-+ return S_OK;
-+ }
-+
-+ IFACEMETHODIMP
-+ GetNumberSubstitution(UINT32 textPosition,
-+ OUT UINT32* textLength,
-+ OUT IDWriteNumberSubstitution** numberSubstitution)
-+ {
-+ // We do not support number substitution.
-+ *numberSubstitution = NULL;
-+ *textLength = mTextLength - textPosition;
-+
-+ return S_OK;
-+ }
-+
-+ // IDWriteTextAnalysisSink implementation
-+
-+ IFACEMETHODIMP
-+ SetScriptAnalysis(UINT32 textPosition,
-+ UINT32 textLength,
-+ DWRITE_SCRIPT_ANALYSIS const* scriptAnalysis)
-+ {
-+ SetCurrentRun(textPosition);
-+ SplitCurrentRun(textPosition);
-+ while (textLength > 0) {
-+ Run *run = FetchNextRun(&textLength);
-+ run->mScript = *scriptAnalysis;
-+ }
-+
-+ return S_OK;
-+ }
-+
-+ IFACEMETHODIMP
-+ SetLineBreakpoints(UINT32 textPosition,
-+ UINT32 textLength,
-+ const DWRITE_LINE_BREAKPOINT* lineBreakpoints) { return S_OK; }
-+
-+ IFACEMETHODIMP SetBidiLevel(UINT32 textPosition,
-+ UINT32 textLength,
-+ UINT8 explicitLevel,
-+ UINT8 resolvedLevel) { return S_OK; }
-+
-+ IFACEMETHODIMP
-+ SetNumberSubstitution(UINT32 textPosition,
-+ UINT32 textLength,
-+ IDWriteNumberSubstitution* numberSubstitution) { return S_OK; }
-+
-+protected:
-+ Run *FetchNextRun(IN OUT UINT32* textLength)
-+ {
-+ // Used by the sink setters, this returns a reference to the next run.
-+ // Position and length are adjusted to now point after the current run
-+ // being returned.
-+
-+ Run *origRun = mCurrentRun;
-+ // Split the tail if needed (the length remaining is less than the
-+ // current run's size).
-+ if (*textLength < mCurrentRun->mTextLength) {
-+ SplitCurrentRun(mCurrentRun->mTextStart + *textLength);
-+ }
-+ else {
-+ // Just advance the current run.
-+ mCurrentRun = mCurrentRun->nextRun;
-+ }
-+ *textLength -= origRun->mTextLength;
-+
-+ // Return a reference to the run that was just current.
-+ return origRun;
-+ }
-+
-+ void SetCurrentRun(UINT32 textPosition)
-+ {
-+ // Move the current run to the given position.
-+ // Since the analyzers generally return results in a forward manner,
-+ // this will usually just return early. If not, find the
-+ // corresponding run for the text position.
-+
-+ if (mCurrentRun && mCurrentRun->ContainsTextPosition(textPosition)) {
-+ return;
-+ }
-+
-+ for (Run *run = &mRunHead; run; run = run->nextRun) {
-+ if (run->ContainsTextPosition(textPosition)) {
-+ mCurrentRun = run;
-+ return;
-+ }
-+ }
-+ //NS_NOTREACHED("We should always be able to find the text position in one \
-+ // of our runs");
-+ }
-+
-+ void SplitCurrentRun(UINT32 splitPosition)
-+ {
-+ if (!mCurrentRun) {
-+ //NS_ASSERTION(false, "SplitCurrentRun called without current run.");
-+ // Shouldn't be calling this when no current run is set!
-+ return;
-+ }
-+ // Split the current run.
-+ if (splitPosition <= mCurrentRun->mTextStart) {
-+ // No need to split, already the start of a run
-+ // or before it. Usually the first.
-+ return;
-+ }
-+ Run *newRun = new Run;
-+
-+ *newRun = *mCurrentRun;
-+
-+ // Insert the new run in our linked list.
-+ newRun->nextRun = mCurrentRun->nextRun;
-+ mCurrentRun->nextRun = newRun;
-+
-+ // Adjust runs' text positions and lengths.
-+ UINT32 splitPoint = splitPosition - mCurrentRun->mTextStart;
-+ newRun->mTextStart += splitPoint;
-+ newRun->mTextLength -= splitPoint;
-+ mCurrentRun->mTextLength = splitPoint;
-+ mCurrentRun = newRun;
-+ }
-+
-+protected:
-+ // Input
-+ // (weak references are fine here, since this class is a transient
-+ // stack-based helper that doesn't need to copy data)
-+ UINT32 mTextLength;
-+ const WCHAR* mText;
-+ const WCHAR* mLocaleName;
-+ DWRITE_READING_DIRECTION mReadingDirection;
-+
-+ // Current processing state.
-+ Run *mCurrentRun;
-+
-+ // Output is a list of runs starting here
-+ Run mRunHead;
-+};
-+
-+
-+/*
-+ * shaper
-+ */
-+
-+hb_bool_t
-+_hb_directwrite_shape(hb_shape_plan_t *shape_plan,
-+ hb_font_t *font,
-+ hb_buffer_t *buffer,
-+ const hb_feature_t *features,
-+ unsigned int num_features)
-+{
-+ hb_face_t *face = font->face;
-+ hb_directwrite_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face);
-+ hb_directwrite_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font);
-+
-+ // factory probably should be cached
-+ IDWriteFactory* dwriteFactory;
-+ DWriteCreateFactory(
-+ DWRITE_FACTORY_TYPE_SHARED,
-+ __uuidof(IDWriteFactory),
-+ reinterpret_cast<IUnknown**>(&dwriteFactory)
-+ );
-+
-+ IDWriteGdiInterop *gdiInterop;
-+ dwriteFactory->GetGdiInterop (&gdiInterop);
-+ IDWriteFontFace* fontFace;
-+ gdiInterop->CreateFontFaceFromHdc (font_data->hdc, &fontFace);
-+
-+ IDWriteTextAnalyzer* analyzer;
-+ dwriteFactory->CreateTextAnalyzer (&analyzer);
-+
-+ unsigned int scratch_size;
-+ hb_buffer_t::scratch_buffer_t *scratch = buffer->get_scratch_buffer (&scratch_size);
-+#define ALLOCATE_ARRAY(Type, name, len) \
-+ Type *name = (Type *) scratch; \
-+ { \
-+ unsigned int _consumed = DIV_CEIL ((len) * sizeof (Type), sizeof (*scratch)); \
-+ assert (_consumed <= scratch_size); \
-+ scratch += _consumed; \
-+ scratch_size -= _consumed; \
-+ }
-+
-+#define utf16_index() var1.u32
-+
-+ ALLOCATE_ARRAY(WCHAR, pchars, buffer->len * 2);
-+
-+ unsigned int chars_len = 0;
-+ for (unsigned int i = 0; i < buffer->len; i++)
-+ {
-+ hb_codepoint_t c = buffer->info[i].codepoint;
-+ buffer->info[i].utf16_index() = chars_len;
-+ if (likely(c <= 0xFFFFu))
-+ pchars[chars_len++] = c;
-+ else if (unlikely(c > 0x10FFFFu))
-+ pchars[chars_len++] = 0xFFFDu;
-+ else {
-+ pchars[chars_len++] = 0xD800u + ((c - 0x10000u) >> 10);
-+ pchars[chars_len++] = 0xDC00u + ((c - 0x10000u) & ((1 << 10) - 1));
-+ }
-+ }
-+
-+ ALLOCATE_ARRAY(WORD, log_clusters, chars_len);
-+ if (num_features)
-+ {
-+ /* Need log_clusters to assign features. */
-+ chars_len = 0;
-+ for (unsigned int i = 0; i < buffer->len; i++)
-+ {
-+ hb_codepoint_t c = buffer->info[i].codepoint;
-+ unsigned int cluster = buffer->info[i].cluster;
-+ log_clusters[chars_len++] = cluster;
-+ if (hb_in_range(c, 0x10000u, 0x10FFFFu))
-+ log_clusters[chars_len++] = cluster; /* Surrogates. */
-+ }
-+ }
-+
-+ HRESULT hr;
-+ // TODO: Handle TEST_DISABLE_OPTIONAL_LIGATURES
-+
-+ DWRITE_READING_DIRECTION readingDirection = buffer->props.direction ?
-+ DWRITE_READING_DIRECTION_RIGHT_TO_LEFT :
-+ DWRITE_READING_DIRECTION_LEFT_TO_RIGHT;
-+
-+ /*
-+ * There's an internal 16-bit limit on some things inside the analyzer,
-+ * but we never attempt to shape a word longer than 64K characters
-+ * in a single gfxShapedWord, so we cannot exceed that limit.
-+ */
-+ UINT32 length = buffer->len;
-+
-+ TextAnalysis analysis(pchars, length, NULL, readingDirection);
-+ TextAnalysis::Run *runHead;
-+ hr = analysis.GenerateResults(analyzer, &runHead);
-+
-+ if (FAILED(hr)) {
-+ //NS_WARNING("Analyzer failed to generate results.");
-+ return false;
-+ }
-+
-+ UINT32 maxGlyphs = 3 * length / 2 + 16;
-+
-+#define INITIAL_GLYPH_SIZE 400
-+ UINT16* clusters = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
-+ UINT16* glyphs = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
-+ DWRITE_SHAPING_TEXT_PROPERTIES* textProperties = (DWRITE_SHAPING_TEXT_PROPERTIES*)
-+ malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_TEXT_PROPERTIES));
-+ DWRITE_SHAPING_GLYPH_PROPERTIES* glyphProperties = (DWRITE_SHAPING_GLYPH_PROPERTIES*)
-+ malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES));
-+
-+ UINT32 actualGlyphs;
-+
-+ bool backward = HB_DIRECTION_IS_BACKWARD(buffer->props.direction);
-+
-+ wchar_t lang[4];
-+ mbstowcs(lang, hb_language_to_string(buffer->props.language), 4);
-+ hr = analyzer->GetGlyphs(pchars, length,
-+ fontFace, FALSE,
-+ buffer->props.direction,
-+ &runHead->mScript, (const wchar_t*)lang, NULL, NULL, NULL, 0,
-+ maxGlyphs, clusters, textProperties,
-+ glyphs, glyphProperties, &actualGlyphs);
-+
-+ if (hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) {
-+ free(clusters);
-+ free(glyphs);
-+ free(textProperties);
-+ free(glyphProperties);
-+
-+ clusters = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
-+ glyphs = (UINT16*)malloc(INITIAL_GLYPH_SIZE * sizeof(UINT16));
-+ textProperties = (DWRITE_SHAPING_TEXT_PROPERTIES*)
-+ malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_TEXT_PROPERTIES));
-+ glyphProperties = (DWRITE_SHAPING_GLYPH_PROPERTIES*)
-+ malloc(INITIAL_GLYPH_SIZE * sizeof(DWRITE_SHAPING_GLYPH_PROPERTIES));
-+
-+ hr = analyzer->GetGlyphs(pchars, length,
-+ fontFace, FALSE,
-+ buffer->props.direction,
-+ &runHead->mScript, (const wchar_t*)lang, NULL, NULL, NULL, 0,
-+ maxGlyphs, clusters, textProperties,
-+ glyphs, glyphProperties, &actualGlyphs);
-+ }
-+ if (FAILED(hr)) {
-+ //NS_WARNING("Analyzer failed to get glyphs.");
-+ return false;
-+ }
-+
-+ FLOAT advances[400];
-+ DWRITE_GLYPH_OFFSET offsets[400];
-+
-+
-+ /* The -2 in the following is to compensate for possible
-+ * alignment needed after the WORD array. sizeof(WORD) == 2. */
-+ unsigned int glyphs_size = (scratch_size * sizeof (int)-2)
-+ / (sizeof (WORD) +
-+ 4 + // sizeof (SCRIPT_GLYPHPROP) +
-+ sizeof (int) +
-+ 8 + // sizeof (GOFFSET) +
-+ sizeof (uint32_t));
-+ ALLOCATE_ARRAY(uint32_t, vis_clusters, glyphs_size);
-+
-+#undef ALLOCATE_ARRAY
-+
-+ hr = analyzer->GetGlyphPlacements(pchars,
-+ clusters,
-+ textProperties,
-+ length,
-+ glyphs,
-+ glyphProperties,
-+ actualGlyphs,
-+ fontFace,
-+ face->get_upem(),
-+ FALSE,
-+ FALSE,
-+ &runHead->mScript,
-+ NULL,
-+ NULL,
-+ NULL,
-+ 0,
-+ advances,
-+ offsets);
-+
-+ if (FAILED(hr)) {
-+ //NS_WARNING("Analyzer failed to get glyph placements.");
-+ return false;
-+ }
-+
-+ unsigned int glyphs_len = actualGlyphs;
-+
-+ /* Ok, we've got everything we need, now compose output buffer,
-+ * very, *very*, carefully! */
-+
-+ /* Calculate visual-clusters. That's what we ship. */
-+ for (unsigned int i = 0; i < glyphs_len; i++)
-+ vis_clusters[i] = -1;
-+ for (unsigned int i = 0; i < buffer->len; i++) {
-+ uint32_t *p = &vis_clusters[log_clusters[buffer->info[i].utf16_index()]];
-+ //*p = MIN (*p, buffer->info[i].cluster);
-+ }
-+ for (unsigned int i = 1; i < glyphs_len; i++)
-+ if (vis_clusters[i] == -1)
-+ vis_clusters[i] = vis_clusters[i - 1];
-+
-+#undef utf16_index
-+
-+ //if (unlikely (!buffer->ensure (glyphs_len)))
-+ // FAIL ("Buffer in error");
-+
-+#undef FAIL
-+
-+ /* Set glyph infos */
-+ buffer->len = 0;
-+ for (unsigned int i = 0; i < glyphs_len; i++)
-+ {
-+ hb_glyph_info_t *info = &buffer->info[buffer->len++];
-+
-+ info->codepoint = glyphs[i];
-+ info->cluster = vis_clusters[i];
-+
-+ /* The rest is crap. Let's store position info there for now. */
-+ info->mask = advances[i];
-+ info->var1.u32 = offsets[i].ascenderOffset;
-+ info->var2.u32 = -offsets[i].advanceOffset;
-+ }
-+
-+ free(clusters);
-+ free(glyphs);
-+ free(textProperties);
-+ free(glyphProperties);
-+
-+ /* Set glyph positions */
-+ buffer->clear_positions ();
-+ for (unsigned int i = 0; i < glyphs_len; i++)
-+ {
-+ hb_glyph_info_t *info = &buffer->info[i];
-+ hb_glyph_position_t *pos = &buffer->pos[i];
-+
-+ /* TODO vertical */
-+ pos->x_advance = info->mask;
-+ pos->x_offset = backward ? -info->var1.u32 : info->var1.u32;
-+ pos->y_offset = info->var2.u32;
-+ }
-+
-+ if (backward)
-+ hb_buffer_reverse (buffer);
-+
-+ /* Wow, done! */
-+ return true;
-+}
-diff --git a/gfx/harfbuzz/src/hb-directwrite.h b/gfx/harfbuzz/src/hb-directwrite.h
-new file mode 100644
---- /dev/null
-+++ b/gfx/harfbuzz/src/hb-directwrite.h
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright © 2015 Ebrahim Byagowi
-+ *
-+ * This is part of HarfBuzz, a text shaping library.
-+ *
-+ * Permission is hereby granted, without written agreement and without
-+ * license or royalty fees, to use, copy, modify, and distribute this
-+ * software and its documentation for any purpose, provided that the
-+ * above copyright notice and the following two paragraphs appear in
-+ * all copies of this software.
-+ *
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
-+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+ */
-+
-+#ifndef HB_DIRECTWRITE_H
-+#define HB_DIRECTWRITE_H
-+
-+#include "hb.h"
-+
-+HB_BEGIN_DECLS
-+
-+HB_END_DECLS
-+
-+#endif /* HB_UNISCRIBE_H */
-diff --git a/gfx/harfbuzz/src/hb-face.h b/gfx/harfbuzz/src/hb-face.h
---- a/gfx/harfbuzz/src/hb-face.h
-+++ b/gfx/harfbuzz/src/hb-face.h
-@@ -38,80 +38,80 @@ HB_BEGIN_DECLS
-
-
- /*
- * hb_face_t
- */
+Only in mozilla-1228540/gfx/harfbuzz/src: hb-directwrite.cc
+Only in mozilla-1228540/gfx/harfbuzz/src: hb-directwrite.h
+diff -u -r mozilla/gfx/harfbuzz/src/hb-face.h mozilla-1228540/gfx/harfbuzz/src/hb-face.h
+--- mozilla/gfx/harfbuzz/src/hb-face.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-face.h 2016-07-09 23:52:22.093096381 +0200
+@@ -43,28 +43,28 @@
typedef struct hb_face_t hb_face_t;
@@ -3619,7 +2040,7 @@ diff --git a/gfx/harfbuzz/src/hb-face.h b/gfx/harfbuzz/src/hb-face.h
hb_face_set_user_data (hb_face_t *face,
hb_user_data_key_t *key,
void * data,
- hb_destroy_func_t destroy,
+@@ -72,43 +72,43 @@
hb_bool_t replace);
@@ -3674,18 +2095,10 @@ diff --git a/gfx/harfbuzz/src/hb-face.h b/gfx/harfbuzz/src/hb-face.h
hb_face_get_glyph_count (hb_face_t *face);
- HB_END_DECLS
-
- #endif /* HB_FACE_H */
-diff --git a/gfx/harfbuzz/src/hb-fallback-shape.cc b/gfx/harfbuzz/src/hb-fallback-shape.cc
---- a/gfx/harfbuzz/src/hb-fallback-shape.cc
-+++ b/gfx/harfbuzz/src/hb-fallback-shape.cc
-@@ -101,17 +101,17 @@ hb_bool_t
- * - Handle Variation Selectors?
- * - Apply normalization?
- *
- * This will make the fallback shaper into a dumb "TrueType"
- * shaper which many people unfortunately still request.
+diff -u -r mozilla/gfx/harfbuzz/src/hb-fallback-shape.cc mozilla-1228540/gfx/harfbuzz/src/hb-fallback-shape.cc
+--- mozilla/gfx/harfbuzz/src/hb-fallback-shape.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-fallback-shape.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -106,7 +106,7 @@
*/
hb_codepoint_t space;
@@ -3694,151 +2107,10 @@ diff --git a/gfx/harfbuzz/src/hb-fallback-shape.cc b/gfx/harfbuzz/src/hb-fallbac
buffer->clear_positions ();
- hb_direction_t direction = buffer->props.direction;
- hb_unicode_funcs_t *unicode = buffer->unicode;
- unsigned int count = buffer->len;
- hb_glyph_info_t *info = buffer->info;
- hb_glyph_position_t *pos = buffer->pos;
-diff --git a/gfx/harfbuzz/src/hb-font-private.hh b/gfx/harfbuzz/src/hb-font-private.hh
---- a/gfx/harfbuzz/src/hb-font-private.hh
-+++ b/gfx/harfbuzz/src/hb-font-private.hh
-@@ -37,16 +37,18 @@
-
-
-
- /*
- * hb_font_funcs_t
- */
-
- #define HB_FONT_FUNCS_IMPLEMENT_CALLBACKS \
-+ HB_FONT_FUNC_IMPLEMENT (font_h_extents) \
-+ HB_FONT_FUNC_IMPLEMENT (font_v_extents) \
- HB_FONT_FUNC_IMPLEMENT (glyph) \
- HB_FONT_FUNC_IMPLEMENT (glyph_h_advance) \
- HB_FONT_FUNC_IMPLEMENT (glyph_v_advance) \
- HB_FONT_FUNC_IMPLEMENT (glyph_h_origin) \
- HB_FONT_FUNC_IMPLEMENT (glyph_v_origin) \
- HB_FONT_FUNC_IMPLEMENT (glyph_h_kerning) \
- HB_FONT_FUNC_IMPLEMENT (glyph_v_kerning) \
- HB_FONT_FUNC_IMPLEMENT (glyph_extents) \
-@@ -75,17 +77,17 @@ struct hb_font_funcs_t {
-
- /* Don't access these directly. Call font->get_*() instead. */
- union get_t {
- struct get_funcs_t {
- #define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name;
- HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
- #undef HB_FONT_FUNC_IMPLEMENT
- } f;
-- void (*array[]) (void);
-+ void (*array[VAR]) (void);
- } get;
- };
-
-
-
- /*
- * hb_font_t
- */
-@@ -155,17 +157,32 @@ struct hb_font_t {
- { \
- hb_font_funcs_t *funcs = this->klass; \
- unsigned int i = offsetof (hb_font_funcs_t::get_t::get_funcs_t, name) / sizeof (funcs->get.array[0]); \
- return has_func (i); \
- }
- HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
- #undef HB_FONT_FUNC_IMPLEMENT
-
-- inline hb_bool_t has_glyph (hb_codepoint_t unicode)
-+ inline hb_bool_t get_font_h_extents (hb_font_extents_t *extents)
-+ {
-+ memset (extents, 0, sizeof (*extents));
-+ return klass->get.f.font_h_extents (this, user_data,
-+ extents,
-+ klass->user_data.font_h_extents);
-+ }
-+ inline hb_bool_t get_font_v_extents (hb_font_extents_t *extents)
-+ {
-+ memset (extents, 0, sizeof (*extents));
-+ return klass->get.f.font_v_extents (this, user_data,
-+ extents,
-+ klass->user_data.font_v_extents);
-+ }
-+
-+ inline bool has_glyph (hb_codepoint_t unicode)
- {
- hb_codepoint_t glyph;
- return get_glyph (unicode, 0, &glyph);
- }
-
- inline hb_bool_t get_glyph (hb_codepoint_t unicode, hb_codepoint_t variation_selector,
- hb_codepoint_t *glyph)
- {
-@@ -260,16 +277,36 @@ struct hb_font_t {
- name, len,
- glyph,
- klass->user_data.glyph_from_name);
- }
-
-
- /* A bit higher-level, and with fallback */
-
-+ inline void get_extents_for_direction (hb_direction_t direction,
-+ hb_font_extents_t *extents)
-+ {
-+ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
-+ if (!get_font_h_extents (extents))
-+ {
-+ extents->ascender = y_scale * .8;
-+ extents->descender = y_scale - extents->ascender;
-+ extents->line_gap = 0;
-+ }
-+ } else {
-+ if (!get_font_v_extents (extents))
-+ {
-+ extents->ascender = x_scale / 2;
-+ extents->descender = x_scale - extents->ascender;
-+ extents->line_gap = 0;
-+ }
-+ }
-+ }
-+
- inline void get_glyph_advance_for_direction (hb_codepoint_t glyph,
- hb_direction_t direction,
- hb_position_t *x, hb_position_t *y)
- {
- if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
- *x = get_glyph_h_advance (glyph);
- *y = 0;
- } else {
-@@ -279,17 +316,17 @@ struct hb_font_t {
- }
-
- /* Internal only */
- inline void guess_v_origin_minus_h_origin (hb_codepoint_t glyph,
- hb_position_t *x, hb_position_t *y)
- {
- *x = get_glyph_h_advance (glyph) / 2;
-
-- /* TODO use font_metrics.ascent */
-+ /* TODO use font_extents.ascender */
- *y = y_scale;
- }
-
- inline void get_glyph_origin_for_direction (hb_codepoint_t glyph,
- hb_direction_t direction,
- hb_position_t *x, hb_position_t *y)
- {
- if (likely (HB_DIRECTION_IS_HORIZONTAL (direction)))
-diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
---- a/gfx/harfbuzz/src/hb-font.cc
-+++ b/gfx/harfbuzz/src/hb-font.cc
-@@ -40,16 +40,64 @@
- #include <string.h>
-
-
- /*
- * hb_font_funcs_t
+diff -u -r mozilla/gfx/harfbuzz/src/hb-font.cc mozilla-1228540/gfx/harfbuzz/src/hb-font.cc
+--- mozilla/gfx/harfbuzz/src/hb-font.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-font.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -45,6 +45,54 @@
*/
static hb_bool_t
@@ -3893,17 +2165,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
hb_font_get_glyph_nil (hb_font_t *font HB_UNUSED,
void *font_data HB_UNUSED,
hb_codepoint_t unicode,
- hb_codepoint_t variation_selector,
- hb_codepoint_t *glyph,
- void *user_data HB_UNUSED)
- {
- *glyph = 0;
-@@ -104,17 +152,17 @@ static hb_bool_t
- hb_font_get_glyph_h_origin_nil (hb_font_t *font HB_UNUSED,
- void *font_data HB_UNUSED,
- hb_codepoint_t glyph,
- hb_position_t *x,
- hb_position_t *y,
+@@ -109,7 +157,7 @@
void *user_data HB_UNUSED)
{
*x = *y = 0;
@@ -3912,17 +2174,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
}
static hb_bool_t
hb_font_get_glyph_h_origin_parent (hb_font_t *font,
- void *font_data HB_UNUSED,
- hb_codepoint_t glyph,
- hb_position_t *x,
- hb_position_t *y,
- void *user_data HB_UNUSED)
-@@ -275,17 +323,16 @@ hb_font_get_glyph_from_name_parent (hb_f
- void *font_data HB_UNUSED,
- const char *name, int len, /* -1 means nul-terminated */
- hb_codepoint_t *glyph,
- void *user_data HB_UNUSED)
- {
+@@ -280,7 +328,6 @@
return font->parent->get_glyph_from_name (name, len, glyph);
}
@@ -3930,17 +2182,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
static const hb_font_funcs_t _hb_font_funcs_nil = {
HB_OBJECT_HEADER_STATIC,
- true, /* immutable */
-
- {
- #define HB_FONT_FUNC_IMPLEMENT(name) NULL,
- HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
-@@ -517,16 +564,52 @@ hb_font_t::has_func (unsigned int i)
- if (parent && parent != hb_font_get_empty () && parent->has_func (i))
- return true;
- return this->klass->get.array[i] != _hb_font_funcs_parent.get.array[i];
- }
-
+@@ -522,6 +569,42 @@
/* Public getters */
/**
@@ -3983,17 +2225,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
* hb_font_get_glyph:
* @font: a font.
* @unicode:
- * @variation_selector:
- * @glyph: (out):
- *
- *
- *
-@@ -741,16 +824,33 @@ hb_font_get_glyph_from_name (hb_font_t *
- {
- return font->get_glyph_from_name (name, len, glyph);
- }
-
-
+@@ -746,6 +829,23 @@
/* A bit higher-level, and with fallback */
/**
@@ -4017,20 +2249,10 @@ diff --git a/gfx/harfbuzz/src/hb-font.cc b/gfx/harfbuzz/src/hb-font.cc
* hb_font_get_glyph_advance_for_direction:
* @font: a font.
* @glyph:
- * @direction:
- * @x: (out):
- * @y: (out):
- *
- *
-diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
---- a/gfx/harfbuzz/src/hb-font.h
-+++ b/gfx/harfbuzz/src/hb-font.h
-@@ -41,61 +41,85 @@ typedef struct hb_font_t hb_font_t;
-
-
- /*
- * hb_font_funcs_t
- */
+diff -u -r mozilla/gfx/harfbuzz/src/hb-font.h mozilla-1228540/gfx/harfbuzz/src/hb-font.h
+--- mozilla/gfx/harfbuzz/src/hb-font.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-font.h 2016-07-09 23:52:22.093096381 +0200
+@@ -46,19 +46,19 @@
typedef struct hb_font_funcs_t hb_font_funcs_t;
@@ -4055,7 +2277,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs,
hb_user_data_key_t *key,
void * data,
- hb_destroy_func_t destroy,
+@@ -66,19 +66,37 @@
hb_bool_t replace);
@@ -4097,36 +2319,24 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
/* Note that height is negative in coordinate systems that grow up. */
typedef struct hb_glyph_extents_t
- {
- hb_position_t x_bearing; /* left side of glyph from origin. */
- hb_position_t y_bearing; /* top side of glyph from origin. */
- hb_position_t width; /* distance from left to right side. */
+@@ -89,9 +107,15 @@
hb_position_t height; /* distance from top to bottom side. */
} hb_glyph_extents_t;
-+/* func types */
+-
+ /* func types */
--/* func types */
+typedef hb_bool_t (*hb_font_get_font_extents_func_t) (hb_font_t *font, void *font_data,
+ hb_font_extents_t *metrics,
+ void *user_data);
+typedef hb_font_get_font_extents_func_t hb_font_get_font_h_extents_func_t;
+typedef hb_font_get_font_extents_func_t hb_font_get_font_v_extents_func_t;
+
-
++
typedef hb_bool_t (*hb_font_get_glyph_func_t) (hb_font_t *font, void *font_data,
hb_codepoint_t unicode, hb_codepoint_t variation_selector,
hb_codepoint_t *glyph,
- void *user_data);
-
-
- typedef hb_position_t (*hb_font_get_glyph_advance_func_t) (hb_font_t *font, void *font_data,
-@@ -136,377 +160,419 @@ typedef hb_bool_t (*hb_font_get_glyph_fr
- const char *name, int len, /* -1 means nul-terminated */
- hb_codepoint_t *glyph,
- void *user_data);
-
-
+@@ -141,6 +165,38 @@
/* func setters */
/**
@@ -4165,10 +2375,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
* hb_font_funcs_set_glyph_func:
* @ffuncs: font functions.
* @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -151,7 +207,7 @@
*
* Since: 0.9.2
**/
@@ -4177,15 +2384,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_h_advance_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -167,7 +223,7 @@
*
* Since: 0.9.2
**/
@@ -4194,15 +2393,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_h_advance_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_v_advance_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -183,7 +239,7 @@
*
* Since: 0.9.2
**/
@@ -4211,15 +2402,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_v_advance_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_h_origin_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -199,7 +255,7 @@
*
* Since: 0.9.2
**/
@@ -4228,15 +2411,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_h_origin_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_v_origin_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -215,7 +271,7 @@
*
* Since: 0.9.2
**/
@@ -4245,15 +2420,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_v_origin_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_h_kerning_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -231,7 +287,7 @@
*
* Since: 0.9.2
**/
@@ -4262,15 +2429,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_h_kerning_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_v_kerning_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -247,7 +303,7 @@
*
* Since: 0.9.2
**/
@@ -4279,15 +2438,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_v_kerning_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_extents_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -263,7 +319,7 @@
*
* Since: 0.9.2
**/
@@ -4296,15 +2447,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_extents_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_contour_point_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -279,7 +335,7 @@
*
* Since: 0.9.2
**/
@@ -4313,15 +2456,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_contour_point_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_name_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -295,7 +351,7 @@
*
* Since: 0.9.2
**/
@@ -4330,15 +2465,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs,
hb_font_get_glyph_name_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_font_funcs_set_glyph_from_name_func:
- * @ffuncs: font functions.
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -311,57 +367,63 @@
*
* Since: 0.9.2
**/
@@ -4415,7 +2542,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_get_glyph_from_name (hb_font_t *font,
const char *name, int len, /* -1 means nul-terminated */
hb_codepoint_t *glyph);
-
+@@ -369,52 +431,56 @@
/* high-level funcs, with fallback */
@@ -4481,11 +2608,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_glyph_from_string (hb_font_t *font,
const char *s, int len, /* -1 means nul-terminated */
hb_codepoint_t *glyph);
-
-
- /*
- * hb_font_t
- */
+@@ -426,22 +492,22 @@
/* Fonts are very light-weight objects */
@@ -4514,7 +2637,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_set_user_data (hb_font_t *font,
hb_user_data_key_t *key,
void * data,
- hb_destroy_func_t destroy,
+@@ -449,46 +515,46 @@
hb_bool_t replace);
@@ -4571,7 +2694,7 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_get_scale (hb_font_t *font,
int *x_scale,
int *y_scale);
-
+@@ -496,12 +562,12 @@
/*
* A zero value means "no hinting in that direction"
*/
@@ -4586,20 +2709,82 @@ diff --git a/gfx/harfbuzz/src/hb-font.h b/gfx/harfbuzz/src/hb-font.h
hb_font_get_ppem (hb_font_t *font,
unsigned int *x_ppem,
unsigned int *y_ppem);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-font-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-font-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-font-private.hh 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-font-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -42,6 +42,8 @@
+ */
+ #define HB_FONT_FUNCS_IMPLEMENT_CALLBACKS \
++ HB_FONT_FUNC_IMPLEMENT (font_h_extents) \
++ HB_FONT_FUNC_IMPLEMENT (font_v_extents) \
+ HB_FONT_FUNC_IMPLEMENT (glyph) \
+ HB_FONT_FUNC_IMPLEMENT (glyph_h_advance) \
+ HB_FONT_FUNC_IMPLEMENT (glyph_v_advance) \
+@@ -160,7 +162,22 @@
+ HB_FONT_FUNCS_IMPLEMENT_CALLBACKS
+ #undef HB_FONT_FUNC_IMPLEMENT
- HB_END_DECLS
+- inline hb_bool_t has_glyph (hb_codepoint_t unicode)
++ inline hb_bool_t get_font_h_extents (hb_font_extents_t *extents)
++ {
++ memset (extents, 0, sizeof (*extents));
++ return klass->get.f.font_h_extents (this, user_data,
++ extents,
++ klass->user_data.font_h_extents);
++ }
++ inline hb_bool_t get_font_v_extents (hb_font_extents_t *extents)
++ {
++ memset (extents, 0, sizeof (*extents));
++ return klass->get.f.font_v_extents (this, user_data,
++ extents,
++ klass->user_data.font_v_extents);
++ }
++
++ inline bool has_glyph (hb_codepoint_t unicode)
+ {
+ hb_codepoint_t glyph;
+ return get_glyph (unicode, 0, &glyph);
+@@ -265,6 +282,26 @@
+
+ /* A bit higher-level, and with fallback */
+
++ inline void get_extents_for_direction (hb_direction_t direction,
++ hb_font_extents_t *extents)
++ {
++ if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) {
++ if (!get_font_h_extents (extents))
++ {
++ extents->ascender = y_scale * .8;
++ extents->descender = y_scale - extents->ascender;
++ extents->line_gap = 0;
++ }
++ } else {
++ if (!get_font_v_extents (extents))
++ {
++ extents->ascender = x_scale / 2;
++ extents->descender = x_scale - extents->ascender;
++ extents->line_gap = 0;
++ }
++ }
++ }
++
+ inline void get_glyph_advance_for_direction (hb_codepoint_t glyph,
+ hb_direction_t direction,
+ hb_position_t *x, hb_position_t *y)
+@@ -284,7 +321,7 @@
+ {
+ *x = get_glyph_h_advance (glyph) / 2;
- #endif /* HB_FONT_H */
-diff --git a/gfx/harfbuzz/src/hb-ft.cc b/gfx/harfbuzz/src/hb-ft.cc
---- a/gfx/harfbuzz/src/hb-ft.cc
-+++ b/gfx/harfbuzz/src/hb-ft.cc
-@@ -361,16 +361,35 @@ hb_ft_get_glyph_from_name (hb_font_t *fo
- if (!FT_Get_Glyph_Name(ft_face, 0, buf, sizeof (buf)) &&
- len < 0 ? !strcmp (buf, name) : !strncmp (buf, name, len))
- return true;
+- /* TODO use font_metrics.ascent */
++ /* TODO use font_extents.ascender */
+ *y = y_scale;
}
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ft.cc mozilla-1228540/gfx/harfbuzz/src/hb-ft.cc
+--- mozilla/gfx/harfbuzz/src/hb-ft.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ft.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -366,6 +366,25 @@
return *glyph != 0;
}
@@ -4625,17 +2810,7 @@ diff --git a/gfx/harfbuzz/src/hb-ft.cc b/gfx/harfbuzz/src/hb-ft.cc
static hb_font_funcs_t *static_ft_funcs = NULL;
- #ifdef HB_USE_ATEXIT
- static
- void free_static_ft_funcs (void)
- {
- hb_font_funcs_destroy (static_ft_funcs);
-@@ -382,16 +401,18 @@ static void
- {
- retry:
- hb_font_funcs_t *funcs = (hb_font_funcs_t *) hb_atomic_ptr_get (&static_ft_funcs);
-
- if (unlikely (!funcs))
+@@ -387,6 +406,8 @@
{
funcs = hb_font_funcs_create ();
@@ -4644,20 +2819,10 @@ diff --git a/gfx/harfbuzz/src/hb-ft.cc b/gfx/harfbuzz/src/hb-ft.cc
hb_font_funcs_set_glyph_func (funcs, hb_ft_get_glyph, NULL, NULL);
hb_font_funcs_set_glyph_h_advance_func (funcs, hb_ft_get_glyph_h_advance, NULL, NULL);
hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ft_get_glyph_v_advance, NULL, NULL);
- //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ft_get_glyph_h_origin, NULL, NULL);
- hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ft_get_glyph_v_origin, NULL, NULL);
- hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ft_get_glyph_h_kerning, NULL, NULL);
- //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ft_get_glyph_v_kerning, NULL, NULL);
- hb_font_funcs_set_glyph_extents_func (funcs, hb_ft_get_glyph_extents, NULL, NULL);
-diff --git a/gfx/harfbuzz/src/hb-ft.h b/gfx/harfbuzz/src/hb-ft.h
---- a/gfx/harfbuzz/src/hb-ft.h
-+++ b/gfx/harfbuzz/src/hb-ft.h
-@@ -54,73 +54,73 @@ HB_BEGIN_DECLS
- * destroyed after hb-face is destroyed.
- *
- * Most often you don't want this function. You should use either
- * hb_ft_face_create_cached(), or hb_ft_face_create_referenced().
- * In particular, if you are going to pass NULL as destroy, you
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ft.h mozilla-1228540/gfx/harfbuzz/src/hb-ft.h
+--- mozilla/gfx/harfbuzz/src/hb-ft.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ft.h 2016-07-09 23:52:22.093096381 +0200
+@@ -59,7 +59,7 @@
* probably should use (the more recent) hb_ft_face_create_referenced()
* instead.
*/
@@ -4666,11 +2831,7 @@ diff --git a/gfx/harfbuzz/src/hb-ft.h b/gfx/harfbuzz/src/hb-ft.h
hb_ft_face_create (FT_Face ft_face,
hb_destroy_func_t destroy);
- /* This version is like hb_ft_face_create(), except that it caches
- * the hb-face using the generic pointer of the ft-face. This means
- * that subsequent calls to this function with the same ft-face will
- * return the same hb-face (correctly referenced).
- *
+@@ -71,7 +71,7 @@
* Client is still responsible for making sure that ft-face is destroyed
* after hb-face is.
*/
@@ -4679,9 +2840,7 @@ diff --git a/gfx/harfbuzz/src/hb-ft.h b/gfx/harfbuzz/src/hb-ft.h
hb_ft_face_create_cached (FT_Face ft_face);
/* This version is like hb_ft_face_create(), except that it calls
- * FT_Reference_Face() on ft-face, as such keeping ft-face alive
- * as long as the hb-face is.
- *
+@@ -81,7 +81,7 @@
* This is the most convenient version to use. Use it unless you have
* very good reasons not to.
*/
@@ -4690,16 +2849,7 @@ diff --git a/gfx/harfbuzz/src/hb-ft.h b/gfx/harfbuzz/src/hb-ft.h
hb_ft_face_create_referenced (FT_Face ft_face);
- /*
- * hb-font from ft-face.
- */
-
- /*
- * Note:
- *
- * Set face size on ft-face before creating hb-font from it.
- * Otherwise hb-ft would NOT pick up the font size correctly.
- */
+@@ -98,26 +98,26 @@
/* See notes on hb_ft_face_create(). Same issues re lifecycle-management
* apply here. Use hb_ft_font_create_referenced() if you can. */
@@ -4732,18 +2882,10 @@ diff --git a/gfx/harfbuzz/src/hb-ft.h b/gfx/harfbuzz/src/hb-ft.h
hb_ft_font_set_funcs (hb_font_t *font);
- HB_END_DECLS
-
- #endif /* HB_FT_H */
-diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc
---- a/gfx/harfbuzz/src/hb-glib.cc
-+++ b/gfx/harfbuzz/src/hb-glib.cc
-@@ -378,16 +378,18 @@ hb_glib_get_unicode_funcs (void)
- #undef HB_UNICODE_FUNC_IMPLEMENT
- }
- };
-
- return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-glib.cc mozilla-1228540/gfx/harfbuzz/src/hb-glib.cc
+--- mozilla/gfx/harfbuzz/src/hb-glib.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-glib.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -383,6 +383,8 @@
}
/**
@@ -4752,20 +2894,10 @@ diff --git a/gfx/harfbuzz/src/hb-glib.cc b/gfx/harfbuzz/src/hb-glib.cc
* Since: 0.9.38
**/
hb_blob_t *
- hb_glib_blob_create (GBytes *gbytes)
- {
- gsize size = 0;
- gconstpointer data = g_bytes_get_data (gbytes, &size);
- return hb_blob_create ((const char *) data,
-diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h
---- a/gfx/harfbuzz/src/hb-glib.h
-+++ b/gfx/harfbuzz/src/hb-glib.h
-@@ -31,25 +31,25 @@
-
- #include "hb.h"
-
- #include <glib.h>
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-glib.h mozilla-1228540/gfx/harfbuzz/src/hb-glib.h
+--- mozilla/gfx/harfbuzz/src/hb-glib.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-glib.h 2016-07-09 23:52:22.093096381 +0200
+@@ -36,17 +36,17 @@
HB_BEGIN_DECLS
@@ -4787,18 +2919,10 @@ diff --git a/gfx/harfbuzz/src/hb-glib.h b/gfx/harfbuzz/src/hb-glib.h
hb_glib_blob_create (GBytes *gbytes);
- HB_END_DECLS
-
- #endif /* HB_GLIB_H */
-diff --git a/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl b/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl
---- a/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl
-+++ b/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl
-@@ -37,17 +37,17 @@
- #include <glib-object.h>
-
- HB_BEGIN_DECLS
-
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl mozilla-1228540/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl
+--- mozilla/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl 2016-07-09 23:52:22.093096381 +0200
+@@ -42,7 +42,7 @@
/*** END file-header ***/
/*** BEGIN value-header ***/
@@ -4807,20 +2931,10 @@ diff --git a/gfx/harfbuzz/src/hb-gobject-enums.h.tmpl b/gfx/harfbuzz/src/hb-gobj
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
/*** END value-header ***/
-
- /*** BEGIN file-tail ***/
-
- HB_END_DECLS
-
-diff --git a/gfx/harfbuzz/src/hb-gobject-structs.h b/gfx/harfbuzz/src/hb-gobject-structs.h
---- a/gfx/harfbuzz/src/hb-gobject-structs.h
-+++ b/gfx/harfbuzz/src/hb-gobject-structs.h
-@@ -38,68 +38,68 @@
- HB_BEGIN_DECLS
-
-
- /* Object types */
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-gobject-structs.h mozilla-1228540/gfx/harfbuzz/src/hb-gobject-structs.h
+--- mozilla/gfx/harfbuzz/src/hb-gobject-structs.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-gobject-structs.h 2016-07-09 23:52:22.093096381 +0200
+@@ -43,60 +43,60 @@
/**
* Since: 0.9.2
**/
@@ -4894,18 +3008,10 @@ diff --git a/gfx/harfbuzz/src/hb-gobject-structs.h b/gfx/harfbuzz/src/hb-gobject
#define HB_GOBJECT_TYPE_USER_DATA_KEY (hb_gobject_user_data_key_get_type ())
- HB_END_DECLS
-
- #endif /* HB_GOBJECT_H */
-diff --git a/gfx/harfbuzz/src/hb-graphite2.cc b/gfx/harfbuzz/src/hb-graphite2.cc
---- a/gfx/harfbuzz/src/hb-graphite2.cc
-+++ b/gfx/harfbuzz/src/hb-graphite2.cc
-@@ -346,27 +346,28 @@ hb_bool_t
- {
- hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j];
- info->codepoint = gids[clusters[i].base_glyph + j];
- info->cluster = clusters[i].cluster;
- }
+diff -u -r mozilla/gfx/harfbuzz/src/hb-graphite2.cc mozilla-1228540/gfx/harfbuzz/src/hb-graphite2.cc
+--- mozilla/gfx/harfbuzz/src/hb-graphite2.cc 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-graphite2.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -351,6 +351,7 @@
}
buffer->len = glyph_count;
@@ -4913,8 +3019,7 @@ diff --git a/gfx/harfbuzz/src/hb-graphite2.cc b/gfx/harfbuzz/src/hb-graphite2.cc
/* Positioning. */
if (!HB_DIRECTION_IS_BACKWARD(buffer->props.direction))
{
- hb_glyph_position_t *pPos;
- for (pPos = hb_buffer_get_glyph_positions (buffer, NULL), is = gr_seg_first_slot (seg);
+@@ -359,9 +360,9 @@
is; pPos++, is = gr_slot_next_in_segment (is))
{
pPos->x_offset = gr_slot_origin_X (is) - curradvx;
@@ -4926,17 +3031,7 @@ diff --git a/gfx/harfbuzz/src/hb-graphite2.cc b/gfx/harfbuzz/src/hb-graphite2.cc
curradvx += pPos->x_advance;
curradvy += pPos->y_advance;
}
- pPos[-1].x_advance += gr_seg_advance_X(seg) - curradvx;
- }
- else
- {
- hb_glyph_position_t *pPos = hb_buffer_get_glyph_positions (buffer, NULL) + buffer->len - 1;
-@@ -382,27 +383,27 @@ hb_bool_t
- curradvx += clusx;
- curradvy += clusy;
- currclus = info->cluster;
- clusx = 0.;
- clusy = 0.;
+@@ -387,17 +388,17 @@
for (tis = is, tinfo = info; tis && tinfo->cluster == currclus; tis = gr_slot_prev_in_segment (tis), tinfo--)
{
clusx += gr_slot_advance_X (tis, grface, grfont);
@@ -4957,20 +3052,10 @@ diff --git a/gfx/harfbuzz/src/hb-graphite2.cc b/gfx/harfbuzz/src/hb-graphite2.cc
}
hb_buffer_reverse_clusters (buffer);
}
-
- if (feats) gr_featureval_destroy (feats);
- gr_seg_destroy (seg);
-
- return true;
-diff --git a/gfx/harfbuzz/src/hb-graphite2.h b/gfx/harfbuzz/src/hb-graphite2.h
---- a/gfx/harfbuzz/src/hb-graphite2.h
-+++ b/gfx/harfbuzz/src/hb-graphite2.h
-@@ -31,18 +31,18 @@
- #include <graphite2/Font.h>
-
- HB_BEGIN_DECLS
-
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-graphite2.h mozilla-1228540/gfx/harfbuzz/src/hb-graphite2.h
+--- mozilla/gfx/harfbuzz/src/hb-graphite2.h 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-graphite2.h 2016-07-09 23:52:22.093096381 +0200
+@@ -36,10 +36,10 @@
#define HB_GRAPHITE2_TAG_SILF HB_TAG('S','i','l','f')
@@ -4983,18 +3068,24 @@ diff --git a/gfx/harfbuzz/src/hb-graphite2.h b/gfx/harfbuzz/src/hb-graphite2.h
hb_graphite2_font_get_gr_font (hb_font_t *font);
- HB_END_DECLS
-
- #endif /* HB_GRAPHITE2_H */
-diff --git a/gfx/harfbuzz/src/hb-icu.h b/gfx/harfbuzz/src/hb-icu.h
---- a/gfx/harfbuzz/src/hb-icu.h
-+++ b/gfx/harfbuzz/src/hb-icu.h
-@@ -31,22 +31,22 @@
-
- #include "hb.h"
-
- #include <unicode/uscript.h>
+diff -u -r mozilla/gfx/harfbuzz/src/hb.h mozilla-1228540/gfx/harfbuzz/src/hb.h
+--- mozilla/gfx/harfbuzz/src/hb.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb.h 2016-07-09 23:52:22.096429701 +0200
+@@ -28,6 +28,10 @@
+ #define HB_H
+ #define HB_H_IN
++#ifndef HB_EXTERN
++#define HB_EXTERN extern
++#endif
++
+ #include "hb-blob.h"
+ #include "hb-buffer.h"
+ #include "hb-common.h"
+diff -u -r mozilla/gfx/harfbuzz/src/hb-icu.h mozilla-1228540/gfx/harfbuzz/src/hb-icu.h
+--- mozilla/gfx/harfbuzz/src/hb-icu.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-icu.h 2016-07-09 23:52:22.093096381 +0200
+@@ -36,14 +36,14 @@
HB_BEGIN_DECLS
@@ -5012,38 +3103,10 @@ diff --git a/gfx/harfbuzz/src/hb-icu.h b/gfx/harfbuzz/src/hb-icu.h
hb_icu_get_unicode_funcs (void);
- HB_END_DECLS
-
- #endif /* HB_ICU_H */
-diff --git a/gfx/harfbuzz/src/hb-open-type-private.hh b/gfx/harfbuzz/src/hb-open-type-private.hh
---- a/gfx/harfbuzz/src/hb-open-type-private.hh
-+++ b/gfx/harfbuzz/src/hb-open-type-private.hh
-@@ -98,19 +98,16 @@ static inline Type& StructAfter(TObject
- # define DEFINE_COMPILES_ASSERTION(_code) _DEFINE_COMPILES_ASSERTION0 (__LINE__, _code)
-
-
- #define DEFINE_SIZE_STATIC(size) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)); \
- static const unsigned int static_size = (size); \
- static const unsigned int min_size = (size)
-
--/* Size signifying variable-sized array */
--#define VAR 1
--
- #define DEFINE_SIZE_UNION(size, _member) \
- DEFINE_INSTANCE_ASSERTION (this->u._member.static_size == (size)); \
- static const unsigned int min_size = (size)
-
- #define DEFINE_SIZE_MIN(size) \
- DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)); \
- static const unsigned int min_size = (size)
-
-@@ -180,17 +177,17 @@ struct hb_dispatch_context_t
-
- #define TRACE_SANITIZE(this) \
- hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace \
- (&c->debug_depth, c->get_name (), this, HB_FUNC, \
- "");
+diff -u -r mozilla/gfx/harfbuzz/src/hb-open-type-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-open-type-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-open-type-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-open-type-private.hh 2016-07-09 23:54:00.822696030 +0200
+@@ -182,7 +182,7 @@
/* This limits sanitizing time on really broken fonts. */
#ifndef HB_SANITIZE_MAX_EDITS
@@ -5052,20 +3115,10 @@ diff --git a/gfx/harfbuzz/src/hb-open-type-private.hh b/gfx/harfbuzz/src/hb-open
#endif
struct hb_sanitize_context_t :
- hb_dispatch_context_t<hb_sanitize_context_t, bool, HB_DEBUG_SANITIZE>
- {
- inline hb_sanitize_context_t (void) :
- debug_depth (0),
- start (NULL), end (NULL),
-diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
---- a/gfx/harfbuzz/src/hb-ot-font.cc
-+++ b/gfx/harfbuzz/src/hb-ot-font.cc
-@@ -30,34 +30,63 @@
-
- #include "hb-font-private.hh"
-
- #include "hb-ot-cmap-table.hh"
- #include "hb-ot-glyf-table.hh"
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-font.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-font.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-font.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-font.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -35,6 +35,7 @@
#include "hb-ot-head-table.hh"
#include "hb-ot-hhea-table.hh"
#include "hb-ot-hmtx-table.hh"
@@ -5073,7 +3126,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
struct hb_ot_face_metrics_accelerator_t
- {
+@@ -42,17 +43,45 @@
unsigned int num_metrics;
unsigned int num_advances;
unsigned int default_advance;
@@ -5120,17 +3173,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
hb_blob_destroy (_hea_blob);
this->blob = OT::Sanitizer<OT::_mtx>::sanitize (face->reference_table (_mtx_tag));
-
- /* Cap num_metrics() and num_advances() based on table length. */
- unsigned int len = hb_blob_get_length (this->blob);
- if (unlikely (this->num_advances * 4 > len))
- this->num_advances = len / 4;
-@@ -247,18 +276,18 @@ static hb_ot_font_t *
- _hb_ot_font_create (hb_face_t *face)
- {
- hb_ot_font_t *ot_font = (hb_ot_font_t *) calloc (1, sizeof (hb_ot_font_t));
-
- if (unlikely (!ot_font))
+@@ -252,8 +281,8 @@
return NULL;
ot_font->cmap.init (face);
@@ -5141,17 +3184,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
ot_font->glyf.init (face);
return ot_font;
- }
-
- static void
- _hb_ot_font_destroy (hb_ot_font_t *ot_font)
- {
-@@ -315,16 +344,41 @@ hb_ot_get_glyph_extents (hb_font_t *font
- bool ret = ot_font->glyf.get_extents (glyph, extents);
- extents->x_bearing = font->em_scale_x (extents->x_bearing);
- extents->y_bearing = font->em_scale_y (extents->y_bearing);
- extents->width = font->em_scale_x (extents->width);
- extents->height = font->em_scale_y (extents->height);
+@@ -320,6 +349,31 @@
return ret;
}
@@ -5183,17 +3216,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
static hb_font_funcs_t *static_ot_funcs = NULL;
- #ifdef HB_USE_ATEXIT
- static
- void free_static_ot_funcs (void)
- {
- hb_font_funcs_destroy (static_ot_funcs);
-@@ -336,16 +390,18 @@ static hb_font_funcs_t *
- {
- retry:
- hb_font_funcs_t *funcs = (hb_font_funcs_t *) hb_atomic_ptr_get (&static_ot_funcs);
-
- if (unlikely (!funcs))
+@@ -341,6 +395,8 @@
{
funcs = hb_font_funcs_create ();
@@ -5202,17 +3225,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
hb_font_funcs_set_glyph_func (funcs, hb_ot_get_glyph, NULL, NULL);
hb_font_funcs_set_glyph_h_advance_func (funcs, hb_ot_get_glyph_h_advance, NULL, NULL);
hb_font_funcs_set_glyph_v_advance_func (funcs, hb_ot_get_glyph_v_advance, NULL, NULL);
- //hb_font_funcs_set_glyph_h_origin_func (funcs, hb_ot_get_glyph_h_origin, NULL, NULL);
- //hb_font_funcs_set_glyph_v_origin_func (funcs, hb_ot_get_glyph_v_origin, NULL, NULL);
- //hb_font_funcs_set_glyph_h_kerning_func (funcs, hb_ot_get_glyph_h_kerning, NULL, NULL); TODO
- //hb_font_funcs_set_glyph_v_kerning_func (funcs, hb_ot_get_glyph_v_kerning, NULL, NULL);
- hb_font_funcs_set_glyph_extents_func (funcs, hb_ot_get_glyph_extents, NULL, NULL);
-@@ -365,16 +421,18 @@ retry:
- #endif
- };
-
- return funcs;
- }
+@@ -370,6 +426,8 @@
/**
@@ -5221,20 +3234,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.cc b/gfx/harfbuzz/src/hb-ot-font.cc
* Since: 0.9.28
**/
void
- hb_ot_font_set_funcs (hb_font_t *font)
- {
- hb_ot_font_t *ot_font = _hb_ot_font_create (font->face);
- if (unlikely (!ot_font))
- return;
-diff --git a/gfx/harfbuzz/src/hb-ot-font.h b/gfx/harfbuzz/src/hb-ot-font.h
---- a/gfx/harfbuzz/src/hb-ot-font.h
-+++ b/gfx/harfbuzz/src/hb-ot-font.h
-@@ -31,15 +31,15 @@
- #ifndef HB_OT_FONT_H
- #define HB_OT_FONT_H
-
- #include "hb.h"
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-font.h mozilla-1228540/gfx/harfbuzz/src/hb-ot-font.h
+--- mozilla/gfx/harfbuzz/src/hb-ot-font.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-font.h 2016-07-09 23:52:22.093096381 +0200
+@@ -36,7 +36,7 @@
HB_BEGIN_DECLS
@@ -5243,18 +3246,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-font.h b/gfx/harfbuzz/src/hb-ot-font.h
hb_ot_font_set_funcs (hb_font_t *font);
- HB_END_DECLS
-
- #endif /* HB_OT_FONT_H */
-diff --git a/gfx/harfbuzz/src/hb-ot-head-table.hh b/gfx/harfbuzz/src/hb-ot-head-table.hh
---- a/gfx/harfbuzz/src/hb-ot-head-table.hh
-+++ b/gfx/harfbuzz/src/hb-ot-head-table.hh
-@@ -50,17 +50,19 @@ struct head
- unsigned int upem = unitsPerEm;
- /* If no valid head table found, assume 1000, which matches typical Type1 usage. */
- return 16 <= upem && upem <= 16384 ? upem : 1000;
- }
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-head-table.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-head-table.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-head-table.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-head-table.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -55,7 +55,9 @@
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
@@ -5265,164 +3260,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-head-table.hh b/gfx/harfbuzz/src/hb-ot-head-
}
protected:
- FixedVersion version; /* Version of the head table--currently
- * 0x00010000u for version 1.0. */
- FixedVersion fontRevision; /* Set by font manufacturer. */
- ULONG checkSumAdjustment; /* To compute: set it to 0, sum the
- * entire font as ULONG, then store
-diff --git a/gfx/harfbuzz/src/hb-ot-layout-common-private.hh b/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
---- a/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
-@@ -540,16 +540,19 @@ struct Feature
-
- OffsetTo<FeatureParams> new_offset;
- /* Check that it did not overflow. */
- new_offset.set (new_offset_int);
- if (new_offset == new_offset_int &&
- c->try_set (&featureParams, new_offset) &&
- !featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))
- return_trace (false);
-+
-+ if (c->edit_count > 1)
-+ c->edit_count--; /* This was a "legitimate" edit; don't contribute to error count. */
- }
-
- return_trace (true);
- }
-
- OffsetTo<FeatureParams>
- featureParams; /* Offset to Feature Parameters table (if one
- * has been defined for the feature), relative
-diff --git a/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh b/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
---- a/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
-+++ b/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
-@@ -737,17 +737,17 @@ struct PairPosFormat1
- DEFINE_SIZE_ARRAY (10, pairSet);
- };
-
- struct PairPosFormat2
- {
- inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
- {
- TRACE_COLLECT_GLYPHS (this);
-- /* (this+coverage).add_coverage (c->input); // Don't need this. */
-+ (this+coverage).add_coverage (c->input);
-
- unsigned int count1 = class1Count;
- const ClassDef &klass1 = this+classDef1;
- for (unsigned int i = 0; i < count1; i++)
- klass1.add_class (c->input, i);
-
- unsigned int count2 = class2Count;
- const ClassDef &klass2 = this+classDef2;
-diff --git a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
---- a/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
-@@ -840,37 +840,43 @@ static inline bool ligate_input (hb_appl
- }
- c->replace_glyph_with_ligature (lig_glyph, klass);
-
- for (unsigned int i = 1; i < count; i++)
- {
- while (buffer->idx < match_positions[i] && !buffer->in_error)
- {
- if (!is_mark_ligature) {
-+ unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->cur());
-+ if (this_comp == 0)
-+ this_comp = last_num_components;
- unsigned int new_lig_comp = components_so_far - last_num_components +
-- MIN (MAX (_hb_glyph_info_get_lig_comp (&buffer->cur()), 1u), last_num_components);
-- _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
-+ MIN (this_comp, last_num_components);
-+ _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
- }
- buffer->next_glyph ();
- }
-
- last_lig_id = _hb_glyph_info_get_lig_id (&buffer->cur());
- last_num_components = _hb_glyph_info_get_lig_num_comps (&buffer->cur());
- components_so_far += last_num_components;
-
- /* Skip the base glyph */
- buffer->idx++;
- }
-
- if (!is_mark_ligature && last_lig_id) {
- /* Re-adjust components for any marks following. */
- for (unsigned int i = buffer->idx; i < buffer->len; i++) {
- if (last_lig_id == _hb_glyph_info_get_lig_id (&buffer->info[i])) {
-+ unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->info[i]);
-+ if (!this_comp)
-+ break;
- unsigned int new_lig_comp = components_so_far - last_num_components +
-- MIN (MAX (_hb_glyph_info_get_lig_comp (&buffer->info[i]), 1u), last_num_components);
-+ MIN (this_comp, last_num_components);
- _hb_glyph_info_set_lig_props_for_mark (&buffer->info[i], lig_id, new_lig_comp);
- } else
- break;
- }
- }
- return_trace (true);
- }
-
-@@ -966,16 +972,21 @@ static inline bool apply_lookup (hb_appl
- }
-
- for (unsigned int i = 0; i < lookupCount; i++)
- {
- unsigned int idx = lookupRecord[i].sequenceIndex;
- if (idx >= count)
- continue;
-
-+ /* Don't recurse to ourself at same position.
-+ * Note that this test is too naive, it doesn't catch longer loops. */
-+ if (idx == 0 && lookupRecord[i].lookupListIndex == c->lookup_index)
-+ continue;
-+
- buffer->move_to (match_positions[idx]);
-
- unsigned int orig_len = buffer->backtrack_len () + buffer->lookahead_len ();
- if (!c->recurse (lookupRecord[i].lookupListIndex))
- continue;
-
- unsigned int new_len = buffer->backtrack_len () + buffer->lookahead_len ();
- int delta = new_len - orig_len;
-diff --git a/gfx/harfbuzz/src/hb-ot-layout-private.hh b/gfx/harfbuzz/src/hb-ot-layout-private.hh
---- a/gfx/harfbuzz/src/hb-ot-layout-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-layout-private.hh
-@@ -512,21 +512,19 @@ static inline bool
- static inline void
- _hb_glyph_info_clear_ligated_and_multiplied (hb_glyph_info_t *info)
- {
- info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_LIGATED |
- HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED);
- }
-
- static inline void
--_hb_glyph_info_clear_substituted_and_ligated_and_multiplied (hb_glyph_info_t *info)
-+_hb_glyph_info_clear_substituted (hb_glyph_info_t *info)
- {
-- info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED |
-- HB_OT_LAYOUT_GLYPH_PROPS_LIGATED |
-- HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED);
-+ info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED);
- }
-
-
- /* Allocation / deallocation. */
-
- static inline void
- _hb_buffer_allocate_unicode_vars (hb_buffer_t *buffer)
- {
-diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
---- a/gfx/harfbuzz/src/hb-ot-layout.cc
-+++ b/gfx/harfbuzz/src/hb-ot-layout.cc
-@@ -125,26 +125,30 @@ static inline const OT::GPOS&
-
- hb_bool_t
- hb_ot_layout_has_glyph_classes (hb_face_t *face)
- {
- return _get_gdef (face).has_glyph_classes ();
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -130,6 +130,8 @@
}
/**
@@ -5431,10 +3272,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
hb_ot_layout_glyph_class_t
- hb_ot_layout_get_glyph_class (hb_face_t *face,
- hb_codepoint_t glyph)
- {
- return (hb_ot_layout_glyph_class_t) _get_gdef (face).get_glyph_class (glyph);
+@@ -140,6 +142,8 @@
}
/**
@@ -5443,17 +3281,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
void
- hb_ot_layout_get_glyphs_in_class (hb_face_t *face,
- hb_ot_layout_glyph_class_t klass,
- hb_set_t *glyphs /* OUT */)
- {
- return _get_gdef (face).get_glyphs_in_class (klass, glyphs);
-@@ -360,16 +364,18 @@ hb_ot_layout_language_get_required_featu
- table_tag,
- script_index,
- language_index,
- feature_index,
- NULL);
+@@ -365,6 +369,8 @@
}
/**
@@ -5462,17 +3290,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.30
**/
hb_bool_t
- hb_ot_layout_language_get_required_feature (hb_face_t *face,
- hb_tag_t table_tag,
- unsigned int script_index,
- unsigned int language_index,
- unsigned int *feature_index,
-@@ -447,16 +453,18 @@ hb_ot_layout_language_find_feature (hb_f
- }
- }
-
- if (feature_index) *feature_index = HB_OT_LAYOUT_NO_FEATURE_INDEX;
- return false;
+@@ -452,6 +458,8 @@
}
/**
@@ -5481,17 +3299,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
unsigned int
- hb_ot_layout_feature_get_lookups (hb_face_t *face,
- hb_tag_t table_tag,
- unsigned int feature_index,
- unsigned int start_offset,
- unsigned int *lookup_count /* IN/OUT */,
-@@ -464,16 +472,18 @@ hb_ot_layout_feature_get_lookups (hb_fac
- {
- const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag);
- const OT::Feature &f = g.get_feature (feature_index);
-
- return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes);
+@@ -469,6 +477,8 @@
}
/**
@@ -5500,17 +3308,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.22
**/
unsigned int
- hb_ot_layout_table_get_lookup_count (hb_face_t *face,
- hb_tag_t table_tag)
- {
- switch (table_tag)
- {
-@@ -624,16 +634,18 @@ static void
- language_index,
- features,
- lookup_indexes);
- }
- }
+@@ -629,6 +639,8 @@
}
/**
@@ -5519,17 +3317,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.8
**/
void
- hb_ot_layout_collect_lookups (hb_face_t *face,
- hb_tag_t table_tag,
- const hb_tag_t *scripts,
- const hb_tag_t *languages,
- const hb_tag_t *features,
-@@ -668,16 +680,18 @@ hb_ot_layout_collect_lookups (hb_face_t
- languages,
- features,
- lookup_indexes);
- }
- }
+@@ -673,6 +685,8 @@
}
/**
@@ -5538,17 +3326,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
void
- hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
- hb_tag_t table_tag,
- unsigned int lookup_index,
- hb_set_t *glyphs_before, /* OUT. May be NULL */
- hb_set_t *glyphs_input, /* OUT. May be NULL */
-@@ -716,16 +730,18 @@ hb_ot_layout_lookup_collect_glyphs (hb_f
-
- hb_bool_t
- hb_ot_layout_has_substitution (hb_face_t *face)
- {
- return &_get_gsub (face) != &OT::Null(OT::GSUB);
+@@ -721,6 +735,8 @@
}
/**
@@ -5557,17 +3335,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
hb_bool_t
- hb_ot_layout_lookup_would_substitute (hb_face_t *face,
- unsigned int lookup_index,
- const hb_codepoint_t *glyphs,
- unsigned int glyphs_length,
- hb_bool_t zero_context)
-@@ -737,17 +753,17 @@ hb_ot_layout_lookup_would_substitute (hb
- hb_bool_t
- hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face,
- unsigned int lookup_index,
- const hb_codepoint_t *glyphs,
- unsigned int glyphs_length,
+@@ -742,7 +758,7 @@
hb_bool_t zero_context)
{
if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false;
@@ -5576,17 +3344,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index);
- return l.would_apply (&c, &hb_ot_layout_from_face (face)->gsub_accels[lookup_index]);
- }
-
- void
- hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer)
-@@ -757,16 +773,18 @@ hb_ot_layout_substitute_start (hb_font_t
-
- void
- hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer)
- {
- OT::GSUB::substitute_finish (font, buffer);
+@@ -762,6 +778,8 @@
}
/**
@@ -5595,17 +3353,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.7
**/
void
- hb_ot_layout_lookup_substitute_closure (hb_face_t *face,
- unsigned int lookup_index,
- hb_set_t *glyphs)
- {
- OT::hb_closure_context_t c (face, glyphs);
-@@ -794,16 +812,18 @@ hb_ot_layout_position_start (hb_font_t *
-
- void
- hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer)
- {
- OT::GPOS::position_finish (font, buffer);
+@@ -799,6 +817,8 @@
}
/**
@@ -5614,17 +3362,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
* Since: 0.9.10
**/
hb_bool_t
- hb_ot_layout_get_size_params (hb_face_t *face,
- unsigned int *design_size, /* OUT. May be NULL */
- unsigned int *subfamily_id, /* OUT. May be NULL */
- unsigned int *subfamily_name_id, /* OUT. May be NULL */
- unsigned int *range_start, /* OUT. May be NULL */
-@@ -1003,35 +1023,25 @@ inline void hb_ot_map_t::apply (const Pr
- unsigned int i = 0;
- OT::hb_apply_context_t c (table_index, font, buffer);
- c.set_recurse_func (Proxy::Lookup::apply_recurse_func);
-
- for (unsigned int stage_index = 0; stage_index < stages[table_index].len; stage_index++) {
+@@ -1008,25 +1028,15 @@
const stage_map_t *stage = &stages[table_index][stage_index];
for (; i < stage->last_lookup; i++)
{
@@ -5652,20 +3390,78 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.cc b/gfx/harfbuzz/src/hb-ot-layout.cc
}
if (stage->pause_func)
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout-common-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-common-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout-common-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-common-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -545,6 +545,9 @@
+ c->try_set (&featureParams, new_offset) &&
+ !featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))
+ return_trace (false);
++
++ if (c->edit_count > 1)
++ c->edit_count--; /* This was a "legitimate" edit; don't contribute to error count. */
+ }
+
+ return_trace (true);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-gpos-table.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -742,7 +742,7 @@
+ inline void collect_glyphs (hb_collect_glyphs_context_t *c) const
+ {
+ TRACE_COLLECT_GLYPHS (this);
+- /* (this+coverage).add_coverage (c->input); // Don't need this. */
++ (this+coverage).add_coverage (c->input);
+
+ unsigned int count1 = class1Count;
+ const ClassDef &klass1 = this+classDef1;
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-gsubgpos-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -845,9 +845,12 @@
+ while (buffer->idx < match_positions[i] && !buffer->in_error)
{
- buffer->clear_output ();
- stage->pause_func (plan, font, buffer);
+ if (!is_mark_ligature) {
++ unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->cur());
++ if (this_comp == 0)
++ this_comp = last_num_components;
+ unsigned int new_lig_comp = components_so_far - last_num_components +
+- MIN (MAX (_hb_glyph_info_get_lig_comp (&buffer->cur()), 1u), last_num_components);
+- _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
++ MIN (this_comp, last_num_components);
++ _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
+ }
+ buffer->next_glyph ();
}
- }
-diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
---- a/gfx/harfbuzz/src/hb-ot-layout.h
-+++ b/gfx/harfbuzz/src/hb-ot-layout.h
-@@ -43,170 +43,170 @@ HB_BEGIN_DECLS
- #define HB_OT_TAG_GPOS HB_TAG('G','P','O','S')
- #define HB_OT_TAG_JSTF HB_TAG('J','S','T','F')
+@@ -864,8 +867,11 @@
+ /* Re-adjust components for any marks following. */
+ for (unsigned int i = buffer->idx; i < buffer->len; i++) {
+ if (last_lig_id == _hb_glyph_info_get_lig_id (&buffer->info[i])) {
++ unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->info[i]);
++ if (!this_comp)
++ break;
+ unsigned int new_lig_comp = components_so_far - last_num_components +
+- MIN (MAX (_hb_glyph_info_get_lig_comp (&buffer->info[i]), 1u), last_num_components);
++ MIN (this_comp, last_num_components);
+ _hb_glyph_info_set_lig_props_for_mark (&buffer->info[i], lig_id, new_lig_comp);
+ } else
+ break;
+@@ -971,6 +977,11 @@
+ if (idx >= count)
+ continue;
++ /* Don't recurse to ourself at same position.
++ * Note that this test is too naive, it doesn't catch longer loops. */
++ if (idx == 0 && lookupRecord[i].lookupListIndex == c->lookup_index)
++ continue;
++
+ buffer->move_to (match_positions[idx]);
- /*
+ unsigned int orig_len = buffer->backtrack_len () + buffer->lookahead_len ();
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout.h mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout.h
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout.h 2016-07-09 23:52:22.093096381 +0200
+@@ -48,7 +48,7 @@
* GDEF
*/
@@ -5674,10 +3470,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_has_glyph_classes (hb_face_t *face);
typedef enum {
- HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0,
- HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH = 1,
- HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE = 2,
- HB_OT_LAYOUT_GLYPH_CLASS_MARK = 3,
+@@ -59,11 +59,11 @@
HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT = 4
} hb_ot_layout_glyph_class_t;
@@ -5691,7 +3484,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_get_glyphs_in_class (hb_face_t *face,
hb_ot_layout_glyph_class_t klass,
hb_set_t *glyphs /* OUT */);
-
+@@ -71,7 +71,7 @@
/* Not that useful. Provides list of attach points for a glyph that a
* client may want to cache */
@@ -5700,7 +3493,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_get_attach_points (hb_face_t *face,
hb_codepoint_t glyph,
unsigned int start_offset,
- unsigned int *point_count /* IN/OUT */,
+@@ -79,7 +79,7 @@
unsigned int *point_array /* OUT */);
/* Ligature caret positions */
@@ -5709,16 +3502,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_get_ligature_carets (hb_font_t *font,
hb_direction_t direction,
hb_codepoint_t glyph,
- unsigned int start_offset,
- unsigned int *caret_count /* IN/OUT */,
- hb_position_t *caret_array /* OUT */);
-
-
- /*
- * GSUB/GPOS feature query and enumeration interface
- */
-
- #define HB_OT_LAYOUT_NO_SCRIPT_INDEX 0xFFFFu
+@@ -96,35 +96,35 @@
#define HB_OT_LAYOUT_NO_FEATURE_INDEX 0xFFFFu
#define HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX 0xFFFFu
@@ -5759,7 +3543,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_script_get_language_tags (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
- unsigned int start_offset,
+@@ -132,21 +132,21 @@
unsigned int *language_count /* IN/OUT */,
hb_tag_t *language_tags /* OUT */);
@@ -5784,7 +3568,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_language_get_required_feature (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
- unsigned int language_index,
+@@ -154,7 +154,7 @@
unsigned int *feature_index,
hb_tag_t *feature_tag);
@@ -5793,8 +3577,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_language_get_feature_indexes (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
- unsigned int language_index,
- unsigned int start_offset,
+@@ -163,7 +163,7 @@
unsigned int *feature_count /* IN/OUT */,
unsigned int *feature_indexes /* OUT */);
@@ -5803,8 +3586,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_language_get_feature_tags (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
- unsigned int language_index,
- unsigned int start_offset,
+@@ -172,7 +172,7 @@
unsigned int *feature_count /* IN/OUT */,
hb_tag_t *feature_tags /* OUT */);
@@ -5813,7 +3595,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_language_find_feature (hb_face_t *face,
hb_tag_t table_tag,
unsigned int script_index,
- unsigned int language_index,
+@@ -180,7 +180,7 @@
hb_tag_t feature_tag,
unsigned int *feature_index);
@@ -5822,7 +3604,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_feature_get_lookups (hb_face_t *face,
hb_tag_t table_tag,
unsigned int feature_index,
- unsigned int start_offset,
+@@ -188,12 +188,12 @@
unsigned int *lookup_count /* IN/OUT */,
unsigned int *lookup_indexes /* OUT */);
@@ -5837,7 +3619,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_collect_lookups (hb_face_t *face,
hb_tag_t table_tag,
const hb_tag_t *scripts,
- const hb_tag_t *languages,
+@@ -201,7 +201,7 @@
const hb_tag_t *features,
hb_set_t *lookup_indexes /* OUT */);
@@ -5846,17 +3628,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_lookup_collect_glyphs (hb_face_t *face,
hb_tag_t table_tag,
unsigned int lookup_index,
- hb_set_t *glyphs_before, /* OUT. May be NULL */
- hb_set_t *glyphs_input, /* OUT. May be NULL */
- hb_set_t *glyphs_after, /* OUT. May be NULL */
- hb_set_t *glyphs_output /* OUT. May be NULL */);
-
-@@ -223,77 +223,77 @@ typedef struct
-
- typedef hb_bool_t
- (*hb_ot_layout_glyph_sequence_func_t) (hb_font_t *font,
- hb_tag_t table_tag,
- unsigned int lookup_index,
+@@ -228,7 +228,7 @@
const hb_ot_layout_glyph_sequence_t *sequence,
void *user_data);
@@ -5865,12 +3637,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
Xhb_ot_layout_lookup_enumerate_sequences (hb_face_t *face,
hb_tag_t table_tag,
unsigned int lookup_index,
- hb_ot_layout_glyph_sequence_func_t callback,
- void *user_data);
- #endif
-
-
- /*
+@@ -241,17 +241,17 @@
* GSUB
*/
@@ -5891,7 +3658,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_lookup_substitute_closure (hb_face_t *face,
unsigned int lookup_index,
hb_set_t *glyphs
- /*TODO , hb_bool_t inclusive */);
+@@ -259,7 +259,7 @@
#ifdef HB_NOT_IMPLEMENTED
/* Note: You better have GDEF when using this API, or marks won't do much. */
@@ -5900,14 +3667,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
Xhb_ot_layout_lookup_substitute (hb_font_t *font,
unsigned int lookup_index,
const hb_ot_layout_glyph_sequence_t *sequence,
- unsigned int out_size,
- hb_codepoint_t *glyphs_out, /* OUT */
- unsigned int *clusters_out, /* OUT */
- unsigned int *out_length /* OUT */);
- #endif
-
-
- /*
+@@ -274,12 +274,12 @@
* GPOS
*/
@@ -5922,8 +3682,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
Xhb_ot_layout_lookup_position (hb_font_t *font,
unsigned int lookup_index,
const hb_ot_layout_glyph_sequence_t *sequence,
- hb_glyph_position_t *positions /* IN / OUT */);
- #endif
+@@ -288,7 +288,7 @@
/* Optical 'size' feature info. Returns true if found.
* http://www.microsoft.com/typography/otspec/features_pt.htm#size */
@@ -5932,43 +3691,27 @@ diff --git a/gfx/harfbuzz/src/hb-ot-layout.h b/gfx/harfbuzz/src/hb-ot-layout.h
hb_ot_layout_get_size_params (hb_face_t *face,
unsigned int *design_size, /* OUT. May be NULL */
unsigned int *subfamily_id, /* OUT. May be NULL */
- unsigned int *subfamily_name_id, /* OUT. May be NULL */
- unsigned int *range_start, /* OUT. May be NULL */
- unsigned int *range_end /* OUT. May be NULL */);
-
-
-diff --git a/gfx/harfbuzz/src/hb-ot-map-private.hh b/gfx/harfbuzz/src/hb-ot-map-private.hh
---- a/gfx/harfbuzz/src/hb-ot-map-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-map-private.hh
-@@ -198,17 +198,18 @@ struct hb_ot_map_builder_t
- hb_tag_t tag;
- unsigned int seq; /* sequence#, used for stable sorting only */
- unsigned int max_value;
- hb_ot_map_feature_flags_t flags;
- unsigned int default_value; /* for non-global features, what should the unset glyphs take */
- unsigned int stage[2]; /* GSUB/GPOS */
-
- static int cmp (const feature_info_t *a, const feature_info_t *b)
-- { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) : (a->seq < b->seq ? -1 : 1); }
-+ { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) :
-+ (a->seq < b->seq ? -1 : a->seq > b->seq ? 1 : 0); }
- };
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-layout-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-layout-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-layout-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -517,11 +517,9 @@
+ }
- struct stage_info_t {
- unsigned int index;
- hb_ot_map_t::pause_func_t pause_func;
- };
+ static inline void
+-_hb_glyph_info_clear_substituted_and_ligated_and_multiplied (hb_glyph_info_t *info)
++_hb_glyph_info_clear_substituted (hb_glyph_info_t *info)
+ {
+- info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED |
+- HB_OT_LAYOUT_GLYPH_PROPS_LIGATED |
+- HB_OT_LAYOUT_GLYPH_PROPS_MULTIPLIED);
++ info->glyph_props() &= ~(HB_OT_LAYOUT_GLYPH_PROPS_SUBSTITUTED);
+ }
- HB_INTERNAL void add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func);
-diff --git a/gfx/harfbuzz/src/hb-ot-map.cc b/gfx/harfbuzz/src/hb-ot-map.cc
---- a/gfx/harfbuzz/src/hb-ot-map.cc
-+++ b/gfx/harfbuzz/src/hb-ot-map.cc
-@@ -84,17 +84,17 @@ hb_ot_map_builder_t::hb_ot_map_builder_t
- hb_tag_t script_tags[3] = {HB_TAG_NONE, HB_TAG_NONE, HB_TAG_NONE};
- hb_tag_t language_tag;
- hb_ot_tags_from_script (props.script, &script_tags[0], &script_tags[1]);
- language_tag = hb_ot_tag_from_language (props.language);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-map.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-map.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-map.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-map.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -89,7 +89,7 @@
for (unsigned int table_index = 0; table_index < 2; table_index++) {
hb_tag_t table_tag = table_tags[table_index];
@@ -5977,130 +3720,96 @@ diff --git a/gfx/harfbuzz/src/hb-ot-map.cc b/gfx/harfbuzz/src/hb-ot-map.cc
hb_ot_layout_script_find_language (face, table_tag, script_index[table_index], language_tag, &language_index[table_index]);
}
}
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-map-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-map-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-map-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-map-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -203,7 +203,8 @@
+ unsigned int stage[2]; /* GSUB/GPOS */
+
+ static int cmp (const feature_info_t *a, const feature_info_t *b)
+- { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) : (a->seq < b->seq ? -1 : 1); }
++ { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) :
++ (a->seq < b->seq ? -1 : a->seq > b->seq ? 1 : 0); }
+ };
- void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value,
- hb_ot_map_feature_flags_t flags)
+ struct stage_info_t {
+Only in mozilla-1228540/gfx/harfbuzz/src: hb-ot-os2-table.hh
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -662,6 +662,7 @@
+ {
+ for (unsigned int i = 0; i < count; i++)
+ pos[i].x_advance = c->font->get_glyph_h_advance (info[i].codepoint);
++ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
+ if (c->font->has_glyph_h_origin_func ())
+ for (unsigned int i = 0; i < count; i++)
+ c->font->subtract_glyph_h_origin (info[i].codepoint,
+@@ -671,12 +672,12 @@
+ else
+ {
+ for (unsigned int i = 0; i < count; i++)
++ {
+ pos[i].y_advance = c->font->get_glyph_v_advance (info[i].codepoint);
+- if (c->font->has_glyph_v_origin_func ())
+- for (unsigned int i = 0; i < count; i++)
+- c->font->subtract_glyph_v_origin (info[i].codepoint,
+- &pos[i].x_offset,
+- &pos[i].y_offset);
++ c->font->subtract_glyph_v_origin (info[i].codepoint,
++ &pos[i].x_offset,
++ &pos[i].y_offset);
++ }
+ }
+ if (c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK)
+ _hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer);
+@@ -687,7 +688,7 @@
{
- feature_info_t *info = feature_infos.push();
-diff --git a/gfx/harfbuzz/src/hb-ot-os2-table.hh b/gfx/harfbuzz/src/hb-ot-os2-table.hh
-new file mode 100644
---- /dev/null
-+++ b/gfx/harfbuzz/src/hb-ot-os2-table.hh
-@@ -0,0 +1,105 @@
-+/*
-+ * Copyright © 2011,2012 Google, Inc.
-+ *
-+ * This is part of HarfBuzz, a text shaping library.
-+ *
-+ * Permission is hereby granted, without written agreement and without
-+ * license or royalty fees, to use, copy, modify, and distribute this
-+ * software and its documentation for any purpose, provided that the
-+ * above copyright notice and the following two paragraphs appear in
-+ * all copies of this software.
-+ *
-+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
-+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
-+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ * DAMAGE.
-+ *
-+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
-+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-+ * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
-+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
-+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ bool ret = false;
+ unsigned int count = c->buffer->len;
+- bool has_positioning = hb_ot_layout_has_positioning (c->face);
++ bool has_positioning = (bool) hb_ot_layout_has_positioning (c->face);
+ /* If the font has no GPOS, AND, no fallback positioning will
+ * happen, AND, direction is forward, then when zeroing mark
+ * widths, we shift the mark with it, such that the mark
+@@ -726,6 +727,7 @@
+
+ /* Change glyph origin to what GPOS expects (horizontal), apply GPOS, change it back. */
+
++ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
+ if (c->font->has_glyph_h_origin_func ())
+ for (unsigned int i = 0; i < count; i++)
+ c->font->add_glyph_h_origin (info[i].codepoint,
+@@ -734,6 +736,7 @@
+
+ c->plan->position (c->font, c->buffer);
+
++ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
+ if (c->font->has_glyph_h_origin_func ())
+ for (unsigned int i = 0; i < count; i++)
+ c->font->subtract_glyph_h_origin (info[i].codepoint,
+@@ -852,6 +855,8 @@
+
+
+ /**
++ * hb_ot_shape_plan_collect_lookups:
+ *
-+ * Google Author(s): Behdad Esfahbod
-+ */
-+
-+#ifndef HB_OT_OS2_TABLE_HH
-+#define HB_OT_OS2_TABLE_HH
-+
-+#include "hb-open-type-private.hh"
-+
-+
-+namespace OT {
-+
-+/*
-+ * OS/2 and Windows Metrics
-+ * http://www.microsoft.com/typography/otspec/os2.htm
-+ */
-+
-+#define HB_OT_TAG_os2 HB_TAG('O','S','/','2')
-+
-+struct os2
-+{
-+ static const hb_tag_t tableTag = HB_OT_TAG_os2;
-+
-+ inline bool sanitize (hb_sanitize_context_t *c) const
-+ {
-+ TRACE_SANITIZE (this);
-+ return_trace (c->check_struct (this));
-+ }
-+
-+ public:
-+ USHORT version;
-+
-+ /* Version 0 */
-+ SHORT xAvgCharWidth;
-+ USHORT usWeightClass;
-+ USHORT usWidthClass;
-+ USHORT fsType;
-+ SHORT ySubscriptXSize;
-+ SHORT ySubscriptYSize;
-+ SHORT ySubscriptXOffset;
-+ SHORT ySubscriptYOffset;
-+ SHORT ySuperscriptXSize;
-+ SHORT ySuperscriptYSize;
-+ SHORT ySuperscriptXOffset;
-+ SHORT ySuperscriptYOffset;
-+ SHORT yStrikeoutSize;
-+ SHORT yStrikeoutPosition;
-+ SHORT sFamilyClass;
-+ BYTE panose[10];
-+ ULONG ulUnicodeRange[4];
-+ Tag achVendID;
-+ USHORT fsSelection;
-+ USHORT usFirstCharIndex;
-+ USHORT usLastCharIndex;
-+ SHORT sTypoAscender;
-+ SHORT sTypoDescender;
-+ SHORT sTypoLineGap;
-+ USHORT usWinAscent;
-+ USHORT usWinDescent;
-+
-+ /* Version 1 */
-+ //ULONG ulCodePageRange1;
-+ //ULONG ulCodePageRange2;
-+
-+ /* Version 2 */
-+ //SHORT sxHeight;
-+ //SHORT sCapHeight;
-+ //USHORT usDefaultChar;
-+ //USHORT usBreakChar;
-+ //USHORT usMaxContext;
-+
-+ /* Version 5 */
-+ //USHORT usLowerOpticalPointSize;
-+ //USHORT usUpperOpticalPointSize;
-+
-+ public:
-+ DEFINE_SIZE_STATIC (78);
-+};
-+
-+} /* namespace OT */
-+
-+
-+#endif /* HB_OT_OS2_TABLE_HH */
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
-@@ -218,26 +218,26 @@ collect_features_arabic (hb_ot_shape_pla
- map->add_gsub_pause (NULL);
- }
+ * Since: 0.9.7
+ **/
+ void
+@@ -885,6 +890,8 @@
+
- map->add_feature (HB_TAG('r','l','i','g'), 1, F_GLOBAL|F_HAS_FALLBACK);
- if (plan->props.script == HB_SCRIPT_ARABIC)
+ /**
++ * hb_ot_shape_glyphs_closure:
++ *
+ * Since: 0.9.2
+ **/
+ void
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -223,7 +223,6 @@
map->add_gsub_pause (arabic_fallback_shape);
map->add_global_bool_feature (HB_TAG('c','a','l','t'));
@@ -6108,9 +3817,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
/* The spec includes 'cswh'. Earlier versions of Windows
* used to enable this by default, but testing suggests
- * that Windows 8 and later do not enable it by default,
- * and spec now says 'Off by default'.
- * We disabled this in ae23c24c32.
+@@ -233,6 +232,7 @@
* Note that IranNastaliq uses this feature extensively
* to fixup broken glyph sequences. Oh well...
* Test case: U+0643,U+0640,U+0631. */
@@ -6118,17 +3825,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
//map->add_global_bool_feature (HB_TAG('c','s','w','h'));
map->add_global_bool_feature (HB_TAG('m','s','e','t'));
}
-
- #include "hb-ot-shape-complex-arabic-fallback.hh"
-
- struct arabic_shape_plan_t
- {
-@@ -458,20 +458,16 @@ apply_stch (const hb_ot_shape_plan_t *pl
- * stretch / position the stretched pieces to the left / preceding glyphs. */
-
- /* We do a two pass implementation:
- * First pass calculates the exact number of extra glyphs we need,
- * We then enlarge buffer to have that much room,
+@@ -463,10 +463,6 @@
* Second pass applies the stretch, copying things to the end of buffer.
*/
@@ -6139,17 +3836,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
int sign = font->x_scale < 0 ? -1 : +1;
unsigned int extra_glyphs_needed = 0; // Set during MEASURE, used during CUT
typedef enum { MEASURE, CUT } step_t;
-
- for (step_t step = MEASURE; step <= CUT; step = (step_t) (step + 1))
- {
- unsigned int count = buffer->len;
- hb_glyph_info_t *info = buffer->info;
-@@ -499,28 +495,25 @@ apply_stch (const hb_ot_shape_plan_t *pl
- int n_fixed = 0;
- int n_repeating = 0;
-
- unsigned int end = i;
- while (i &&
+@@ -504,18 +500,15 @@
hb_in_range<unsigned> (info[i - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING))
{
i--;
@@ -6171,17 +3858,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
n_repeating++;
}
}
- unsigned int start = i;
- unsigned int context = i;
- while (context &&
- !hb_in_range<unsigned> (info[context - 1].arabic_shaping_action(), STCH_FIXED, STCH_REPEATING) &&
- (_hb_glyph_info_is_default_ignorable (&info[context - 1]) ||
-@@ -535,44 +528,54 @@ apply_stch (const hb_ot_shape_plan_t *pl
- step == MEASURE ? "measuring" : "cutting", context, start, end);
- DEBUG_MSG (ARABIC, NULL, "rest of word: count=%d width %d", start - context, w_total);
- DEBUG_MSG (ARABIC, NULL, "fixed tiles: count=%d width=%d", n_fixed, w_fixed);
- DEBUG_MSG (ARABIC, NULL, "repeating tiles: count=%d width=%d", n_repeating, w_repeating);
-
+@@ -540,9 +533,20 @@
/* Number of additional times to repeat each repeating tile. */
int n_copies = 0;
@@ -6204,8 +3881,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
if (step == MEASURE)
{
- extra_glyphs_needed += n_copies * n_repeating;
- DEBUG_MSG (ARABIC, NULL, "will add extra %d copies of repeating tiles", n_copies);
+@@ -551,13 +555,10 @@
}
else
{
@@ -6221,9 +3897,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
unsigned int repeat = 1;
if (info[k - 1].arabic_shaping_action() == STCH_REPEATING)
- repeat += n_copies;
-
- DEBUG_MSG (ARABIC, NULL, "appending %d copies of glyph %d; j=%d",
+@@ -567,7 +568,9 @@
repeat, info[k - 1].codepoint, j);
for (unsigned int n = 0; n < repeat; n++)
{
@@ -6234,20 +3908,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-arabic.cc b/gfx/harfbuzz/src/h
pos[k - 1].x_offset = x_offset;
/* Append copy. */
--j;
- info[j] = info[k - 1];
- pos[j] = pos[k - 1];
- }
- }
- }
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc
-@@ -35,11 +35,11 @@ const hb_ot_complex_shaper_t _hb_ot_comp
- NULL, /* data_create */
- NULL, /* data_destroy */
- NULL, /* preprocess_text */
- NULL, /* postprocess_glyphs */
- HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT,
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -40,6 +40,6 @@
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
@@ -6255,15 +3919,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-default.cc b/gfx/harfbuzz/src/
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
true, /* fallback_position */
};
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc
-@@ -63,17 +63,17 @@ compose_hebrew (const hb_ot_shape_normal
- 0x0000u, /* FINAL TSADI */
- 0xFB46u, /* TSADI */
- 0xFB47u, /* QOF */
- 0xFB48u, /* RESH */
- 0xFB49u, /* SHIN */
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc 2016-07-09 23:52:22.093096381 +0200
+@@ -68,7 +68,7 @@
0xFB4Au /* TAV */
};
@@ -6272,20 +3931,118 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-hebrew.cc b/gfx/harfbuzz/src/h
if (!found && !c->plan->has_mark)
{
- /* Special-case Hebrew presentation forms that are excluded from
- * standard normalization, but wanted for old fonts. */
- switch (b) {
- case 0x05B4u: /* HIRIQ */
- if (a == 0x05D9u) { /* YOD */
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
-@@ -104,37 +104,41 @@ enum indic_position_t {
- };
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -176,24 +176,8 @@
+ * Re-assign category
+ */
- /* Categories used in IndicSyllabicCategory.txt from UCD. */
- enum indic_syllabic_category_t {
- INDIC_SYLLABIC_CATEGORY_OTHER = OT_X,
+-
+- /* The spec says U+0952 is OT_A. However, testing shows that Uniscribe
+- * treats a whole bunch of characters similarly.
+- * TESTS: For example, for U+0951:
+- * U+092E,U+0947,U+0952
+- * U+092E,U+0952,U+0947
+- * U+092E,U+0947,U+0951
+- * U+092E,U+0951,U+0947
+- * U+092E,U+0951,U+0952
+- * U+092E,U+0952,U+0951
+- */
+- if (unlikely (hb_in_ranges (u, 0x0951u, 0x0952u,
+- 0x1CD0u, 0x1CD2u,
+- 0x1CD4u, 0x1CE1u) ||
+- u == 0x1CF4u))
+- cat = OT_A;
+ /* The following act more like the Bindus. */
+- else if (unlikely (hb_in_range (u, 0x0953u, 0x0954u)))
++ if (unlikely (hb_in_range (u, 0x0953u, 0x0954u)))
+ cat = OT_SM;
+ /* The following act like consonants. */
+ else if (unlikely (hb_in_ranges (u, 0x0A72u, 0x0A73u,
+@@ -216,15 +200,12 @@
+ cat = OT_Symbol;
+ ASSERT_STATIC ((int) INDIC_SYLLABIC_CATEGORY_AVAGRAHA == OT_Symbol);
+ }
+- else if (unlikely (hb_in_range (u, 0x17CDu, 0x17D1u) ||
+- u == 0x17CBu || u == 0x17D3u || u == 0x17DDu)) /* Khmer Various signs */
++ else if (unlikely (u == 0x17DDu)) /* https://github.com/roozbehp/unicode-data/issues/2 */
+ {
+- /* These are like Top Matras. */
+ cat = OT_M;
+ pos = POS_ABOVE_C;
+ }
+ else if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */
+- else if (unlikely (u == 0x17D2u)) cat = OT_Coeng; /* Khmer coeng */
+ else if (unlikely (hb_in_range (u, 0x2010u, 0x2011u)))
+ cat = OT_PLACEHOLDER;
+ else if (unlikely (u == 0x25CCu)) cat = OT_DOTTEDCIRCLE;
+@@ -557,8 +538,15 @@
+ indic_plan->virama_glyph = (hb_codepoint_t) -1;
+
+ /* Use zero-context would_substitute() matching for new-spec of the main
+- * Indic scripts, and scripts with one spec only, but not for old-specs. */
+- bool zero_context = !indic_plan->is_old_spec;
++ * Indic scripts, and scripts with one spec only, but not for old-specs.
++ * The new-spec for all dual-spec scripts says zero-context matching happens.
++ *
++ * However, testing with Malayalam shows that old and new spec both allow
++ * context. Testing with Bengali new-spec however shows that it doesn't.
++ * So, the heuristic here is the way it is. It should *only* be changed,
++ * as we discover more cases of what Windows does. DON'T TOUCH OTHERWISE.
++ */
++ bool zero_context = !indic_plan->is_old_spec && plan->props.script != HB_SCRIPT_MALAYALAM;
+ indic_plan->rphf.init (&plan->map, HB_TAG('r','p','h','f'), zero_context);
+ indic_plan->pref.init (&plan->map, HB_TAG('p','r','e','f'), zero_context);
+ indic_plan->blwf.init (&plan->map, HB_TAG('b','l','w','f'), zero_context);
+@@ -1348,6 +1336,25 @@
+ break;
+ }
+ }
++ /* For Malayalam, skip over unformed below- (but NOT post-) forms. */
++ if (buffer->props.script == HB_SCRIPT_MALAYALAM)
++ {
++ for (unsigned int i = base + 1; i < end; i++)
++ {
++ while (i < end && is_joiner (info[i]))
++ i++;
++ if (i == end || !is_halant_or_coeng (info[i]))
++ break;
++ i++; /* Skip halant. */
++ while (i < end && is_joiner (info[i]))
++ i++;
++ if (i < end && is_consonant (info[i]) && info[i].indic_position() == POS_BELOW_C)
++ {
++ base = i;
++ info[base].indic_position() = POS_BASE_C;
++ }
++ }
++ }
+
+ if (start < base && info[base].indic_position() > POS_BASE_C)
+ base--;
+@@ -1806,7 +1813,7 @@
+ }
+ }
+
+- return c->unicode->decompose (ab, a, b);
++ return (bool) c->unicode->decompose (ab, a, b);
+ }
+
+ static bool
+@@ -1822,7 +1829,7 @@
+ /* Composition-exclusion exceptions that we want to recompose. */
+ if (a == 0x09AFu && b == 0x09BCu) { *ab = 0x09DFu; return true; }
+
+- return c->unicode->compose (a, b, ab);
++ return (bool) c->unicode->compose (a, b, ab);
+ }
+
+
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh 2016-07-09 23:52:22.093096381 +0200
+@@ -109,27 +109,31 @@
INDIC_SYLLABIC_CATEGORY_AVAGRAHA = OT_Symbol,
INDIC_SYLLABIC_CATEGORY_BINDU = OT_SM,
@@ -6321,17 +4078,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh b/gfx/harfbuz
INDIC_SYLLABIC_CATEGORY_TONE_LETTER = OT_X,
INDIC_SYLLABIC_CATEGORY_TONE_MARK = OT_N,
INDIC_SYLLABIC_CATEGORY_VIRAMA = OT_H,
- INDIC_SYLLABIC_CATEGORY_VISARGA = OT_SM,
- INDIC_SYLLABIC_CATEGORY_VOWEL = OT_V,
- INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT = OT_M,
- INDIC_SYLLABIC_CATEGORY_VOWEL_INDEPENDENT = OT_V
- };
-@@ -157,24 +161,30 @@ enum indic_matra_category_t {
- INDIC_MATRA_CATEGORY_TOP_AND_LEFT_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT,
- INDIC_MATRA_CATEGORY_TOP_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT,
-
- INDIC_MATRA_CATEGORY_OVERSTRUCK = POS_AFTER_MAIN,
- INDIC_MATRA_CATEGORY_VISUAL_ORDER_LEFT = POS_PRE_M
+@@ -162,17 +166,23 @@
};
#define INDIC_COMBINE_CATEGORIES(S,M) \
@@ -6366,17 +4113,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-private.hh b/gfx/harfbuz
HB_INTERNAL INDIC_TABLE_ELEMENT_TYPE
hb_indic_get_categories (hb_codepoint_t u);
-
- #endif /* HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH */
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
-@@ -1,315 +1,323 @@
- /* == Start of generated table == */
- /*
- * The following table is generated by running:
- *
- * ./gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -6,63 +6,67 @@
*
* on files with these headers:
*
@@ -6469,16 +4209,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
#define _(S,M) INDIC_COMBINE_CATEGORIES (ISC_##S, IMC_##M)
-
- static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {
-
-
- #define indic_offset_0x0028u 0
-
-
- /* Basic Latin */
-
- /* 0028 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(CP,x), _(x,x), _(x,x),
+@@ -79,29 +83,33 @@
/* 0030 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 0038 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -6517,8 +4248,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0958 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 0960 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 0968 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 0970 */ _(x,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 0978 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -110,14 +118,14 @@
/* Bengali */
@@ -6535,11 +4265,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 09C0 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(x,x), _(x,x), _(M,L),
/* 09C8 */ _(M,L), _(x,x), _(x,x), _(M,LR), _(M,LR), _(V,B), _(CD,x), _(x,x),
/* 09D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R),
- /* 09D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x),
- /* 09E0 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
- /* 09E8 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 09F0 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 09F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -129,33 +137,33 @@
/* Gurmukhi */
@@ -6578,7 +4304,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0AC0 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(M,T), _(x,x), _(M,T),
/* 0AC8 */ _(M,T), _(M,TR), _(x,x), _(M,R), _(M,R), _(V,B), _(x,x), _(x,x),
/* 0AD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0AD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -163,18 +171,18 @@
/* 0AE0 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 0AE8 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 0AF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -6600,11 +4326,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0B40 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(x,x), _(x,x), _(M,L),
/* 0B48 */ _(M,TL), _(x,x), _(x,x), _(M,LR),_(M,TLR), _(V,B), _(x,x), _(x,x),
/* 0B50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), _(M,TR),
- /* 0B58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x),
- /* 0B60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
- /* 0B68 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 0B70 */ _(x,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0B78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -186,7 +194,7 @@
/* Tamil */
@@ -6613,7 +4335,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0B88 */ _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(x,x), _(VI,x), _(VI,x),
/* 0B90 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(x,x), _(x,x),
/* 0B98 */ _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(C,x), _(C,x),
- /* 0BA0 */ _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x),
+@@ -194,7 +202,7 @@
/* 0BA8 */ _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x),
/* 0BB0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 0BB8 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), _(M,R),
@@ -6622,10 +4344,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0BC8 */ _(M,L), _(x,x), _(M,LR), _(M,LR), _(M,LR), _(V,T), _(x,x), _(x,x),
/* 0BD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R),
/* 0BD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0BE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
- /* 0BE8 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 0BF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0BF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -205,7 +213,7 @@
/* Telugu */
@@ -6634,10 +4353,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0C08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x),
/* 0C10 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x),
/* 0C18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0C20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0C28 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0C30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0C38 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(A,x), _(M,T), _(M,T),
+@@ -216,7 +224,7 @@
/* 0C40 */ _(M,T), _(M,R), _(M,R), _(M,R), _(M,R), _(x,x), _(M,T), _(M,T),
/* 0C48 */ _(M,TB), _(x,x), _(M,T), _(M,T), _(M,T), _(V,T), _(x,x), _(x,x),
/* 0C50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), _(M,B), _(x,x),
@@ -6646,7 +4362,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0C60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 0C68 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 0C70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0C78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -224,26 +232,26 @@
/* Kannada */
@@ -6677,10 +4393,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0D08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x),
/* 0D10 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x),
/* 0D18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0D20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0D28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0D30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0D38 */ _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(A,x), _(M,R), _(M,R),
+@@ -254,7 +262,7 @@
/* 0D40 */ _(M,R), _(M,R), _(M,R), _(M,B), _(M,B), _(x,x), _(M,L), _(M,L),
/* 0D48 */ _(M,L), _(x,x), _(M,LR), _(M,LR), _(M,LR), _(V,T),_(CPR,x), _(x,x),
/* 0D50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R),
@@ -6689,7 +4402,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0D60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 0D68 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 0D70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 0D78 */ _(x,x), _(x,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x),
+@@ -262,7 +270,7 @@
/* Sinhala */
@@ -6698,15 +4411,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 0D88 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
/* 0D90 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x),
/* 0D98 */ _(x,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0DA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0DA8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0DB0 */ _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 0DB8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(x,x),
- /* 0DC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x),
- /* 0DC8 */ _(x,x), _(x,x), _(V,T), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R),
- /* 0DD0 */ _(M,R), _(M,R), _(M,T), _(M,T), _(M,B), _(x,x), _(M,B), _(x,x),
- /* 0DD8 */ _(M,R), _(M,L), _(M,TL), _(M,L), _(M,LR),_(M,TLR), _(M,LR), _(M,R),
- /* 0DE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
+@@ -278,7 +286,7 @@
/* 0DE8 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 0DF0 */ _(x,x), _(x,x), _(M,R), _(M,R), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -6715,10 +4420,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Myanmar */
-
- /* 1000 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1008 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1010 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -289,22 +297,22 @@
/* 1018 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1020 */ _(C,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
/* 1028 */ _(VI,x), _(VI,x), _(VI,x), _(M,R), _(M,R), _(M,T), _(M,T), _(M,B),
@@ -6750,17 +4452,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Tagalog */
-
- /* 1700 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1708 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x),
- /* 1710 */ _(C,x), _(C,x), _(M,T), _(M,B), _(PK,B), _(x,x), _(x,x), _(x,x),
- /* 1718 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-@@ -340,36 +348,36 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* 1780 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1788 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1790 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1798 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 17A0 */ _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
+@@ -345,14 +353,14 @@
/* 17A8 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
/* 17B0 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(M,R), _(M,T),
/* 17B8 */ _(M,T), _(M,T), _(M,T), _(M,B), _(M,B), _(M,B), _(M,TL),_(M,TLR),
@@ -6780,9 +4472,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Limbu */
-
- /* 1900 */ _(CP,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1908 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -362,9 +370,9 @@
/* 1910 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1918 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x),
/* 1920 */ _(M,T), _(M,T), _(M,B), _(M,R), _(M,R), _(M,TR), _(M,TR), _(M,T),
@@ -6795,17 +4485,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 1940 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(Nd,x), _(Nd,x),
/* 1948 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* Tai Le */
-
- /* 1950 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1958 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1960 */ _(C,x), _(C,x), _(C,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x),
-@@ -380,20 +388,20 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* New Tai Lue */
-
- /* 1980 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1988 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1990 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -385,10 +393,10 @@
/* 1998 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 19A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 19A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -6819,17 +4499,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 19D0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 19D8 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* 19E0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 19E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 19F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 19F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
- /* Buginese */
-@@ -406,110 +414,120 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* Tai Tham */
-
- /* 1A20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1A28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 1A30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -411,47 +419,47 @@
/* 1A38 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1A40 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1A48 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x),
@@ -6889,9 +4559,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 1BB0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 1BB8 */ _(Nd,x), _(Nd,x), _(A,x), _(C,x), _(C,x), _(C,x), _(CF,x), _(CF,x),
- /* Batak */
-
- /* 1BC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -461,9 +469,9 @@
/* 1BC8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1BD0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1BD8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -6903,8 +4571,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 1BF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* Lepcha */
-
- /* 1C00 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -472,39 +480,49 @@
/* 1C08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1C10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 1C18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -6967,17 +4634,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A810 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* A818 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* A820 */ _(C,x), _(C,x), _(C,x), _(M,R), _(M,R), _(M,B), _(M,T), _(M,R),
- /* A828 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A830 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A838 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
- /* Phags-pa */
-@@ -520,158 +538,158 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* A858 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(Vo,x), _(Vo,x),
- /* A860 */ _(Vo,x), _(Vo,x), _(C,x), _(C,x), _(C,x), _(C,x), _(Vo,x), _(CS,x),
- /* A868 */ _(CS,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* A870 */ _(C,x), _(CS,x), _(C,x), _(Bi,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A878 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -525,13 +543,13 @@
/* Saurashtra */
@@ -6993,8 +4650,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A8B8 */ _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R),
/* A8C0 */ _(M,R), _(M,R), _(M,R), _(M,R), _(V,B), _(x,x), _(x,x), _(x,x),
/* A8C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A8D0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* A8D8 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -540,9 +558,9 @@
/* Devanagari Extended */
@@ -7007,9 +4663,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A8F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* Kayah Li */
-
- /* A900 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* A908 */ _(Nd,x), _(Nd,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -552,15 +570,15 @@
/* A910 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* A918 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* A920 */ _(C,x), _(C,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x),
@@ -7028,8 +4682,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A958 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* A960 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* A968 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A970 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* A978 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -569,14 +587,14 @@
/* Javanese */
@@ -7047,7 +4700,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A9C0 */ _(V,BR), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* A9C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* A9D0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* A9D8 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+@@ -584,7 +602,7 @@
/* Myanmar Extended-B */
@@ -7056,12 +4709,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* A9E8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* A9F0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* A9F8 */ _(Nd,x), _(Nd,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x),
-
- /* Cham */
-
- /* AA00 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x),
- /* AA08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* AA10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -597,10 +615,10 @@
/* AA18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AA20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AA28 */ _(C,x), _(M,T), _(M,T), _(M,T), _(M,T), _(M,B), _(M,T), _(M,L),
@@ -7075,8 +4723,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* AA50 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* AA58 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* Myanmar Extended-A */
-
+@@ -609,7 +627,7 @@
/* AA60 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AA68 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AA70 */ _(x,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -7085,10 +4732,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Tai Viet */
- /* AA80 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* AA88 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* AA90 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* AA98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -620,8 +638,8 @@
/* AAA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AAA8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AAB0 */ _(M,T), _(M,R), _(M,T), _(M,T), _(M,B),_(M,VOL),_(M,VOL), _(M,T),
@@ -7099,8 +4743,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* AAC8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* AAD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* AAD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
- /* Meetei Mayek Extensions */
+@@ -630,9 +648,9 @@
/* AAE0 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* AAE8 */ _(C,x), _(C,x), _(C,x), _(M,L), _(M,B), _(M,T), _(M,L), _(M,R),
@@ -7112,9 +4755,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Meetei Mayek */
-
- /* ABC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* ABC8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x),
+@@ -642,31 +660,31 @@
/* ABD0 */ _(C,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* ABD8 */ _(C,x), _(C,x), _(C,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x),
/* ABE0 */ _(CF,x), _(CF,x), _(CF,x), _(M,R), _(M,R), _(M,T), _(M,R), _(M,R),
@@ -7152,17 +4793,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 11008 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
/* 11010 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11018 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11020 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11028 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11030 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11038 */ _(M,T), _(M,T), _(M,T), _(M,T), _(M,B), _(M,B), _(M,B), _(M,B),
- /* 11040 */ _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), _(M,T), _(V,T), _(x,x),
-@@ -680,62 +698,62 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* 11058 */_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),
- /* 11060 */_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x),_(BJN,x), _(Nd,x), _(Nd,x),
- /* 11068 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 11070 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11078 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(NJ,x),
+@@ -685,21 +703,21 @@
/* Kaithi */
@@ -7188,16 +4819,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 11108 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11110 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11118 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11120 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(M,T),
- /* 11128 */ _(M,T), _(M,T), _(M,B), _(M,B), _(M,L), _(M,T), _(M,TB), _(M,TB),
- /* 11130 */ _(M,T), _(M,B), _(M,B), _(IS,x), _(PK,T), _(x,x), _(Nd,x), _(Nd,x),
- /* 11138 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 11140 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11148 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
- /* Mahajani */
-
- /* 11150 */ _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(C,x), _(C,x), _(C,x),
+@@ -716,12 +734,12 @@
/* 11158 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11160 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11168 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -7212,7 +4834,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 11188 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
/* 11190 */ _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11198 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 111A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -729,8 +747,8 @@
/* 111A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 111B0 */ _(C,x), _(C,x), _(C,x), _(M,R), _(M,L), _(M,R), _(M,B), _(M,B),
/* 111B8 */ _(M,B), _(M,B), _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), _(M,TR),
@@ -7223,17 +4845,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 111D0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 111D8 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* Sinhala Archaic Numbers */
-
- /* 111E0 */ _(x,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 111E8 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
- /* 111F0 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x),
-@@ -744,163 +762,193 @@ static const INDIC_TABLE_ELEMENT_TYPE in
- /* Khojki */
-
- /* 11200 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 11208 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11210 */ _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -749,11 +767,20 @@
/* 11218 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11220 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11228 */ _(C,x), _(C,x), _(C,x), _(C,x), _(M,R), _(M,R), _(M,R), _(M,B),
@@ -7256,7 +4868,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Khudawadi */
/* 112B0 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 112B8 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -761,15 +788,15 @@
/* 112C0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 112C8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 112D0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -7275,11 +4887,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 11308 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(VI,x),
/* 11310 */ _(VI,x), _(x,x), _(x,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x),
/* 11318 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11320 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11328 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11330 */ _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x),
- /* 11338 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(A,x), _(M,R), _(M,R),
- /* 11340 */ _(M,T), _(M,R), _(M,R), _(M,R), _(M,R), _(x,x), _(x,x), _(M,L),
+@@ -781,11 +808,11 @@
/* 11348 */ _(M,L), _(x,x), _(x,x), _(M,LR), _(M,LR), _(V,R), _(x,x), _(x,x),
/* 11350 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R),
/* 11358 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
@@ -7295,11 +4903,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Tirhuta */
-
- /* 11480 */ _(x,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 11488 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x),
- /* 11490 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11498 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -797,13 +824,13 @@
/* 114A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 114A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 114B0 */ _(M,R), _(M,L), _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(M,B),
@@ -7316,11 +4920,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Siddham */
-
- /* 11580 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 11588 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x),
- /* 11590 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11598 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -815,11 +842,15 @@
/* 115A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 115A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(M,R),
/* 115B0 */ _(M,L), _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(x,x), _(x,x),
@@ -7341,10 +4941,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* Modi */
- /* 11600 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 11608 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x),
- /* 11610 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
- /* 11618 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -830,8 +861,8 @@
/* 11620 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11628 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11630 */ _(M,R), _(M,R), _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(M,B),
@@ -7355,15 +4952,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
/* 11648 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
/* 11650 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
/* 11658 */ _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11660 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11668 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11670 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
- /* 11678 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
- /* Takri */
-
- /* 11680 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x),
- /* 11688 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
+@@ -847,13 +878,30 @@
/* 11690 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 11698 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
/* 116A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -7380,8 +4969,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
+ /* 116E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+ /* 116F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
+ /* 116F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x),
-
--}; /* Table items: 4488; occupancy: 73% */
++
+ /* Ahom */
+
+ /* 11700 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x),
@@ -7392,13 +4980,13 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
+ /* 11728 */ _(M,B), _(M,T), _(M,T), _(PK,T), _(x,x), _(x,x), _(x,x), _(x,x),
+ /* 11730 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x),
+ /* 11738 */ _(Nd,x), _(Nd,x), _(Nd,x), _(Nd,x), _(x,x), _(x,x), _(x,x), _(x,x),
-+
+
+-}; /* Table items: 4488; occupancy: 73% */
+}; /* Table items: 4768; occupancy: 72% */
INDIC_TABLE_ELEMENT_TYPE
hb_indic_get_categories (hb_codepoint_t u)
- {
- switch (u >> 12)
+@@ -862,7 +910,7 @@
{
case 0x0u:
if (hb_in_range (u, 0x0028u, 0x003Fu)) return indic_table[u - 0x0028u + indic_offset_0x0028u];
@@ -7407,9 +4995,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
if (hb_in_range (u, 0x0900u, 0x0DF7u)) return indic_table[u - 0x0900u + indic_offset_0x0900u];
if (unlikely (u == 0x00A0u)) return _(CP,x);
break;
-
- case 0x1u:
- if (hb_in_range (u, 0x1000u, 0x109Fu)) return indic_table[u - 0x1000u + indic_offset_0x1000u];
+@@ -872,11 +920,12 @@
if (hb_in_range (u, 0x1700u, 0x17EFu)) return indic_table[u - 0x1700u + indic_offset_0x1700u];
if (hb_in_range (u, 0x1900u, 0x1A9Fu)) return indic_table[u - 0x1900u + indic_offset_0x1900u];
if (hb_in_range (u, 0x1B00u, 0x1C4Fu)) return indic_table[u - 0x1B00u + indic_offset_0x1b00u];
@@ -7423,15 +5009,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
if (unlikely (u == 0x25CCu)) return _(CP,x);
break;
- case 0xAu:
- if (hb_in_range (u, 0xA800u, 0xAAF7u)) return indic_table[u - 0xA800u + indic_offset_0xa800u];
- if (hb_in_range (u, 0xABC0u, 0xABFFu)) return indic_table[u - 0xABC0u + indic_offset_0xabc0u];
- break;
-
- case 0x10u:
- if (hb_in_range (u, 0x10A00u, 0x10A47u)) return indic_table[u - 0x10A00u + indic_offset_0x10a00u];
- break;
-
+@@ -892,10 +941,9 @@
case 0x11u:
if (hb_in_range (u, 0x11000u, 0x110BFu)) return indic_table[u - 0x11000u + indic_offset_0x11000u];
if (hb_in_range (u, 0x11100u, 0x11237u)) return indic_table[u - 0x11100u + indic_offset_0x11100u];
@@ -7444,17 +5022,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
break;
default:
- break;
- }
- return _(x,x);
- }
-
-@@ -909,32 +957,36 @@ hb_indic_get_categories (hb_codepoint_t
- #undef ISC_A
- #undef ISC_Bi
- #undef ISC_BJN
- #undef ISC_Ca
- #undef ISC_C
+@@ -914,11 +962,14 @@
#undef ISC_CD
#undef ISC_CF
#undef ISC_CHL
@@ -7469,11 +5037,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
#undef ISC_GM
#undef ISC_IS
#undef ISC_ZWJ
- #undef ISC_ML
- #undef ISC_ZWNJ
- #undef ISC_N
- #undef ISC_Nd
- #undef ISC_NJ
+@@ -930,6 +981,7 @@
#undef ISC_x
#undef ISC_PK
#undef ISC_RS
@@ -7481,186 +5045,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic-table.cc b/gfx/harfbuzz/
#undef ISC_TL
#undef ISC_TM
#undef ISC_V
- #undef ISC_Vs
- #undef ISC_Vo
- #undef ISC_M
- #undef ISC_VI
-
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-indic.cc
-@@ -171,34 +171,18 @@ set_indic_properties (hb_glyph_info_t &i
- indic_category_t cat = (indic_category_t) (type & 0x7Fu);
- indic_position_t pos = (indic_position_t) (type >> 8);
-
-
- /*
- * Re-assign category
- */
-
--
-- /* The spec says U+0952 is OT_A. However, testing shows that Uniscribe
-- * treats a whole bunch of characters similarly.
-- * TESTS: For example, for U+0951:
-- * U+092E,U+0947,U+0952
-- * U+092E,U+0952,U+0947
-- * U+092E,U+0947,U+0951
-- * U+092E,U+0951,U+0947
-- * U+092E,U+0951,U+0952
-- * U+092E,U+0952,U+0951
-- */
-- if (unlikely (hb_in_ranges (u, 0x0951u, 0x0952u,
-- 0x1CD0u, 0x1CD2u,
-- 0x1CD4u, 0x1CE1u) ||
-- u == 0x1CF4u))
-- cat = OT_A;
- /* The following act more like the Bindus. */
-- else if (unlikely (hb_in_range (u, 0x0953u, 0x0954u)))
-+ if (unlikely (hb_in_range (u, 0x0953u, 0x0954u)))
- cat = OT_SM;
- /* The following act like consonants. */
- else if (unlikely (hb_in_ranges (u, 0x0A72u, 0x0A73u,
- 0x1CF5u, 0x1CF6u)))
- cat = OT_C;
- /* TODO: The following should only be allowed after a Visarga.
- * For now, just treat them like regular tone marks. */
- else if (unlikely (hb_in_range (u, 0x1CE2u, 0x1CE8u)))
-@@ -211,25 +195,22 @@ set_indic_properties (hb_glyph_info_t &i
- /* The following take marks in standalone clusters, similar to Avagraha. */
- else if (unlikely (hb_in_ranges (u, 0xA8F2u, 0xA8F7u,
- 0x1CE9u, 0x1CECu,
- 0x1CEEu, 0x1CF1u)))
- {
- cat = OT_Symbol;
- ASSERT_STATIC ((int) INDIC_SYLLABIC_CATEGORY_AVAGRAHA == OT_Symbol);
- }
-- else if (unlikely (hb_in_range (u, 0x17CDu, 0x17D1u) ||
-- u == 0x17CBu || u == 0x17D3u || u == 0x17DDu)) /* Khmer Various signs */
-+ else if (unlikely (u == 0x17DDu)) /* https://github.com/roozbehp/unicode-data/issues/2 */
- {
-- /* These are like Top Matras. */
- cat = OT_M;
- pos = POS_ABOVE_C;
- }
- else if (unlikely (u == 0x17C6u)) cat = OT_N; /* Khmer Bindu doesn't like to be repositioned. */
-- else if (unlikely (u == 0x17D2u)) cat = OT_Coeng; /* Khmer coeng */
- else if (unlikely (hb_in_range (u, 0x2010u, 0x2011u)))
- cat = OT_PLACEHOLDER;
- else if (unlikely (u == 0x25CCu)) cat = OT_DOTTEDCIRCLE;
- else if (unlikely (u == 0xA982u)) cat = OT_SM; /* Javanese repha. */
- else if (unlikely (u == 0xA9BEu)) cat = OT_CM2; /* Javanese medial ya. */
- else if (unlikely (u == 0xA9BDu)) { cat = OT_M; pos = POS_POST_C; } /* Javanese vocalic r. */
-
-
-@@ -552,18 +533,25 @@ data_create_indic (const hb_ot_shape_pla
- indic_plan->config = &indic_configs[i];
- break;
- }
-
- indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.chosen_script[0] & 0x000000FFu) != '2');
- indic_plan->virama_glyph = (hb_codepoint_t) -1;
-
- /* Use zero-context would_substitute() matching for new-spec of the main
-- * Indic scripts, and scripts with one spec only, but not for old-specs. */
-- bool zero_context = !indic_plan->is_old_spec;
-+ * Indic scripts, and scripts with one spec only, but not for old-specs.
-+ * The new-spec for all dual-spec scripts says zero-context matching happens.
-+ *
-+ * However, testing with Malayalam shows that old and new spec both allow
-+ * context. Testing with Bengali new-spec however shows that it doesn't.
-+ * So, the heuristic here is the way it is. It should *only* be changed,
-+ * as we discover more cases of what Windows does. DON'T TOUCH OTHERWISE.
-+ */
-+ bool zero_context = !indic_plan->is_old_spec && plan->props.script != HB_SCRIPT_MALAYALAM;
- indic_plan->rphf.init (&plan->map, HB_TAG('r','p','h','f'), zero_context);
- indic_plan->pref.init (&plan->map, HB_TAG('p','r','e','f'), zero_context);
- indic_plan->blwf.init (&plan->map, HB_TAG('b','l','w','f'), zero_context);
- indic_plan->pstf.init (&plan->map, HB_TAG('p','s','t','f'), zero_context);
-
- for (unsigned int i = 0; i < ARRAY_LENGTH (indic_plan->mask_array); i++)
- indic_plan->mask_array[i] = (indic_features[i].flags & F_GLOBAL) ?
- 0 : plan->map.get_1_mask (indic_features[i].tag);
-@@ -1343,16 +1331,35 @@ final_reordering_syllable (const hb_ot_s
- base++;
- info[base].indic_position() = POS_BASE_C;
-
- try_pref = false;
- }
- break;
- }
- }
-+ /* For Malayalam, skip over unformed below- (but NOT post-) forms. */
-+ if (buffer->props.script == HB_SCRIPT_MALAYALAM)
-+ {
-+ for (unsigned int i = base + 1; i < end; i++)
-+ {
-+ while (i < end && is_joiner (info[i]))
-+ i++;
-+ if (i == end || !is_halant_or_coeng (info[i]))
-+ break;
-+ i++; /* Skip halant. */
-+ while (i < end && is_joiner (info[i]))
-+ i++;
-+ if (i < end && is_consonant (info[i]) && info[i].indic_position() == POS_BELOW_C)
-+ {
-+ base = i;
-+ info[base].indic_position() = POS_BASE_C;
-+ }
-+ }
-+ }
-
- if (start < base && info[base].indic_position() > POS_BASE_C)
- base--;
- break;
- }
- if (base == end && start < base &&
- is_one_of (info[base - 1], FLAG (OT_ZWJ)))
- base--;
-@@ -1801,33 +1808,33 @@ decompose_indic (const hb_ot_shape_norma
- {
- /* Ok, safe to use Uniscribe-style decomposition. */
- *a = 0x0DD9u;
- *b = ab;
- return true;
- }
- }
-
-- return c->unicode->decompose (ab, a, b);
-+ return (bool) c->unicode->decompose (ab, a, b);
- }
-
- static bool
- compose_indic (const hb_ot_shape_normalize_context_t *c,
- hb_codepoint_t a,
- hb_codepoint_t b,
- hb_codepoint_t *ab)
- {
- /* Avoid recomposing split matras. */
- if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (c->unicode->general_category (a)))
- return false;
-
- /* Composition-exclusion exceptions that we want to recompose. */
- if (a == 0x09AFu && b == 0x09BCu) { *ab = 0x09DFu; return true; }
-
-- return c->unicode->compose (a, b, ab);
-+ return (bool) c->unicode->compose (a, b, ab);
- }
-
-
- const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic =
- {
- "indic",
- collect_features_indic,
- override_features_indic,
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
-@@ -194,16 +194,20 @@ set_myanmar_properties (hb_glyph_info_t
- case 0x1004u: case 0x101Bu: case 0x105Au:
- cat = (indic_category_t) OT_Ra;
- break;
-
- case 0x1032u: case 0x1036u:
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -199,6 +199,10 @@
cat = (indic_category_t) OT_A;
break;
@@ -7671,20 +5059,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-myanmar.cc b/gfx/harfbuzz/src/
case 0x103Au:
cat = (indic_category_t) OT_As;
break;
-
- case 0x1041u: case 0x1042u: case 0x1043u: case 0x1044u:
- case 0x1045u: case 0x1046u: case 0x1047u: case 0x1048u:
- case 0x1049u: case 0x1090u: case 0x1091u: case 0x1092u:
- case 0x1093u: case 0x1094u: case 0x1095u: case 0x1096u:
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh b/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
-@@ -39,19 +39,17 @@
- #define complex_var_u8_1() var2.u8[3]
-
-
- enum hb_ot_shape_zero_width_marks_type_t {
- HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE,
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh 2016-07-09 23:52:22.096429701 +0200
+@@ -44,9 +44,7 @@
// HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_EARLY,
HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF_EARLY,
@@ -7695,20 +5073,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-private.hh b/gfx/harfbuzz/src/
};
- /* Master OT shaper list */
- #define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \
- HB_COMPLEX_SHAPER_IMPLEMENT (default) /* should be first */ \
- HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \
- HB_COMPLEX_SHAPER_IMPLEMENT (hangul) \
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc
-@@ -372,11 +372,11 @@ const hb_ot_complex_shaper_t _hb_ot_comp
- NULL, /* data_create */
- NULL, /* data_destroy */
- preprocess_text_thai,
- NULL, /* postprocess_glyphs */
- HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT,
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -377,6 +377,6 @@
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
@@ -7716,15 +5084,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-thai.cc b/gfx/harfbuzz/src/hb-
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
false,/* fallback_position */
};
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc
-@@ -52,11 +52,11 @@ const hb_ot_complex_shaper_t _hb_ot_comp
- NULL, /* data_create */
- NULL, /* data_destroy */
- NULL, /* preprocess_text */
- NULL, /* postprocess_glyphs */
- HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT,
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -57,6 +57,6 @@
NULL, /* decompose */
NULL, /* compose */
NULL, /* setup_masks */
@@ -7732,15 +5095,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-tibetan.cc b/gfx/harfbuzz/src/
+ HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE_LATE,
true, /* fallback_position */
};
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc
-@@ -280,16 +280,19 @@ setup_rphf_mask (const hb_ot_shape_plan_
- info[i].mask |= mask;
- }
- }
-
- static void
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -285,6 +285,9 @@
setup_topographical_masks (const hb_ot_shape_plan_t *plan,
hb_buffer_t *buffer)
{
@@ -7750,17 +5108,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
ASSERT_STATIC (INIT < 4 && ISOL < 4 && MEDI < 4 && FINA < 4);
hb_mask_t masks[4], all_masks = 0;
- for (unsigned int i = 0; i < 4; i++)
- {
- masks[i] = plan->map.get_1_mask (arabic_features[i]);
- if (masks[i] == plan->map.get_global_mask ())
- masks[i] = 0;
-@@ -355,17 +358,17 @@ setup_syllables (const hb_ot_shape_plan_
- static void
- clear_substitution_flags (const hb_ot_shape_plan_t *plan,
- hb_font_t *font HB_UNUSED,
- hb_buffer_t *buffer)
- {
+@@ -360,7 +363,7 @@
hb_glyph_info_t *info = buffer->info;
unsigned int count = buffer->len;
for (unsigned int i = 0; i < count; i++)
@@ -7769,17 +5117,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
}
static void
- record_rphf (const hb_ot_shape_plan_t *plan,
- hb_font_t *font,
- hb_buffer_t *buffer)
- {
- const use_shape_plan_t *use_plan = (const use_shape_plan_t *) plan->data;
-@@ -400,66 +403,71 @@ record_pref (const hb_ot_shape_plan_t *p
- if (_hb_glyph_info_substituted (&info[i]))
- {
- info[i].use_category() = USE_VPre;
- break;
- }
+@@ -405,6 +408,12 @@
}
}
@@ -7792,15 +5130,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
static void
reorder_syllable (hb_buffer_t *buffer, unsigned int start, unsigned int end)
{
- syllable_type_t syllable_type = (syllable_type_t) (buffer->info[start].syllable() & 0x0F);
- /* Only a few syllable types need reordering. */
- if (unlikely (!(FLAG_SAFE (syllable_type) &
- (FLAG (virama_terminated_cluster) |
- FLAG (consonant_cluster) |
- FLAG (vowel_cluster) |
- FLAG (broken_cluster) |
- 0))))
- return;
+@@ -420,7 +429,6 @@
hb_glyph_info_t *info = buffer->info;
@@ -7808,7 +5138,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
#define BASE_FLAGS (FLAG (USE_B) | FLAG (USE_GB) | FLAG (USE_IV))
/* Move things forward. */
- if (info[start].use_category() == USE_R && end - start > 1)
+@@ -428,12 +436,12 @@
{
/* Got a repha. Reorder it to after first base, before first halant. */
for (unsigned int i = start + 1; i < end; i++)
@@ -7823,16 +5153,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
i--;
buffer->merge_clusters (start, i + 1);
- hb_glyph_info_t t = info[start];
- memmove (&info[start], &info[start + 1], (i - start) * sizeof (info[0]));
- info[i] = t;
-
- break;
- }
- }
-
- /* Move things back. */
- unsigned int j = end;
+@@ -450,11 +458,11 @@
for (unsigned int i = start; i < end; i++)
{
uint32_t flag = FLAG_UNSAFE (info[i].use_category());
@@ -7847,17 +5168,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
j = i + 1;
else
j = i;
- }
- else if (((flag) & (FLAG (USE_VPre) | FLAG (USE_VMPre))) &&
- /* Only move the first component of a MultipleSubst. */
- 0 == _hb_glyph_info_get_lig_comp (&info[i]) &&
- j < i)
-@@ -553,17 +561,17 @@ compose_use (const hb_ot_shape_normalize
- hb_codepoint_t a,
- hb_codepoint_t b,
- hb_codepoint_t *ab)
- {
- /* Avoid recomposing split matras. */
+@@ -558,7 +566,7 @@
if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (c->unicode->general_category (a)))
return false;
@@ -7866,20 +5177,30 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-complex-use.cc b/gfx/harfbuzz/src/hb-o
}
- const hb_ot_complex_shaper_t _hb_ot_complex_shaper_use =
- {
- "use",
- collect_features_use,
- NULL, /* override_features */
-diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc b/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
---- a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
-@@ -71,26 +71,26 @@
- */
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape.h mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape.h
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape.h 2016-07-09 23:52:22.096429701 +0200
+@@ -36,14 +36,14 @@
+ HB_BEGIN_DECLS
- static bool
- decompose_unicode (const hb_ot_shape_normalize_context_t *c,
- hb_codepoint_t ab,
+ /* TODO port to shape-plan / set. */
+-void
++HB_EXTERN void
+ hb_ot_shape_glyphs_closure (hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ hb_set_t *glyphs);
+
+-void
++HB_EXTERN void
+ hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
+ hb_tag_t table_tag,
+ hb_set_t *lookup_indexes /* OUT */);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-shape-normalize.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-normalize.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-shape-normalize.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-shape-normalize.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -76,7 +76,7 @@
hb_codepoint_t *a,
hb_codepoint_t *b)
{
@@ -7888,8 +5209,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc b/gfx/harfbuzz/src/hb-ot-
}
static bool
- compose_unicode (const hb_ot_shape_normalize_context_t *c,
- hb_codepoint_t a,
+@@ -85,7 +85,7 @@
hb_codepoint_t b,
hb_codepoint_t *ab)
{
@@ -7898,17 +5218,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc b/gfx/harfbuzz/src/hb-ot-
}
static inline void
- set_glyph (hb_glyph_info_t &info, hb_font_t *font)
- {
- font->get_glyph (info.codepoint, 0, &info.glyph_index());
- }
-
-@@ -122,17 +122,17 @@ decompose (const hb_ot_shape_normalize_c
- hb_codepoint_t a, b, a_glyph, b_glyph;
- hb_buffer_t * const buffer = c->buffer;
- hb_font_t * const font = c->font;
-
- if (!c->decompose (c, ab, &a, &b) ||
+@@ -127,7 +127,7 @@
(b && !font->get_glyph (b, 0, &b_glyph)))
return 0;
@@ -7917,167 +5227,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-shape-normalize.cc b/gfx/harfbuzz/src/hb-ot-
if (shortest && has_a) {
/* Output a and b */
output_char (buffer, a, a_glyph);
- if (likely (b)) {
- output_char (buffer, b, b_glyph);
- return 2;
- }
- return 1;
-diff --git a/gfx/harfbuzz/src/hb-ot-shape.cc b/gfx/harfbuzz/src/hb-ot-shape.cc
---- a/gfx/harfbuzz/src/hb-ot-shape.cc
-+++ b/gfx/harfbuzz/src/hb-ot-shape.cc
-@@ -657,42 +657,43 @@ hb_ot_position_default (hb_ot_shape_cont
- unsigned int count = c->buffer->len;
- hb_glyph_info_t *info = c->buffer->info;
- hb_glyph_position_t *pos = c->buffer->pos;
-
- if (HB_DIRECTION_IS_HORIZONTAL (direction))
- {
- for (unsigned int i = 0; i < count; i++)
- pos[i].x_advance = c->font->get_glyph_h_advance (info[i].codepoint);
-+ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
- if (c->font->has_glyph_h_origin_func ())
- for (unsigned int i = 0; i < count; i++)
- c->font->subtract_glyph_h_origin (info[i].codepoint,
- &pos[i].x_offset,
- &pos[i].y_offset);
- }
- else
- {
- for (unsigned int i = 0; i < count; i++)
-+ {
- pos[i].y_advance = c->font->get_glyph_v_advance (info[i].codepoint);
-- if (c->font->has_glyph_v_origin_func ())
-- for (unsigned int i = 0; i < count; i++)
-- c->font->subtract_glyph_v_origin (info[i].codepoint,
-- &pos[i].x_offset,
-- &pos[i].y_offset);
-+ c->font->subtract_glyph_v_origin (info[i].codepoint,
-+ &pos[i].x_offset,
-+ &pos[i].y_offset);
-+ }
- }
- if (c->buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_SPACE_FALLBACK)
- _hb_ot_shape_fallback_spaces (c->plan, c->font, c->buffer);
- }
-
- static inline bool
- hb_ot_position_complex (hb_ot_shape_context_t *c)
- {
- bool ret = false;
- unsigned int count = c->buffer->len;
-- bool has_positioning = hb_ot_layout_has_positioning (c->face);
-+ bool has_positioning = (bool) hb_ot_layout_has_positioning (c->face);
- /* If the font has no GPOS, AND, no fallback positioning will
- * happen, AND, direction is forward, then when zeroing mark
- * widths, we shift the mark with it, such that the mark
- * is positioned hanging over the previous glyph. When
- * direction is backward we don't shift and it will end up
- * hanging over the next glyph after the final reordering.
- * If fallback positinoing happens or GPOS is present, we don't
- * care.
-@@ -721,24 +722,26 @@ hb_ot_position_complex (hb_ot_shape_cont
-
- if (has_positioning)
- {
- hb_glyph_info_t *info = c->buffer->info;
- hb_glyph_position_t *pos = c->buffer->pos;
-
- /* Change glyph origin to what GPOS expects (horizontal), apply GPOS, change it back. */
-
-+ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
- if (c->font->has_glyph_h_origin_func ())
- for (unsigned int i = 0; i < count; i++)
- c->font->add_glyph_h_origin (info[i].codepoint,
- &pos[i].x_offset,
- &pos[i].y_offset);
-
- c->plan->position (c->font, c->buffer);
-
-+ /* The nil glyph_h_origin() func returns 0, so no need to apply it. */
- if (c->font->has_glyph_h_origin_func ())
- for (unsigned int i = 0; i < count; i++)
- c->font->subtract_glyph_h_origin (info[i].codepoint,
- &pos[i].x_offset,
- &pos[i].y_offset);
-
- ret = true;
- }
-@@ -847,16 +850,18 @@ hb_bool_t
- hb_ot_shape_context_t c = {HB_SHAPER_DATA_GET (shape_plan), font, font->face, buffer, features, num_features};
- hb_ot_shape_internal (&c);
-
- return true;
- }
-
-
- /**
-+ * hb_ot_shape_plan_collect_lookups:
-+ *
- * Since: 0.9.7
- **/
- void
- hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
- hb_tag_t table_tag,
- hb_set_t *lookup_indexes /* OUT */)
- {
- /* XXX Does the first part always succeed? */
-@@ -880,16 +885,18 @@ add_char (hb_font_t *font,
- hb_codepoint_t m = unicode->mirroring (u);
- if (m != u && font->get_glyph (m, 0, &glyph))
- glyphs->add (glyph);
- }
- }
-
-
- /**
-+ * hb_ot_shape_glyphs_closure:
-+ *
- * Since: 0.9.2
- **/
- void
- hb_ot_shape_glyphs_closure (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- hb_set_t *glyphs)
-diff --git a/gfx/harfbuzz/src/hb-ot-shape.h b/gfx/harfbuzz/src/hb-ot-shape.h
---- a/gfx/harfbuzz/src/hb-ot-shape.h
-+++ b/gfx/harfbuzz/src/hb-ot-shape.h
-@@ -31,23 +31,23 @@
- #ifndef HB_OT_SHAPE_H
- #define HB_OT_SHAPE_H
-
- #include "hb.h"
-
- HB_BEGIN_DECLS
-
- /* TODO port to shape-plan / set. */
--void
-+HB_EXTERN void
- hb_ot_shape_glyphs_closure (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- hb_set_t *glyphs);
-
--void
-+HB_EXTERN void
- hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
- hb_tag_t table_tag,
- hb_set_t *lookup_indexes /* OUT */);
-
- HB_END_DECLS
-
- #endif /* HB_OT_SHAPE_H */
-diff --git a/gfx/harfbuzz/src/hb-ot-tag.cc b/gfx/harfbuzz/src/hb-ot-tag.cc
---- a/gfx/harfbuzz/src/hb-ot-tag.cc
-+++ b/gfx/harfbuzz/src/hb-ot-tag.cc
-@@ -350,17 +350,16 @@ static const LangTag ot_languages[] = {
- {"guz", HB_TAG('G','U','Z',' ')}, /* Ekegusii/Gusii */
- {"gv", HB_TAG('M','N','X',' ')}, /* Manx */
- {"ha", HB_TAG('H','A','U',' ')}, /* Hausa */
- {"har", HB_TAG('H','R','I',' ')}, /* Harari */
- {"haw", HB_TAG('H','A','W',' ')}, /* Hawaiian */
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-tag.cc mozilla-1228540/gfx/harfbuzz/src/hb-ot-tag.cc
+--- mozilla/gfx/harfbuzz/src/hb-ot-tag.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-tag.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -355,7 +355,6 @@
{"hay", HB_TAG('H','A','Y',' ')}, /* Haya */
{"haz", HB_TAG('H','A','Z',' ')}, /* Hazaragi */
{"he", HB_TAG('I','W','R',' ')}, /* Hebrew */
@@ -8085,48 +5238,27 @@ diff --git a/gfx/harfbuzz/src/hb-ot-tag.cc b/gfx/harfbuzz/src/hb-ot-tag.cc
{"hi", HB_TAG('H','I','N',' ')}, /* Hindi */
{"hil", HB_TAG('H','I','L',' ')}, /* Hiligaynon */
{"hnd", HB_TAG('H','N','D',' ')}, /* [Southern] Hindko */
- {"hne", HB_TAG('C','H','H',' ')}, /* Chattisgarhi */
- {"hno", HB_TAG('H','N','D',' ')}, /* [Northern] Hindko */
- {"ho", HB_TAG('H','M','O',' ')}, /* Hiri Motu */
- {"hoc", HB_TAG('H','O',' ',' ')}, /* Ho */
- {"hoj", HB_TAG('H','A','R',' ')}, /* Harauti */
-@@ -596,18 +595,18 @@ static const LangTag ot_languages[] = {
- {"rue", HB_TAG('R','S','Y',' ')}, /* Rusyn */
- {"rup", HB_TAG('R','U','P',' ')}, /* Aromanian/Arumanian/Macedo-Romanian */
- {"rw", HB_TAG('R','U','A',' ')}, /* Kinyarwanda */
- {"rwr", HB_TAG('M','A','W',' ')}, /* Marwari (India) */
- {"sa", HB_TAG('S','A','N',' ')}, /* Sanskrit */
+@@ -601,8 +600,8 @@
{"sah", HB_TAG('Y','A','K',' ')}, /* Yakut */
{"sas", HB_TAG('S','A','S',' ')}, /* Sasak */
{"sat", HB_TAG('S','A','T',' ')}, /* Santali */
-+ {"sc", HB_TAG('S','R','D',' ')}, /* Sardinian [macrolanguage] */
- {"sck", HB_TAG('S','A','D',' ')}, /* Sadri */
-- {"sc", HB_TAG('S','R','D',' ')}, /* Sardinian [macrolanguage] */
+- {"sck", HB_TAG('S','A','D',' ')}, /* Sadri */
+ {"sc", HB_TAG('S','R','D',' ')}, /* Sardinian [macrolanguage] */
++ {"sck", HB_TAG('S','A','D',' ')}, /* Sadri */
{"scn", HB_TAG('S','C','N',' ')}, /* Sicilian */
{"sco", HB_TAG('S','C','O',' ')}, /* Scots */
{"scs", HB_TAG('S','L','A',' ')}, /* [North] Slavey */
- {"sd", HB_TAG('S','N','D',' ')}, /* Sindhi */
- {"se", HB_TAG('N','S','M',' ')}, /* Northern Sami */
- {"seh", HB_TAG('S','N','A',' ')}, /* Sena */
- {"sel", HB_TAG('S','E','L',' ')}, /* Selkup */
- {"sg", HB_TAG('S','G','O',' ')}, /* Sango */
-@@ -685,29 +684,29 @@ static const LangTag ot_languages[] = {
- {"umb", HB_TAG('U','M','B',' ')}, /* Umbundu */
- {"unr", HB_TAG('M','U','N',' ')}, /* Mundari */
- {"ur", HB_TAG('U','R','D',' ')}, /* Urdu */
- {"uz", HB_TAG('U','Z','B',' ')}, /* Uzbek [macrolanguage] */
- {"uzn", HB_TAG('U','Z','B',' ')}, /* Northern Uzbek */
+@@ -690,8 +689,8 @@
{"uzs", HB_TAG('U','Z','B',' ')}, /* Southern Uzbek */
{"ve", HB_TAG('V','E','N',' ')}, /* Venda */
{"vec", HB_TAG('V','E','C',' ')}, /* Venetian */
-+ {"vi", HB_TAG('V','I','T',' ')}, /* Vietnamese */
- {"vls", HB_TAG('F','L','E',' ')}, /* Vlaams */
-- {"vi", HB_TAG('V','I','T',' ')}, /* Vietnamese */
+- {"vls", HB_TAG('F','L','E',' ')}, /* Vlaams */
+ {"vi", HB_TAG('V','I','T',' ')}, /* Vietnamese */
++ {"vls", HB_TAG('F','L','E',' ')}, /* Vlaams */
{"vmw", HB_TAG('M','A','K',' ')}, /* Makhuwa */
{"vo", HB_TAG('V','O','L',' ')}, /* Volapük */
{"vro", HB_TAG('V','R','O',' ')}, /* Võro */
- {"wa", HB_TAG('W','L','N',' ')}, /* Walloon */
- {"war", HB_TAG('W','A','R',' ')}, /* Waray (Philippines) */
+@@ -700,9 +699,9 @@
{"wbm", HB_TAG('W','A',' ',' ')}, /* Wa */
{"wbr", HB_TAG('W','A','G',' ')}, /* Wagdi */
{"wle", HB_TAG('S','I','G',' ')}, /* Wolane */
@@ -8137,17 +5269,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-tag.cc b/gfx/harfbuzz/src/hb-ot-tag.cc
{"xal", HB_TAG('K','L','M',' ')}, /* Kalmyk */
{"xh", HB_TAG('X','H','S',' ')}, /* Xhosa */
{"xog", HB_TAG('X','O','G',' ')}, /* Soga */
- {"xom", HB_TAG('K','M','O',' ')}, /* Komo (Sudan) */
- {"xsl", HB_TAG('S','S','L',' ')}, /* South Slavey */
- {"xst", HB_TAG('S','I','G',' ')}, /* Silt'e (retired code) */
- {"xwo", HB_TAG('T','O','D',' ')}, /* Written Oirat (Todo) */
- {"yao", HB_TAG('Y','A','O',' ')}, /* Yao */
-@@ -923,9 +922,32 @@ hb_ot_tag_to_language (hb_tag_t tag)
- buf[9] = tag & 0xFF;
- if (buf[9] == 0x20)
- buf[9] = '\0';
- buf[10] = '\0';
- return hb_language_from_string ((char *) buf, -1);
+@@ -928,4 +927,27 @@
}
}
@@ -8165,7 +5287,7 @@ diff --git a/gfx/harfbuzz/src/hb-ot-tag.cc b/gfx/harfbuzz/src/hb-ot-tag.cc
+ }
+ }
+}
-
++
+#ifdef MAIN
+int
+main (void)
@@ -8173,17 +5295,12 @@ diff --git a/gfx/harfbuzz/src/hb-ot-tag.cc b/gfx/harfbuzz/src/hb-ot-tag.cc
+ test_langs_sorted ();
+ return 0;
+}
-+
-+#endif
-diff --git a/gfx/harfbuzz/src/hb-ot-tag.h b/gfx/harfbuzz/src/hb-ot-tag.h
---- a/gfx/harfbuzz/src/hb-ot-tag.h
-+++ b/gfx/harfbuzz/src/hb-ot-tag.h
-@@ -34,26 +34,26 @@
- #include "hb.h"
-
- HB_BEGIN_DECLS
-
++#endif
+diff -u -r mozilla/gfx/harfbuzz/src/hb-ot-tag.h mozilla-1228540/gfx/harfbuzz/src/hb-ot-tag.h
+--- mozilla/gfx/harfbuzz/src/hb-ot-tag.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-ot-tag.h 2016-07-09 23:52:22.096429701 +0200
+@@ -39,18 +39,18 @@
#define HB_OT_TAG_DEFAULT_SCRIPT HB_TAG ('D', 'F', 'L', 'T')
#define HB_OT_TAG_DEFAULT_LANGUAGE HB_TAG ('d', 'f', 'l', 't')
@@ -8206,18 +5323,10 @@ diff --git a/gfx/harfbuzz/src/hb-ot-tag.h b/gfx/harfbuzz/src/hb-ot-tag.h
hb_ot_tag_to_language (hb_tag_t tag);
- HB_END_DECLS
-
- #endif /* HB_OT_TAG_H */
-diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh
---- a/gfx/harfbuzz/src/hb-private.hh
-+++ b/gfx/harfbuzz/src/hb-private.hh
-@@ -48,19 +48,16 @@
- /* We only use these two for debug output. However, the debug code is
- * always seen by the compiler (and optimized out in non-debug builds.
- * If including these becomes a problem, we can start thinking about
- * someway around that. */
- #include <stdio.h>
+diff -u -r mozilla/gfx/harfbuzz/src/hb-private.hh mozilla-1228540/gfx/harfbuzz/src/hb-private.hh
+--- mozilla/gfx/harfbuzz/src/hb-private.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-private.hh 2016-07-09 23:52:22.096429701 +0200
+@@ -53,9 +53,6 @@
#include <errno.h>
#include <stdarg.h>
@@ -8227,17 +5336,7 @@ diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh
/* Compile-time custom allocator support. */
- #if defined(hb_malloc_impl) \
- && defined(hb_calloc_impl) \
- && defined(hb_realloc_impl) \
- && defined(hb_free_impl)
- extern "C" void* hb_malloc_impl(size_t size);
-@@ -177,16 +174,19 @@ extern "C" void hb_free_impl(void *ptr)
- # define setlocale(Category, Locale) "C"
- static int errno = 0; /* Use something better? */
- # endif
- # elif defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_PC_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
- # define getenv(Name) NULL
+@@ -182,6 +179,9 @@
# endif
# if defined(_MSC_VER) && _MSC_VER < 1900
# define snprintf _snprintf
@@ -8247,17 +5346,7 @@ diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh
# endif
#endif
- #if HAVE_ATEXIT
- /* atexit() is only safe to be called from shared libraries on certain
- * platforms. Whitelist.
- * https://bugs.freedesktop.org/show_bug.cgi?id=82246 */
- # if defined(__linux) && defined(__GLIBC_PREREQ)
-@@ -894,37 +894,32 @@ hb_in_ranges (T u, T lo1, T hi1, T lo2,
- }
-
-
- /* Enable bitwise ops on enums marked as flags_t */
- /* To my surprise, looks like the function resolver is happy to silently cast
+@@ -899,27 +899,22 @@
* one enum to another... So this doesn't provide the type-checking that I
* originally had in mind... :(.
*
@@ -8296,33 +5385,10 @@ diff --git a/gfx/harfbuzz/src/hb-private.hh b/gfx/harfbuzz/src/hb-private.hh
/* Useful for set-operations on small enums.
- * For example, for testing "x ∈ {x1, x2, x3}" use:
- * (FLAG_SAFE(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3)))
- */
- #define FLAG(x) (ASSERT_STATIC_EXPR_ZERO ((x) < 32) + (1U << (x)))
- #define FLAG_SAFE(x) (1U << (x))
-@@ -1005,10 +1000,12 @@ static inline hb_options_t
- hb_options (void)
- {
- if (unlikely (!_hb_options.i))
- _hb_options_init ();
-
- return _hb_options.opts;
- }
-
-+/* Size signifying variable-sized array */
-+#define VAR 1
-
- #endif /* HB_PRIVATE_HH */
-diff --git a/gfx/harfbuzz/src/hb-set.h b/gfx/harfbuzz/src/hb-set.h
---- a/gfx/harfbuzz/src/hb-set.h
-+++ b/gfx/harfbuzz/src/hb-set.h
-@@ -39,119 +39,119 @@ HB_BEGIN_DECLS
- /*
- * Since: 0.9.21
- */
- #define HB_SET_VALUE_INVALID ((hb_codepoint_t) -1)
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-set.h mozilla-1228540/gfx/harfbuzz/src/hb-set.h
+--- mozilla/gfx/harfbuzz/src/hb-set.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-set.h 2016-07-09 23:52:22.096429701 +0200
+@@ -44,109 +44,109 @@
typedef struct hb_set_t hb_set_t;
@@ -8458,20 +5524,71 @@ diff --git a/gfx/harfbuzz/src/hb-set.h b/gfx/harfbuzz/src/hb-set.h
hb_set_next_range (const hb_set_t *set,
hb_codepoint_t *first,
hb_codepoint_t *last);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-shape.cc mozilla-1228540/gfx/harfbuzz/src/hb-shape.cc
+--- mozilla/gfx/harfbuzz/src/hb-shape.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-shape.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -210,13 +210,15 @@
+ /**
+ * hb_feature_from_string:
+ * @str: (array length=len) (element-type uint8_t): a string to parse
+- * @len: length of @str, or -1 if string is nul-terminated
++ * @len: length of @str, or -1 if string is %NULL terminated
+ * @feature: (out): the #hb_feature_t to initialize with the parsed values
+ *
+- * Parses a string into a #hb_feature_t. If @len is -1 then @str is
+- * %NULL-terminated.
++ * Parses a string into a #hb_feature_t.
+ *
+- * Return value: %TRUE if @str is successfully parsed, %FALSE otherwise
++ * TODO: document the syntax here.
++ *
++ * Return value:
++ * %true if @str is successfully parsed, %false otherwise.
+ *
+ * Since: 0.9.5
+ **/
+diff -u -r mozilla/gfx/harfbuzz/src/hb-shape.h mozilla-1228540/gfx/harfbuzz/src/hb-shape.h
+--- mozilla/gfx/harfbuzz/src/hb-shape.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-shape.h 2016-07-09 23:52:22.096429701 +0200
+@@ -47,29 +47,29 @@
+ unsigned int end;
+ } hb_feature_t;
+-hb_bool_t
++HB_EXTERN hb_bool_t
+ hb_feature_from_string (const char *str, int len,
+ hb_feature_t *feature);
- HB_END_DECLS
+-void
++HB_EXTERN void
+ hb_feature_to_string (hb_feature_t *feature,
+ char *buf, unsigned int size);
- #endif /* HB_SET_H */
-diff --git a/gfx/harfbuzz/src/hb-shape-plan.h b/gfx/harfbuzz/src/hb-shape-plan.h
---- a/gfx/harfbuzz/src/hb-shape-plan.h
-+++ b/gfx/harfbuzz/src/hb-shape-plan.h
-@@ -33,57 +33,57 @@
- #include "hb-common.h"
- #include "hb-font.h"
+-void
++HB_EXTERN void
+ hb_shape (hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features);
- HB_BEGIN_DECLS
+-hb_bool_t
++HB_EXTERN hb_bool_t
+ hb_shape_full (hb_font_t *font,
+ hb_buffer_t *buffer,
+ const hb_feature_t *features,
+ unsigned int num_features,
+ const char * const *shaper_list);
+
+-const char **
++HB_EXTERN const char **
+ hb_shape_list_shapers (void);
+
+
+diff -u -r mozilla/gfx/harfbuzz/src/hb-shape-plan.h mozilla-1228540/gfx/harfbuzz/src/hb-shape-plan.h
+--- mozilla/gfx/harfbuzz/src/hb-shape-plan.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-shape-plan.h 2016-07-09 23:52:22.096429701 +0200
+@@ -38,49 +38,49 @@
typedef struct hb_shape_plan_t hb_shape_plan_t;
@@ -8530,97 +5647,10 @@ diff --git a/gfx/harfbuzz/src/hb-shape-plan.h b/gfx/harfbuzz/src/hb-shape-plan.h
hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan);
- HB_END_DECLS
-
- #endif /* HB_SHAPE_PLAN_H */
-diff --git a/gfx/harfbuzz/src/hb-shape.cc b/gfx/harfbuzz/src/hb-shape.cc
---- a/gfx/harfbuzz/src/hb-shape.cc
-+++ b/gfx/harfbuzz/src/hb-shape.cc
-@@ -205,23 +205,25 @@ parse_one_feature (const char **pp, cons
- parse_feature_value_postfix (pp, end, feature) &&
- parse_space (pp, end) &&
- *pp == end;
- }
-
- /**
- * hb_feature_from_string:
- * @str: (array length=len) (element-type uint8_t): a string to parse
-- * @len: length of @str, or -1 if string is nul-terminated
-+ * @len: length of @str, or -1 if string is %NULL terminated
- * @feature: (out): the #hb_feature_t to initialize with the parsed values
- *
-- * Parses a string into a #hb_feature_t. If @len is -1 then @str is
-- * %NULL-terminated.
-+ * Parses a string into a #hb_feature_t.
- *
-- * Return value: %TRUE if @str is successfully parsed, %FALSE otherwise
-+ * TODO: document the syntax here.
-+ *
-+ * Return value:
-+ * %true if @str is successfully parsed, %false otherwise.
- *
- * Since: 0.9.5
- **/
- hb_bool_t
- hb_feature_from_string (const char *str, int len,
- hb_feature_t *feature)
- {
- hb_feature_t feat;
-diff --git a/gfx/harfbuzz/src/hb-shape.h b/gfx/harfbuzz/src/hb-shape.h
---- a/gfx/harfbuzz/src/hb-shape.h
-+++ b/gfx/harfbuzz/src/hb-shape.h
-@@ -42,37 +42,37 @@ HB_BEGIN_DECLS
-
- typedef struct hb_feature_t {
- hb_tag_t tag;
- uint32_t value;
- unsigned int start;
- unsigned int end;
- } hb_feature_t;
-
--hb_bool_t
-+HB_EXTERN hb_bool_t
- hb_feature_from_string (const char *str, int len,
- hb_feature_t *feature);
-
--void
-+HB_EXTERN void
- hb_feature_to_string (hb_feature_t *feature,
- char *buf, unsigned int size);
-
-
--void
-+HB_EXTERN void
- hb_shape (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features);
-
--hb_bool_t
-+HB_EXTERN hb_bool_t
- hb_shape_full (hb_font_t *font,
- hb_buffer_t *buffer,
- const hb_feature_t *features,
- unsigned int num_features,
- const char * const *shaper_list);
-
--const char **
-+HB_EXTERN const char **
- hb_shape_list_shapers (void);
-
-
- HB_END_DECLS
-
- #endif /* HB_SHAPE_H */
-diff --git a/gfx/harfbuzz/src/hb-shaper-list.hh b/gfx/harfbuzz/src/hb-shaper-list.hh
---- a/gfx/harfbuzz/src/hb-shaper-list.hh
-+++ b/gfx/harfbuzz/src/hb-shaper-list.hh
-@@ -41,15 +41,18 @@ HB_SHAPER_IMPLEMENT (coretext_aat)
-
- #ifdef HAVE_OT
- HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */
- #endif
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-shaper-list.hh mozilla-1228540/gfx/harfbuzz/src/hb-shaper-list.hh
+--- mozilla/gfx/harfbuzz/src/hb-shaper-list.hh 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-shaper-list.hh 2016-07-09 23:52:22.096429701 +0200
+@@ -46,6 +46,9 @@
#ifdef HAVE_UNISCRIBE
HB_SHAPER_IMPLEMENT (uniscribe)
#endif
@@ -8630,19 +5660,10 @@ diff --git a/gfx/harfbuzz/src/hb-shaper-list.hh b/gfx/harfbuzz/src/hb-shaper-lis
#ifdef HAVE_CORETEXT
HB_SHAPER_IMPLEMENT (coretext)
#endif
-
- #ifdef HAVE_FALLBACK
- HB_SHAPER_IMPLEMENT (fallback) /* <--- This should be last. */
- #endif
-diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
---- a/gfx/harfbuzz/src/hb-unicode.h
-+++ b/gfx/harfbuzz/src/hb-unicode.h
-@@ -169,52 +169,52 @@ typedef enum
- */
-
- typedef struct hb_unicode_funcs_t hb_unicode_funcs_t;
-
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-unicode.h mozilla-1228540/gfx/harfbuzz/src/hb-unicode.h
+--- mozilla/gfx/harfbuzz/src/hb-unicode.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-unicode.h 2016-07-09 23:52:22.096429701 +0200
+@@ -174,23 +174,23 @@
/*
* just give me the best implementation you've got there.
*/
@@ -8672,7 +5693,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs,
hb_user_data_key_t *key,
void * data,
- hb_destroy_func_t destroy,
+@@ -198,18 +198,18 @@
hb_bool_t replace);
@@ -8695,17 +5716,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs);
- /*
- * funcs
- */
-
- /* typedefs */
-@@ -280,191 +280,207 @@ typedef unsigned int (*hb_unicode_deco
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -285,7 +285,7 @@
*
* Since: 0.9.2
**/
@@ -8714,15 +5725,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_combining_class_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_combining_class_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_eastasian_width_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -301,7 +301,7 @@
*
* Since: 0.9.2
**/
@@ -8731,15 +5734,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_eastasian_width_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_general_category_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -317,7 +317,7 @@
*
* Since: 0.9.2
**/
@@ -8748,15 +5743,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_general_category_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_general_category_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_mirroring_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -333,7 +333,7 @@
*
* Since: 0.9.2
**/
@@ -8765,15 +5752,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_mirroring_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_script_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -349,7 +349,7 @@
*
* Since: 0.9.2
**/
@@ -8782,15 +5761,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_script_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_compose_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -365,7 +365,7 @@
*
* Since: 0.9.2
**/
@@ -8799,15 +5770,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_compose_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_compose_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_decompose_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -381,7 +381,7 @@
*
* Since: 0.9.2
**/
@@ -8816,15 +5779,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_decompose_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
- /**
- * hb_unicode_funcs_set_decompose_compatibility_func:
- * @ufuncs: a Unicode function structure
- * @func: (closure user_data) (destroy destroy) (scope notified):
- * @user_data:
- * @destroy:
- *
- *
+@@ -397,7 +397,7 @@
*
* Since: 0.9.2
**/
@@ -8833,7 +5788,7 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_funcs_set_decompose_compatibility_func (hb_unicode_funcs_t *ufuncs,
hb_unicode_decompose_compatibility_func_t func,
void *user_data, hb_destroy_func_t destroy);
-
+@@ -405,62 +405,78 @@
/* accessors */
/**
@@ -8920,19 +5875,10 @@ diff --git a/gfx/harfbuzz/src/hb-unicode.h b/gfx/harfbuzz/src/hb-unicode.h
hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs,
hb_codepoint_t u,
hb_codepoint_t *decomposed);
-
- HB_END_DECLS
-
- #endif /* HB_UNICODE_H */
-diff --git a/gfx/harfbuzz/src/hb-uniscribe.cc b/gfx/harfbuzz/src/hb-uniscribe.cc
---- a/gfx/harfbuzz/src/hb-uniscribe.cc
-+++ b/gfx/harfbuzz/src/hb-uniscribe.cc
-@@ -914,17 +914,17 @@ retry:
- log_clusters + chars_offset,
- char_props + chars_offset,
- glyphs + glyphs_offset,
- glyph_props + glyphs_offset,
- (int *) &glyphs_len);
+diff -u -r mozilla/gfx/harfbuzz/src/hb-uniscribe.cc mozilla-1228540/gfx/harfbuzz/src/hb-uniscribe.cc
+--- mozilla/gfx/harfbuzz/src/hb-uniscribe.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-uniscribe.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -919,7 +919,7 @@
if (unlikely (items[i].a.fNoGlyphIndex))
FAIL ("ScriptShapeOpenType() set fNoGlyphIndex");
@@ -8941,17 +5887,7 @@ diff --git a/gfx/harfbuzz/src/hb-uniscribe.cc b/gfx/harfbuzz/src/hb-uniscribe.cc
{
if (unlikely (!buffer->ensure (buffer->allocated * 2)))
FAIL ("Buffer resize failed");
- goto retry;
- }
- if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT))
- {
- if (items[i].a.eScript == SCRIPT_UNDEFINED)
-@@ -1014,17 +1014,17 @@ retry:
- buffer->clear_positions ();
- double x_mult = font_data->x_mult, y_mult = font_data->y_mult;
- for (unsigned int i = 0; i < glyphs_len; i++)
- {
- hb_glyph_info_t *info = &buffer->info[i];
+@@ -1019,7 +1019,7 @@
hb_glyph_position_t *pos = &buffer->pos[i];
/* TODO vertical */
@@ -8960,20 +5896,10 @@ diff --git a/gfx/harfbuzz/src/hb-uniscribe.cc b/gfx/harfbuzz/src/hb-uniscribe.cc
pos->x_offset = x_mult * (backward ? -info->var1.i32 : info->var1.i32);
pos->y_offset = y_mult * info->var2.i32;
}
-
- if (backward)
- hb_buffer_reverse (buffer);
-
- /* Wow, done! */
-diff --git a/gfx/harfbuzz/src/hb-uniscribe.h b/gfx/harfbuzz/src/hb-uniscribe.h
---- a/gfx/harfbuzz/src/hb-uniscribe.h
-+++ b/gfx/harfbuzz/src/hb-uniscribe.h
-@@ -29,18 +29,18 @@
-
- #include "hb.h"
-
- #include <windows.h>
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-uniscribe.h mozilla-1228540/gfx/harfbuzz/src/hb-uniscribe.h
+--- mozilla/gfx/harfbuzz/src/hb-uniscribe.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-uniscribe.h 2016-07-09 23:52:22.096429701 +0200
+@@ -34,10 +34,10 @@
HB_BEGIN_DECLS
@@ -8986,18 +5912,10 @@ diff --git a/gfx/harfbuzz/src/hb-uniscribe.h b/gfx/harfbuzz/src/hb-uniscribe.h
hb_uniscribe_font_get_hfont (hb_font_t *font);
- HB_END_DECLS
-
- #endif /* HB_UNISCRIBE_H */
-diff --git a/gfx/harfbuzz/src/hb-version.h b/gfx/harfbuzz/src/hb-version.h
---- a/gfx/harfbuzz/src/hb-version.h
-+++ b/gfx/harfbuzz/src/hb-version.h
-@@ -33,34 +33,34 @@
-
- #include "hb-common.h"
-
- HB_BEGIN_DECLS
-
+diff -u -r mozilla/gfx/harfbuzz/src/hb-version.h mozilla-1228540/gfx/harfbuzz/src/hb-version.h
+--- mozilla/gfx/harfbuzz/src/hb-version.h 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-version.h 2016-07-09 23:52:22.096429701 +0200
+@@ -38,24 +38,24 @@
#define HB_VERSION_MAJOR 1
#define HB_VERSION_MINOR 1
@@ -9027,20 +5945,10 @@ diff --git a/gfx/harfbuzz/src/hb-version.h b/gfx/harfbuzz/src/hb-version.h
hb_version_atleast (unsigned int major,
unsigned int minor,
unsigned int micro);
-
-
- HB_END_DECLS
-
- #endif /* HB_VERSION_H */
-diff --git a/gfx/harfbuzz/src/hb-version.h.in b/gfx/harfbuzz/src/hb-version.h.in
---- a/gfx/harfbuzz/src/hb-version.h.in
-+++ b/gfx/harfbuzz/src/hb-version.h.in
-@@ -42,25 +42,25 @@ HB_BEGIN_DECLS
-
- #define HB_VERSION_STRING "@HB_VERSION@"
-
- #define HB_VERSION_ATLEAST(major,minor,micro) \
- ((major)*10000+(minor)*100+(micro) <= \
+diff -u -r mozilla/gfx/harfbuzz/src/hb-version.h.in mozilla-1228540/gfx/harfbuzz/src/hb-version.h.in
+--- mozilla/gfx/harfbuzz/src/hb-version.h.in 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/hb-version.h.in 2016-07-09 23:52:22.096429701 +0200
+@@ -47,15 +47,15 @@
HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO)
@@ -9059,44 +5967,45 @@ diff --git a/gfx/harfbuzz/src/hb-version.h.in b/gfx/harfbuzz/src/hb-version.h.in
hb_version_atleast (unsigned int major,
unsigned int minor,
unsigned int micro);
+diff -u -r mozilla/gfx/harfbuzz/src/Makefile.am mozilla-1228540/gfx/harfbuzz/src/Makefile.am
+--- mozilla/gfx/harfbuzz/src/Makefile.am 2016-06-30 16:10:42.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/Makefile.am 2016-07-09 23:52:22.089763061 +0200
+@@ -48,6 +48,7 @@
+ hb-ot-hmtx-table.hh \
+ hb-ot-maxp-table.hh \
+ hb-ot-name-table.hh \
++ hb-ot-os2-table.hh \
+ hb-ot-tag.cc \
+ hb-private.hh \
+ hb-set-private.hh \
+@@ -392,7 +393,14 @@
+ check-symbols.sh \
+ $(NULL)
-
- HB_END_DECLS
-
- #endif /* HB_VERSION_H */
-diff --git a/gfx/harfbuzz/src/hb.h b/gfx/harfbuzz/src/hb.h
---- a/gfx/harfbuzz/src/hb.h
-+++ b/gfx/harfbuzz/src/hb.h
-@@ -23,16 +23,20 @@
- *
- * Red Hat Author(s): Behdad Esfahbod
- */
-
- #ifndef HB_H
- #define HB_H
- #define HB_H_IN
-
-+#ifndef HB_EXTERN
-+#define HB_EXTERN extern
-+#endif
+-TESTS = $(dist_check_SCRIPTS)
++check_PROGRAMS = \
++ test-ot-tag \
++ $(NULL)
++test_ot_tag_SOURCES = hb-ot-tag.cc
++test_ot_tag_CPPFLAGS = $(HBCFLAGS) -DMAIN
++test_ot_tag_LDADD = libharfbuzz.la $(HBLIBS)
+
- #include "hb-blob.h"
- #include "hb-buffer.h"
- #include "hb-common.h"
- #include "hb-deprecated.h"
- #include "hb-face.h"
- #include "hb-font.h"
- #include "hb-set.h"
- #include "hb-shape.h"
-diff --git a/gfx/harfbuzz/src/sample.py b/gfx/harfbuzz/src/sample.py
---- a/gfx/harfbuzz/src/sample.py
-+++ b/gfx/harfbuzz/src/sample.py
-@@ -28,16 +28,22 @@ del blob
- font = hb.font_create (face)
- upem = hb.face_get_upem (face)
- del face
- hb.font_set_scale (font, upem, upem)
- #hb.ft_font_set_funcs (font)
++TESTS = $(dist_check_SCRIPTS) $(check_PROGRAMS)
+ TESTS_ENVIRONMENT = \
+ srcdir="$(srcdir)" \
+ MAKE="$(MAKE) $(AM_MAKEFLAGS)" \
+@@ -419,6 +427,7 @@
+ -DHB_OT_H_IN \
+ -DHB_GOBJECT_H \
+ -DHB_GOBJECT_H_IN \
++ -DHB_EXTERN= \
+ $(NULL)
+ HarfBuzz_0_0_gir_LIBS = \
+ libharfbuzz.la \
+diff -u -r mozilla/gfx/harfbuzz/src/sample.py mozilla-1228540/gfx/harfbuzz/src/sample.py
+--- mozilla/gfx/harfbuzz/src/sample.py 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/sample.py 2016-07-09 23:52:22.096429701 +0200
+@@ -33,6 +33,12 @@
hb.ot_font_set_funcs (font)
buf = hb.buffer_create ()
@@ -9109,20 +6018,10 @@ diff --git a/gfx/harfbuzz/src/sample.py b/gfx/harfbuzz/src/sample.py
hb.buffer_add_utf8 (buf, text.encode('utf-8'), 0, -1)
hb.buffer_guess_segment_properties (buf)
- hb.shape (font, buf, [])
- del font
-
- infos = hb.buffer_get_glyph_infos (buf)
- positions = hb.buffer_get_glyph_positions (buf)
-diff --git a/gfx/harfbuzz/src/test.cc b/gfx/harfbuzz/src/test.cc
---- a/gfx/harfbuzz/src/test.cc
-+++ b/gfx/harfbuzz/src/test.cc
-@@ -115,17 +115,17 @@ main (int argc, char **argv)
- {
- hb_glyph_info_t *info = &infos[i];
- hb_glyph_position_t *pos = &positions[i];
-
- printf ("cluster %d glyph 0x%x at (%d,%d)+(%d,%d)\n",
+diff -u -r mozilla/gfx/harfbuzz/src/test.cc mozilla-1228540/gfx/harfbuzz/src/test.cc
+--- mozilla/gfx/harfbuzz/src/test.cc 2016-06-30 16:10:43.000000000 +0200
++++ mozilla-1228540/gfx/harfbuzz/src/test.cc 2016-07-09 23:52:22.096429701 +0200
+@@ -120,7 +120,7 @@
info->cluster,
info->codepoint,
pos->x_offset,
@@ -9131,8 +6030,3 @@ diff --git a/gfx/harfbuzz/src/test.cc b/gfx/harfbuzz/src/test.cc
pos->x_advance,
pos->y_advance);
- }
-
- hb_buffer_destroy (buffer);
- hb_font_destroy (font);
- hb_face_destroy (face);
diff --git a/libre/icedove/vendor.js b/libre/icedove/vendor.js
index 75018d34c..2da68d2bb 100644
--- a/libre/icedove/vendor.js
+++ b/libre/icedove/vendor.js
@@ -8,9 +8,6 @@ pref("mail.shell.checkDefaultMail", false);
pref("extensions.autoDisableScopes", 11);
pref("extensions.shownSelectionUI", true);
-// https://bugzilla.mozilla.org/show_bug.cgi?id=1245783
-pref("javascript.options.ion", false);
-
// Disable Social API for content
pref("social.remote-install.enabled", false);
pref("social.toast-notifications.enabled", false);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-29 09:41:57 +0000