Changeset 83251 in webkit

Timestamp:

Apr 7, 2011 9:38:37 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-07 Ned Holbrook <​nholbrook@apple.com>

Reviewed by Dan Bernstein.

CTLine objects should outlive their CTRuns
​https://bugs.webkit.org/show_bug.cgi?id=58063

• platform/graphics/mac/ComplexTextController.h: Add m_coreTextLines, to be destroyed after m_complexTextRuns.
• platform/graphics/mac/ComplexTextControllerCoreText.cpp: (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Moot m_coreTextRun. (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Append line to m_coreTextLines.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-07  Ned Holbrook  <nholbrook@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        CTLine objects should outlive their CTRuns
+        https://bugs.webkit.org/show_bug.cgi?id=58063
+
+        * platform/graphics/mac/ComplexTextController.h: Add m_coreTextLines, to be destroyed after m_complexTextRuns.
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+        (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Moot m_coreTextRun.
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText): Append line to m_coreTextLines.
+
 2011-04-07  Nat Duca  <nduca@chromium.org>
 

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

@@ -117 +117 @@
 #endif
 
-#if USE(CORE_TEXT)
-        RetainPtr<CTRunRef> m_coreTextRun;
-#endif
         unsigned m_glyphCount;
         const SimpleFontData* m_fontData;
@@ -160 +157 @@
     Vector<UChar, 256> m_smallCapsBuffer;
 
+#if USE(CORE_TEXT)
+    // Retain lines rather than their runs for better performance.
+    Vector<RetainPtr<CTLineRef> > m_coreTextLines;
+#endif
     Vector<RefPtr<ComplexTextRun>, 16> m_complexTextRuns;
     Vector<CGSize, 256> m_adjustedAdvances;

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

@@ -44 +44 @@
 
 ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength, CFRange runRange)
-    : m_coreTextRun(ctRun)
-    , m_fontData(fontData)
+    : m_fontData(fontData)
     , m_characters(characters)
     , m_stringLocation(stringLocation)
@@ -52 +51 @@
     , m_isMonotonic(true)
 {
-    m_glyphCount = CTRunGetGlyphCount(m_coreTextRun.get());
-    m_coreTextIndices = CTRunGetStringIndicesPtr(m_coreTextRun.get());
+    m_glyphCount = CTRunGetGlyphCount(ctRun);
+    m_coreTextIndices = CTRunGetStringIndicesPtr(ctRun);
     if (!m_coreTextIndices) {
         m_coreTextIndicesVector.grow(m_glyphCount);
-        CTRunGetStringIndices(m_coreTextRun.get(), CFRangeMake(0, 0), m_coreTextIndicesVector.data());
+        CTRunGetStringIndices(ctRun, CFRangeMake(0, 0), m_coreTextIndicesVector.data());
         m_coreTextIndices = m_coreTextIndicesVector.data();
     }
 
-    m_glyphs = CTRunGetGlyphsPtr(m_coreTextRun.get());
+    m_glyphs = CTRunGetGlyphsPtr(ctRun);
     if (!m_glyphs) {
         m_glyphsVector.grow(m_glyphCount);
-        CTRunGetGlyphs(m_coreTextRun.get(), CFRangeMake(0, 0), m_glyphsVector.data());
+        CTRunGetGlyphs(ctRun, CFRangeMake(0, 0), m_glyphsVector.data());
         m_glyphs = m_glyphsVector.data();
     }
 
-    m_advances = CTRunGetAdvancesPtr(m_coreTextRun.get());
+    m_advances = CTRunGetAdvancesPtr(ctRun);
     if (!m_advances) {
         m_advancesVector.grow(m_glyphCount);
-        CTRunGetAdvances(m_coreTextRun.get(), CFRangeMake(0, 0), m_advancesVector.data());
+        CTRunGetAdvances(ctRun, CFRangeMake(0, 0), m_advancesVector.data());
         m_advances = m_advancesVector.data();
     }
@@ -160 +159 @@
     }
 
+    m_coreTextLines.append(line.get());
+
     CFArrayRef runArray = CTLineGetGlyphRuns(line.get());