Merge 114267 - [chromium] wrong justification for arabic/persian page in cr-win.

Source/WebCore/platform/graphics/chromium/UniscribeHelper.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 199 matching lines @@
 
         for (int i = 0; i < shaping.glyphLength(); i++, destIndex++) {
             memcpy(&visualAttributes[destIndex], &shaping.m_visualAttributes[i],
                    sizeof(SCRIPT_VISATTR));
             advances[destIndex] = shaping.m_advance[i];
         }
     }
 
     // The documentation for Scriptjustify is wrong, the parameter is the space
     // to add and not the width of the column you want.
-    const int minKashida = 1;  // How do we decide what this should be?
+    int minKashida;
+#if USE(SKIA_TEXT)
+    // Disable kashida justification based on 
+    // http://blogs.msdn.com/b/michkap/archive/2010/08/31/10056140.aspx.
+    for (int i = 0; i < totalGlyphs; ++i) {
+        if (visualAttributes[i].uJustification == SCRIPT_JUSTIFY_ARABIC_KASHIDA)
+            visualAttributes[i].uJustification = SCRIPT_JUSTIFY_NONE;   
+    }
+    minKashida = 0;
+#else
+    minKashida = 1; // How do we decide what this should be?
+#endif
     ScriptJustify(&visualAttributes[0], &advances[0], totalGlyphs,
                   additionalSpace, minKashida, &justify[0]);
 
     // Now we have to unpack the justification amounts back into the runs so
     // the glyph indices match.
     int globalGlyphIndex = 0;
     for (size_t run = 0; run < m_runs.size(); run++) {
         int runIndex = m_screenOrder[run];
         Shaping& shaping = m_shapes[runIndex];
 
@@ skipping 831 matching lines @@
     m_featureRecords.resize(featureSettings->size());
     for (unsigned i = 0; i < featureSettings->size(); ++i) {
         m_featureRecords[i].lParameter = featureSettings->at(i).value();
         m_featureRecords[i].tagFeature = convertFeatureTag(featureSettings->at(i).tag());
     }
     m_rangeProperties.potfRecords = &m_featureRecords[0];
     m_rangeProperties.cotfRecords = m_featureRecords.size();
 }
 
 }  // namespace WebCore