bug 951009 - update graphite2 library to upstream v1.2.4. r=jdaggett

carlosdp · Jan 8, 2014 · 35ea1b2 · 35ea1b2
1 parent 2402430
commit 35ea1b2
Show file tree

Hide file tree

Showing 61 changed files with 4,051 additions and 3,313 deletions.
diff --git a/gfx/graphite2/README.mozilla b/gfx/graphite2/README.mozilla
@@ -1,6 +1,6 @@
 This directory contains the Graphite2 library from http://hg.palaso.org/graphitedev
 
-Current version derived from upstream changeset 6b8ddb7d599f
+Current version derived from upstream changeset 1efd96aeade9
 
 See gfx/graphite2/moz-gr-update.sh for update procedure.
 
diff --git a/gfx/graphite2/include/graphite2/Font.h b/gfx/graphite2/include/graphite2/Font.h
@@ -30,7 +30,7 @@
 
 #define GR2_VERSION_MAJOR   1
 #define GR2_VERSION_MINOR   2
-#define GR2_VERSION_BUGFIX  3
+#define GR2_VERSION_BUGFIX  4
 
 #ifdef __cplusplus
 extern "C"
@@ -296,7 +296,7 @@ typedef struct gr_font_ops  gr_font_ops;
   * @param appFontHandle font specific information that must stay alive as long
   *        as the font does
   * @param font_ops pointer font specific callback structure for hinted metrics.
-  *        Must stay alive for the duration of the call.
+  *        Need only stay alive for the duration of the call.
   * @param face the face this font corresponds to. Must stay alive as long as
   *        the font does.
   */
@@ -310,7 +310,6 @@ GR2_API gr_font* gr_make_font_with_ops(float ppm, const void* appFontHandle, con
   * @param appFontHandle font specific information that must stay alive as long
   *        as the font does
   * @param getAdvance callback function reference that returns horizontal advance in pixels for a glyph.
-  *        Must stay alive for the duration of the call.
   * @param face the face this font corresponds to. Must stay alive as long as
   *        the font does.
   */

diff --git a/gfx/graphite2/include/graphite2/Segment.h b/gfx/graphite2/include/graphite2/Segment.h
@@ -125,6 +125,8 @@ enum gr_attrCode {
     gr_slatSegSplit = gr_slatJStretch + 29,
     /// User defined attribute, see subattr for user attr number
     gr_slatUserDefn,
+    /// Bidi level
+    gr_slatBidiLevel,
 
     /// not implemented
     gr_slatMax,             
@@ -327,8 +329,8 @@ GR2_API const gr_slot* gr_slot_first_attachment(const gr_slot* p);
   *
   * This returns the next slot in the singly linked list of slots attached to this
   * slot's parent. If there are no more such slots, NULL is returned. If there is
-  * no parent, i.e. the passed slot is a base, then the next base in graphical order
-  * (ltr even for rtl text) is returned.
+  * no parent, i.e. the passed slot is a cluster base, then the next cluster base
+  * in graphical order (ltr, even for rtl text) is returned.
   *
   * if gr_slot_next_sibling_attachment(p) != NULL then gr_slot_attached_to(gr_slot_next_sibling_attachment(p)) == gr_slot_attached_to(p).
   */
@@ -398,7 +400,13 @@ GR2_API unsigned int gr_slot_index(const gr_slot* p/*not NULL*/);
   */
 GR2_API int gr_slot_attr(const gr_slot* p/*not NULL*/, const gr_segment* pSeg/*not NULL*/, enum gr_attrCode index, gr_uint8 subindex); //tbd - do we need to expose this?
 
-/** Returns whether text may be inserted before this glyph [check this isn't inverted] **/
+/** Returns whether text may be inserted before this glyph.
+  *
+  * This indicates whether a cursor can be put before this slot. It applies to
+  * base glyphs that have no parent as well as attached glyphs that have the
+  * .insert attribute explicitly set to true. This is the primary mechanism
+  * for identifying contiguous sequences of base plus diacritics.
+  */
 GR2_API int gr_slot_can_insert_before(const gr_slot* p);
 
 /** Returns the original gr_char_info index this slot refers to.