diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/mac/ComplexTextController.h')
-rw-r--r-- | Source/WebCore/platform/graphics/mac/ComplexTextController.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/mac/ComplexTextController.h b/Source/WebCore/platform/graphics/mac/ComplexTextController.h index 9cf80a6..63f93a2 100644 --- a/Source/WebCore/platform/graphics/mac/ComplexTextController.h +++ b/Source/WebCore/platform/graphics/mac/ComplexTextController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -72,9 +72,9 @@ private: class ComplexTextRun : public RefCounted<ComplexTextRun> { public: #if USE(CORE_TEXT) - static PassRefPtr<ComplexTextRun> create(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength) + static PassRefPtr<ComplexTextRun> create(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength, CFRange runRange) { - return adoptRef(new ComplexTextRun(ctRun, fontData, characters, stringLocation, stringLength)); + return adoptRef(new ComplexTextRun(ctRun, fontData, characters, stringLocation, stringLength, runRange)); } #endif #if USE(ATSUI) @@ -94,6 +94,7 @@ private: unsigned stringLocation() const { return m_stringLocation; } size_t stringLength() const { return m_stringLength; } ALWAYS_INLINE CFIndex indexAt(size_t i) const; + CFIndex indexEnd() const { return m_indexEnd; } CFIndex endOffsetAt(size_t i) const { ASSERT(!m_isMonotonic); return m_glyphEndOffsets[i]; } const CGGlyph* glyphs() const { return m_glyphs; } const CGSize* advances() const { return m_advances; } @@ -102,7 +103,7 @@ private: private: #if USE(CORE_TEXT) - ComplexTextRun(CTRunRef, const SimpleFontData*, const UChar* characters, unsigned stringLocation, size_t stringLength); + ComplexTextRun(CTRunRef, const SimpleFontData*, const UChar* characters, unsigned stringLocation, size_t stringLength, CFRange runRange); void createTextRunFromFontDataCoreText(bool ltr); #endif #if USE(ATSUI) @@ -133,6 +134,7 @@ private: #if USE(ATSUI) Vector<CFIndex, 64> m_atsuiIndices; #endif + CFIndex m_indexEnd; Vector<CFIndex, 64> m_glyphEndOffsets; Vector<CGGlyph, 64> m_glyphsVector; const CGGlyph* m_glyphs; @@ -175,8 +177,9 @@ private: unsigned m_glyphInCurrentRun; unsigned m_characterInCurrentGlyph; float m_finalRoundingWidth; - float m_padding; - float m_padPerSpace; + float m_expansion; + float m_expansionPerOpportunity; + bool m_afterExpansion; HashSet<const SimpleFontData*>* m_fallbackFonts; |