Changeset 64734 in webkit

Timestamp:

Aug 5, 2010 4:54:34 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Ned Holbrook <​nholbrook@apple.com>

Reviewed by Darin Adler.

~5% complex layout performance improvement.
​https://bugs.webkit.org/show_bug.cgi?id=43436

• platform/graphics/mac/ComplexTextController.h:
• platform/graphics/mac/ComplexTextControllerCoreText.cpp: (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Use Vector rather than CFMutableData. (WebCore::ComplexTextController::ComplexTextRun::createTextRunFromFontDataCoreText): Ditto. (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Avoid typesetter allocation unless using typesetter options.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/ComplexTextController.h (modified) (1 diff)
• platform/graphics/mac/ComplexTextControllerCoreText.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Ned Holbrook  <nholbrook@apple.com>
+
+        Reviewed by Darin Adler.
+
+        ~5% complex layout performance improvement.
+        https://bugs.webkit.org/show_bug.cgi?id=43436
+
+        * platform/graphics/mac/ComplexTextController.h:
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+        (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Use Vector rather than CFMutableData.
+        (WebCore::ComplexTextController::ComplexTextRun::createTextRunFromFontDataCoreText): Ditto.
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Avoid typesetter allocation unless using typesetter options.
+
 2010-08-05  Steve Block  <steveblock@google.com>
 

trunk/WebCore/platform/graphics/mac/ComplexTextController.h

@@ -128 +128 @@
         size_t m_stringLength;
 #if USE(CORE_TEXT)
-        RetainPtr<CFMutableDataRef> m_coreTextIndicesData;
+        Vector<CFIndex, 64> m_coreTextIndicesVector;
         const CFIndex* m_coreTextIndices;
 #endif

trunk/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.cpp

@@ -52 +52 @@
     m_coreTextIndices = CTRunGetStringIndicesPtr(m_coreTextRun.get());
     if (!m_coreTextIndices) {
-        m_coreTextIndicesData.adoptCF(CFDataCreateMutable(kCFAllocatorDefault, m_glyphCount * sizeof(CFIndex)));
-        CFDataIncreaseLength(m_coreTextIndicesData.get(), m_glyphCount * sizeof(CFIndex));
-        m_coreTextIndices = reinterpret_cast<const CFIndex*>(CFDataGetMutableBytePtr(m_coreTextIndicesData.get()));
-        CTRunGetStringIndices(m_coreTextRun.get(), CFRangeMake(0, 0), const_cast<CFIndex*>(m_coreTextIndices));
+        m_coreTextIndicesVector.grow(m_glyphCount);
+        CTRunGetStringIndices(m_coreTextRun.get(), CFRangeMake(0, 0), m_coreTextIndicesVector.data());
+        m_coreTextIndices = m_coreTextIndicesVector.data();
     }
 
@@ -71 +70 @@
         m_advances = m_advancesVector.data();
     }
-
 }
 
@@ -78 +76 @@
 void ComplexTextController::ComplexTextRun::createTextRunFromFontDataCoreText(bool ltr)
 {
-    Vector<CFIndex, 16> indices;
+    m_coreTextIndicesVector.reserveInitialCapacity(m_stringLength);
     unsigned r = 0;
     while (r < m_stringLength) {
-        indices.append(r);
+        m_coreTextIndicesVector.uncheckedAppend(r);
         if (U_IS_SURROGATE(m_characters[r])) {
             ASSERT(r + 1 < m_stringLength);
@@ -90 +88 @@
             r++;
     }
-    m_glyphCount = indices.size();
+    m_glyphCount = m_coreTextIndicesVector.size();
     if (!ltr) {
         for (unsigned r = 0, end = m_glyphCount - 1; r < m_glyphCount / 2; ++r, --end)
-            std::swap(indices[r], indices[end]);
+            std::swap(m_coreTextIndicesVector[r], m_coreTextIndicesVector[end]);
     }
-    m_coreTextIndicesData.adoptCF(CFDataCreateMutable(kCFAllocatorDefault, m_glyphCount * sizeof(CFIndex)));
-    CFDataAppendBytes(m_coreTextIndicesData.get(), reinterpret_cast<const UInt8*>(indices.data()), m_glyphCount * sizeof(CFIndex));
-    m_coreTextIndices = reinterpret_cast<const CFIndex*>(CFDataGetBytePtr(m_coreTextIndicesData.get()));
+    m_coreTextIndices = m_coreTextIndicesVector.data();
 
     // Synthesize a run of missing glyphs.
@@ -121 +117 @@
     RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(NULL, string.get(), fontData->getCFStringAttributes(m_font.typesettingFeatures())));
 
-    RetainPtr<CTTypesetterRef> typesetter;
+    RetainPtr<CTLineRef> line;
 
     if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) {
@@ -131 +127 @@
         static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, sizeof(optionKeys) / sizeof(*optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
         static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, sizeof(optionKeys) / sizeof(*optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-        typesetter.adoptCF(CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
+        RetainPtr<CTTypesetterRef> typesetter(AdoptCF, CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));
+
+        line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));
     } else
-        typesetter.adoptCF(CTTypesetterCreateWithAttributedString(attributedString.get()));
-
-    RetainPtr<CTLineRef> line(AdoptCF, CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));
+        line.adoptCF(CTLineCreateWithAttributedString(attributedString.get()));
 
     CFArrayRef runArray = CTLineGetGlyphRuns(line.get());