Merge 153128 - Source/WebCore: [HarfBuzz] harfbuzz expects log_clusters to have same length as othe…

Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp

 /*
  * Copyright (c) 2010 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 52 matching lines @@
     NormalizeMode mode = m_run.rtl() ? NormalizeMirrorChars : DoNotNormalizeMirrorChars;
     setNormalizedBuffer(mode);
 
     memset(&m_item, 0, sizeof(m_item));
     // We cannot know, ahead of time, how many glyphs a given script run
     // will produce. We take a guess that script runs will not produce more
     // than twice as many glyphs as there are code points plus a bit of
     // padding and fallback if we find that we are wrong.
     createGlyphArrays((m_normalizedBufferLength + 2) * 2);
 
-    m_item.log_clusters = new unsigned short[m_normalizedBufferLength];
-
     m_item.face = 0;
     m_item.font = allocHarfbuzzFont();
 
     m_item.item.bidiLevel = m_run.rtl();
 
     m_item.string = m_normalizedBuffer.get();
     m_item.stringLength = m_normalizedBufferLength;
 
     reset(startingX);
     m_startingY = startingY;
 
     setPadding(m_run.expansion());
 }
 
 ComplexTextController::~ComplexTextController()
 {
     fastFree(m_item.font);
     deleteGlyphArrays();
-    delete[] m_item.log_clusters;
 }
 
 void ComplexTextController::reset(int offset)
 {
     m_indexOfNextScriptRun = 0;
     m_offsetX = offset;
 }
 
 void ComplexTextController::setupForRTL()
 {
@@ skipping 188 matching lines @@
     m_item.font->x_scale = scale;
     m_item.font->y_scale = scale;
 }
 
 void ComplexTextController::deleteGlyphArrays()
 {
     delete[] m_item.glyphs;
     delete[] m_item.attributes;
     delete[] m_item.advances;
     delete[] m_item.offsets;
+    delete[] m_item.log_clusters;
     delete[] m_glyphs16;
     delete[] m_positions;
 }
 
 void ComplexTextController::createGlyphArrays(int size)
 {
     m_item.glyphs = new HB_Glyph[size];
     m_item.attributes = new HB_GlyphAttributes[size];
     m_item.advances = new HB_Fixed[size];
     m_item.offsets = new HB_FixedPoint[size];
+    m_item.log_clusters = new unsigned short[size];
 
     m_glyphs16 = new uint16_t[size];
     m_positions = new SkPoint[size];
 
     m_item.num_glyphs = size;
     m_glyphsArrayCapacity = size; // Save the GlyphArrays size.
     resetGlyphArrays();
 }
 
 void ComplexTextController::resetGlyphArrays()
@@ skipping 180 matching lines @@
     // Compute the starting glyph within this span. |from| and |to| are
     // global offsets that may intersect arbitrarily with our local run.
     fromGlyph = m_item.log_clusters[fromChar < 0 ? 0 : fromChar];
     if (toChar >= static_cast<int>(numCodePoints()))
         glyphLength = length() - fromGlyph;
     else
         glyphLength = m_item.log_clusters[toChar] - fromGlyph;
 }
 
 } // namespace WebCore