Changeset 129664 in webkit

Timestamp:

Sep 26, 2012, 10:26:18 AM (13 years ago)

Author:

msaboff@apple.com

Message:

Update ComplexTextController for 8 bit TextRun changes
​https://bugs.webkit.org/show_bug.cgi?id=97378

Reviewed by Geoffrey Garen.

Source/WebCore:

Since the ComplextTextController code is primarily used for UChar data, just upconvert an 8 bit
TextRun into a new String and hold on to the String with a vector for the life of the controller.

No change in functionality, therefore no new tests.

• platform/graphics/mac/ComplexTextController.cpp:

(WebCore::ComplexTextController::ComplexTextController):
(WebCore::ComplexTextController::collectComplexTextRuns):

• platform/graphics/mac/ComplexTextController.h:

(ComplexTextController):

Source/WTF:

Add a new create method to make a 16 bit string from 8 bit source data. This is used in
ComplexTextController when we have LChar* + length text data, but we really want 16 bit
data for the complex text rendering code.

• wtf/text/WTFString.cpp:

(WTF::String::make16BitFrom8BitSource):
(WTF):

• wtf/text/WTFString.h:

(String):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/WTFString.cpp (modified) (1 diff)
• WTF/wtf/text/WTFString.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/mac/ComplexTextController.cpp (modified) (2 diffs)
• WebCore/platform/graphics/mac/ComplexTextController.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-09-26  Michael Saboff  <msaboff@apple.com>
+
+        Update ComplexTextController for 8 bit TextRun changes
+        https://bugs.webkit.org/show_bug.cgi?id=97378
+
+        Reviewed by Geoffrey Garen.
+
+        Add a new create method to make a 16 bit string from 8 bit source data.  This is used in 
+        ComplexTextController when we have LChar* + length text data, but we really want 16 bit
+        data for the complex text rendering code.
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::make16BitFrom8BitSource):
+        (WTF):
+        * wtf/text/WTFString.h:
+        (String):
+
 2012-09-26  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WTF/wtf/text/WTFString.cpp

@@ -779 +779 @@
 }
 
+String String::make16BitFrom8BitSource(const LChar* source, size_t length)
+{
+    if (!length)
+        return String();
+    
+    UChar* destination;
+    String result = String::createUninitialized(length, destination);
+    
+    StringImpl::copyChars(destination, source, length);
+    
+    return result;
+}
+
 String String::fromUTF8(const LChar* stringStart, size_t length)
 {

trunk/Source/WTF/wtf/text/WTFString.h

@@ -415 +415 @@
 
     WTF_EXPORT_STRING_API static String make8BitFrom16BitSource(const UChar*, size_t);
+    WTF_EXPORT_STRING_API static String make16BitFrom8BitSource(const LChar*, size_t);
 
     // String::fromUTF8 will return a null string if

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-26  Michael Saboff  <msaboff@apple.com>
+
+        Update ComplexTextController for 8 bit TextRun changes
+        https://bugs.webkit.org/show_bug.cgi?id=97378
+
+        Reviewed by Geoffrey Garen.
+
+        Since the ComplextTextController code is primarily used for UChar data, just upconvert an 8 bit
+        TextRun into a new String and hold on to the String with a vector for the life of the controller.
+
+        No change in functionality, therefore no new tests.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::ComplexTextController):
+        (WebCore::ComplexTextController::collectComplexTextRuns):
+        * platform/graphics/mac/ComplexTextController.h:
+        (ComplexTextController):
+
 2012-09-26  Michael Saboff  <msaboff@apple.com>
 

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

@@ -143 +143 @@
     else {
         bool isAfterExpansion = m_afterExpansion;
-        unsigned expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters16(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion);
+        unsigned expansionOpportunityCount;
+        if (m_run.is8Bit())
+            expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters8(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion);
+         else
+             expansionOpportunityCount = Font::expansionOpportunityCount(m_run.characters16(), m_end, m_run.ltr() ? LTR : RTL, isAfterExpansion);
         if (isAfterExpansion && !m_run.allowsTrailingExpansion())
             expansionOpportunityCount--;
@@ -285 +289 @@
 
     // We break up glyph run generation for the string by FontData.
-    const UChar* cp = m_run.characters16();
+    const UChar* cp;
+
+    if (m_run.is8Bit()) {
+        String stringFor8BitRun = String::make16BitFrom8BitSource(m_run.characters8(), m_run.length());
+        cp = stringFor8BitRun.characters16();
+        m_stringsFor8BitRuns.append(stringFor8BitRun);
+    } else
+        cp = m_run.characters16();
 
     if (m_font.isSmallCaps())

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

@@ -32 +32 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
+#include <wtf/text/WTFString.h>
 #include <wtf/unicode/Unicode.h>
 
@@ -144 +145 @@
     bool m_forTextEmphasis;
 
+    Vector<String> m_stringsFor8BitRuns;
     Vector<UChar, 256> m_smallCapsBuffer;