Merge 138001 - Fix the alignment issue with Arabic when a font has kerning or cursive gsub

third_party/harfbuzz/src/harfbuzz-shaper.cpp

 /*
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This is part of HarfBuzz, an OpenType Layout engine 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.
@@ skipping 1264 matching lines @@
         HB_Fixed *advances = item->advances;
 
 //         DEBUG("positioned glyphs:");
         for (unsigned int i = 0; i < face->buffer->in_length; i++) {
 //             DEBUG("    %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i,
 //                    glyphs[i].advance.x.toInt(), glyphs[i].advance.y.toInt(),
 //                    (int)(positions[i].x_advance >> 6), (int)(positions[i].y_advance >> 6),
 //                    (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6),
 //                    positions[i].back, positions[i].new_advance);
 
-            HB_Fixed adjustment = (item->item.bidiLevel % 2) ? -positions[i].x_advance : positions[i].x_advance;
+            HB_Fixed adjustment = positions[i].x_advance;
 
             if (!(face->current_flags & HB_ShaperFlag_UseDesignMetrics))
                 adjustment = HB_FIXED_ROUND(adjustment);
 
-            if (positions[i].new_advance) {
-                advances[i] = adjustment;
-            } else {
+            if (positions[i].new_advance == 0)
                 advances[i] += adjustment;
-            }
 
             int back = 0;
             HB_FixedPoint *offsets = item->offsets;
             offsets[i].x = positions[i].x_pos;
             offsets[i].y = positions[i].y_pos;
             while (positions[i - back].back) {
                 back += positions[i - back].back;
                 offsets[i].x += positions[i - back].x_pos;
                 offsets[i].y += positions[i - back].y_pos;
             }
@@ skipping 42 matching lines @@
     HB_Bool result = false;
     if (shaper_item->num_glyphs < shaper_item->item.length) {
         shaper_item->num_glyphs = shaper_item->item.length;
         return false;
     }
     assert(shaper_item->item.script < HB_ScriptCount);
     result = HB_ScriptEngines[shaper_item->item.script].shape(shaper_item);
     shaper_item->glyphIndicesPresent = false;
     return result;
 }
-