Title: [99807] trunk/Source/WebCore
- Revision
- 99807
- Author
- [email protected]
- Date
- 2011-11-09 20:28:58 -0800 (Wed, 09 Nov 2011)
Log Message
[wx] Unreviewed build fix. Don't run fontDataForCombiningCharacterSequence on wx as we don't support it yet.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (99806 => 99807)
--- trunk/Source/WebCore/ChangeLog 2011-11-10 04:21:31 UTC (rev 99806)
+++ trunk/Source/WebCore/ChangeLog 2011-11-10 04:28:58 UTC (rev 99807)
@@ -1,5 +1,14 @@
2011-11-09 Kevin Ollivier <[email protected]>
+ [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 <[email protected]>
+
[wx] Unreviewed build fix. Update how we hash the font after
changes to the StringHasher APIs.
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (99806 => 99807)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2011-11-10 04:21:31 UTC (rev 99806)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2011-11-10 04:28:58 UTC (rev 99807)
@@ -250,6 +250,7 @@
}
nextIsMissingGlyph = false;
+#if !PLATFORM(WX)
nextFontData = m_font.fontDataForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
if (!nextFontData) {
if (markCount)
@@ -257,6 +258,7 @@
else
nextIsMissingGlyph = true;
}
+#endif
while (curr < end) {
fontData = nextFontData;
@@ -277,6 +279,7 @@
}
nextIsMissingGlyph = false;
+#if !PLATFORM(WX)
nextFontData = m_font.fontDataForCombiningCharacterSequence(cp + index, curr - cp - index, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
if (!nextFontData) {
if (markCount)
@@ -284,6 +287,7 @@
else
nextIsMissingGlyph = true;
}
+#endif
if (nextFontData != fontData || nextIsMissingGlyph != isMissingGlyph) {
int itemStart = static_cast<int>(indexOfFontTransition);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
