Changeset 71795 in webkit

Timestamp:

Nov 10, 2010 9:18:54 PM (13 years ago)

Author:

mitz@apple.com

Message:

Allow for the possibility of CoreText generating multiple runs for a single text run.
​https://bugs.webkit.org/show_bug.cgi?id=49353

Patch by Ned Holbrook <​nholbrook@apple.com> on 2010-11-10
Reviewed by Dan Bernstein.

• platform/graphics/mac/ComplexTextController.h:

(WebCore::ComplexTextController::ComplexTextRun::create):

• platform/graphics/mac/ComplexTextControllerCoreText.cpp:

(WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
(WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-10  Ned Holbrook  <nholbrook@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Allow for the possibility of CoreText generating multiple runs for a single text run.
+        https://bugs.webkit.org/show_bug.cgi?id=49353
+
+        * platform/graphics/mac/ComplexTextController.h:
+        (WebCore::ComplexTextController::ComplexTextRun::create):
+        * platform/graphics/mac/ComplexTextControllerCoreText.cpp:
+        (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
+        (WebCore::ComplexTextController::collectComplexTextRunsForCharactersCoreText):
+
 2010-10-15  Martin Robinson  <mrobinson@igalia.com>
 

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

@@ -73 +73 @@
     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, CFRange runRange)
         {
-            return adoptRef(new ComplexTextRun(ctRun, fontData, characters, stringLocation, stringLength));
+            return adoptRef(new ComplexTextRun(ctRun, fontData, characters, stringLocation, runRange));
         }
 #endif
@@ -103 +103 @@
     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, CFRange runRange);
         void createTextRunFromFontDataCoreText(bool ltr);
 #endif

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

@@ -42 +42 @@
 namespace WebCore {
 
-ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength)
+ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, CFRange runRange)
     : m_coreTextRun(ctRun)
     , m_fontData(fontData)
-    , m_characters(characters)
-    , m_stringLocation(stringLocation)
-    , m_stringLength(stringLength)
+    , m_characters(characters + runRange.location)
+    , m_stringLocation(stringLocation + runRange.location)
+    , m_stringLength(runRange.length)
     , m_isMonotonic(true)
 {
     m_glyphCount = CTRunGetGlyphCount(m_coreTextRun.get());
-    m_coreTextIndices = CTRunGetStringIndicesPtr(m_coreTextRun.get());
+    m_coreTextIndices = runRange.location ? 0 : CTRunGetStringIndicesPtr(m_coreTextRun.get());
     if (!m_coreTextIndices) {
         m_coreTextIndicesVector.grow(m_glyphCount);
         CTRunGetStringIndices(m_coreTextRun.get(), CFRangeMake(0, 0), m_coreTextIndicesVector.data());
+        if (runRange.location)
+            for (unsigned i = 0; i < m_glyphCount; ++i)
+                m_coreTextIndicesVector[i] -= runRange.location;
         m_coreTextIndices = m_coreTextIndicesVector.data();
     }
@@ -165 +168 @@
         CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, r));
         ASSERT(CFGetTypeID(ctRun) == CTRunGetTypeID());
-        m_complexTextRuns.append(ComplexTextRun::create(ctRun, fontData, cp, stringLocation, length));
+        CFRange runRange = CTRunGetStringRange(ctRun);
+        m_complexTextRuns.append(ComplexTextRun::create(ctRun, fontData, cp, stringLocation, runRange));
     }
 }