Merge 76732

Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.h

 /*
  * 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 93 matching lines @@
     const unsigned width() const { return m_pixelWidth; }
 
     // Return the cluster log for the current script run. For example:
     //   script run: f i a n c é  (fi gets ligatured)
     //   log clutrs: 0 0 1 2 3 4
     // So, for each input code point, the log tells you which output glyph was
     // generated for it.
     const unsigned short* logClusters() const { return m_item.log_clusters; }
 
     // return the number of code points in the current script run
-    const unsigned numCodePoints() const { return m_numCodePoints; }
+    const unsigned numCodePoints() const { return m_item.item.length; }
 
     // Return the current pixel position of the controller.
     const unsigned offsetX() const { return m_offsetX; }
 
     const FontPlatformData* fontPlatformDataForScriptRun() { return reinterpret_cast<FontPlatformData*>(m_item.font->userData); }
 
 private:
     void setupFontForScriptRun();
     HB_FontRec* allocHarfbuzzFont();
     void deleteGlyphArrays();
     void createGlyphArrays(int);
     void resetGlyphArrays();
     void shapeGlyphs();
     void setGlyphXPositions(bool);
 
     static void normalizeSpacesAndMirrorChars(const UChar* source, bool rtl, UChar* destination, int length);
     static const TextRun& getNormalizedTextRun(const TextRun& originalRun, OwnPtr<TextRun>& normalizedRun, OwnArrayPtr<UChar>& normalizedBuffer);
 
     // This matches the logic in RenderBlock::findNextLineBreak
     static bool isCodepointSpace(HB_UChar16 c) { return c == ' ' || c == '\t'; }
 
     const Font* const m_font;
     const SimpleFontData* m_currentFontData;
     HB_ShaperItem m_item;
     uint16_t* m_glyphs16; // A vector of 16-bit glyph ids.
     SkScalar* m_xPositions; // A vector of x positions for each glyph.
     ssize_t m_indexOfNextScriptRun; // Indexes the script run in |m_run|.
     unsigned m_offsetX; // Offset in pixels to the start of the next script run.
     unsigned m_pixelWidth; // Width (in px) of the current script run.
-    unsigned m_numCodePoints; // Code points in current script run.
     unsigned m_glyphsArrayCapacity; // Current size of all the Harfbuzz arrays.
 
     OwnPtr<TextRun> m_normalizedRun;
     OwnArrayPtr<UChar> m_normalizedBuffer; // A buffer for normalized run.
     const TextRun& m_run;
     int m_wordSpacingAdjustment; // delta adjustment (pixels) for each word break.
     float m_padding; // pixels to be distributed over the line at word breaks.
     float m_padPerWordBreak; // pixels to be added to each word break.
     float m_padError; // |m_padPerWordBreak| might have a fractional component.
                       // Since we only add a whole number of padding pixels at
                       // each word break we accumulate error. This is the
                       // number of pixels that we are behind so far.
     int m_letterSpacing; // pixels to be added after each glyph.
 };
 
 } // namespace WebCore
 
 #endif // ComplexTextControllerLinux_h