Chromium Code Reviews| Index: Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp |
| diff --git a/Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp b/Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp |
| index aec3a595626e8883b8ad638ed1e7c8eb7215f6d1..f011470b58d665c0f8f6609e5c5db18fe35e3659 100644 |
| --- a/Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp |
| +++ b/Source/core/platform/graphics/mac/GlyphPageTreeNodeMac.cpp |
| @@ -32,7 +32,6 @@ |
| #include <ApplicationServices/ApplicationServices.h> |
| #include "core/platform/graphics/Font.h" |
| #include "core/platform/graphics/SimpleFontData.h" |
| -#include "core/platform/mac/WebCoreSystemInterface.h" |
| // Forward declare Mac SPIs. |
| // Request for public API: rdar://13787589 |
| @@ -72,10 +71,10 @@ bool GlyphPage::fill(unsigned offset, unsigned length, UChar* buffer, unsigned b |
| haveGlyphs = true; |
| } |
| } |
| - } else if (!fontData->platformData().isCompositeFontReference() && ((fontData->platformData().widthVariant() == RegularWidth) ? WKGetVerticalGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength) |
|
Nico
2013/05/03 17:16:51
This looks like a behavior change, not just like a
Robert Sesek
2013/05/03 17:58:03
Sorry, I forgot to call that out. The function doe
|
| - : CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength))) { |
| - // When buffer consists of surrogate pairs, WKGetVerticalGlyphsForCharacters and CTFontGetGlyphsForCharacters |
| - // place the glyphs at indices corresponding to the first character of each pair. |
| + } else if (!fontData->platformData().isCompositeFontReference() && fontData->platformData().widthVariant() != RegularWidth |
| + && CTFontGetGlyphsForCharacters(fontData->platformData().ctFont(), buffer, glyphs.data(), bufferLength)) { |
| + // When buffer consists of surrogate pairs, CTFontGetGlyphsForCharacters |
| + // places the glyphs at indices corresponding to the first character of each pair. |
| unsigned glyphStep = bufferLength / length; |
| for (unsigned i = 0; i < length; ++i) { |
| if (!glyphs[i * glyphStep]) |