Changeset 99807 in webkit

Timestamp:

Nov 9, 2011, 8:28:58 PM (15 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fix. Don't run fontDataForCombiningCharacterSequence on wx as we don't support it yet.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/mac/ComplexTextController.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-09  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Don't run 
+        fontDataForCombiningCharacterSequence on wx as we don't 
+        support it yet.
+
+        * platform/graphics/mac/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::collectComplexTextRuns):
+
 2011-11-09  Kevin Ollivier  <kevino@theolliviers.com>
 

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

@@ -251 +251 @@
 
     nextIsMissingGlyph = false;
+#if !PLATFORM(WX)
     nextFontData = m_font.fontDataForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
     if (!nextFontData) {
@@ -258 +259 @@
             nextIsMissingGlyph = true;
     }
+#endif
 
     while (curr < end) {
@@ -278 +280 @@
 
         nextIsMissingGlyph = false;
+#if !PLATFORM(WX)
         nextFontData = m_font.fontDataForCombiningCharacterSequence(cp + index, curr - cp - index, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
         if (!nextFontData) {
@@ -285 +288 @@
                 nextIsMissingGlyph = true;
         }
+#endif
 
         if (nextFontData != fontData || nextIsMissingGlyph != isMissingGlyph) {