Source/platform/fonts/mac/ComplexTextControllerCoreText.mm - Issue 175253002: Switch to HarfBuzz on Mac and remove CoreText shaper

Unified Diff: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

Issue 175253002: Switch to HarfBuzz on Mac and remove CoreText shaper (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: ChromiumAATTest font based test added, header inclusion order fixed Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/platform/fonts/mac/ComplexTextController.cpp ('k') | Source/platform/fonts/mac/FontComplexTextMac.cpp » ('j') | Source/platform/fonts/mac/FontComplexTextMac.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

diff --git a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm b/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

deleted file mode 100644

index 86bc89363d5496633e8fb7015acaf4a93091bd6b..0000000000000000000000000000000000000000

--- a/Source/platform/fonts/mac/ComplexTextControllerCoreText.mm

+++ /dev/null

@@ -1,297 +0,0 @@

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY

- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY

- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-#include "config.h"

-#include "platform/fonts/mac/ComplexTextController.h"

-#include "platform/fonts/Font.h"

-#include "platform/fonts/FontCache.h"

-#include "platform/text/TextRun.h"

-#include <ApplicationServices/ApplicationServices.h>

-#import <AvailabilityMacros.h>

-// Forward declare Mac SPIs.

-extern "C" {

-// Request for public API: rdar://13803619

-CTLineRef CTLineCreateWithUniCharProvider(const UniChar* (*provide)(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* context), void (*dispose)(const UniChar* chars, void* context), void* context);

-@interface WebCascadeList : NSArray {

- @private

- const WebCore::Font* _font;

- UChar32 _character;

- NSUInteger _count;

- Vector<RetainPtr<CTFontDescriptorRef>, 16> _fontDescriptors;

-- (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character;

-@end

-@implementation WebCascadeList

-- (id)initWithFont:(const WebCore::Font*)font character:(UChar32)character

- if (!(self = [super init]))

- return nil;

- _font = font;

- _character = character;

- // By the time a WebCascadeList is used, the Font has already been asked to realize all of its

- // FontData, so this loop does not hit the FontCache.

- while (_font->fontDataAt(_count))

- _count++;

- return self;

-- (NSUInteger)count

- return _count;

-- (id)objectAtIndex:(NSUInteger)index

- CTFontDescriptorRef fontDescriptor;

- if (index < _fontDescriptors.size()) {

- if ((fontDescriptor = _fontDescriptors[index].get()))

- return (id)fontDescriptor;

- } else

- _fontDescriptors.grow(index + 1);

- const WebCore::SimpleFontData* fontData = _font->fontDataAt(index)->fontDataForCharacter(_character);

- fontDescriptor = CTFontCopyFontDescriptor(fontData->platformData().ctFont());

- _fontDescriptors[index] = RetainPtr<CTFontDescriptorRef>(AdoptCF, fontDescriptor);

- return (id)fontDescriptor;

-@end

-namespace WebCore {

-ComplexTextController::ComplexTextRun::ComplexTextRun(CTRunRef ctRun, const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength, CFRange runRange)

- : m_fontData(fontData)

- , m_characters(characters)

- , m_stringLocation(stringLocation)

- , m_stringLength(stringLength)

- , m_indexBegin(runRange.location)

- , m_indexEnd(runRange.location + runRange.length)

- , m_isLTR(!(CTRunGetStatus(ctRun) & kCTRunStatusRightToLeft))

- , m_isMonotonic(true)

- m_glyphCount = CTRunGetGlyphCount(ctRun);

- m_coreTextIndices = CTRunGetStringIndicesPtr(ctRun);

- if (!m_coreTextIndices) {

- m_coreTextIndicesVector.grow(m_glyphCount);

- CTRunGetStringIndices(ctRun, CFRangeMake(0, 0), m_coreTextIndicesVector.data());

- m_coreTextIndices = m_coreTextIndicesVector.data();

- }

- m_glyphs = CTRunGetGlyphsPtr(ctRun);

- if (!m_glyphs) {

- m_glyphsVector.grow(m_glyphCount);

- CTRunGetGlyphs(ctRun, CFRangeMake(0, 0), m_glyphsVector.data());

- m_glyphs = m_glyphsVector.data();

- }

- m_advances = CTRunGetAdvancesPtr(ctRun);

- if (!m_advances) {

- m_advancesVector.grow(m_glyphCount);

- CTRunGetAdvances(ctRun, CFRangeMake(0, 0), m_advancesVector.data());

- m_advances = m_advancesVector.data();

- }

-// Missing glyphs run constructor. Core Text will not generate a run of missing glyphs, instead falling back on

-// glyphs from LastResort. We want to use the primary font's missing glyph in order to match the fast text code path.

-ComplexTextController::ComplexTextRun::ComplexTextRun(const SimpleFontData* fontData, const UChar* characters, unsigned stringLocation, size_t stringLength, bool ltr)

- : m_fontData(fontData)

- , m_characters(characters)

- , m_stringLocation(stringLocation)

- , m_stringLength(stringLength)

- , m_indexBegin(0)

- , m_indexEnd(stringLength)

- , m_isLTR(ltr)

- , m_isMonotonic(true)

- m_coreTextIndicesVector.reserveInitialCapacity(m_stringLength);

- unsigned r = 0;

- while (r < m_stringLength) {

- m_coreTextIndicesVector.uncheckedAppend(r);

- if (U_IS_SURROGATE(m_characters[r])) {

- ASSERT(r + 1 < m_stringLength);

- ASSERT(U_IS_SURROGATE_LEAD(m_characters[r]));

- ASSERT(U_IS_TRAIL(m_characters[r + 1]));

- r += 2;

- } else

- r++;

- }

- m_glyphCount = m_coreTextIndicesVector.size();

- if (!ltr) {

- for (unsigned r = 0, end = m_glyphCount - 1; r < m_glyphCount / 2; ++r, --end)

- std::swap(m_coreTextIndicesVector[r], m_coreTextIndicesVector[end]);

- }

- m_coreTextIndices = m_coreTextIndicesVector.data();

- // Synthesize a run of missing glyphs.

- m_glyphsVector.fill(0, m_glyphCount);

- m_glyphs = m_glyphsVector.data();

- m_advancesVector.fill(CGSizeMake(m_fontData->widthForGlyph(0), 0), m_glyphCount);

- m_advances = m_advancesVector.data();

-struct ProviderInfo {

- const UChar* cp;

- unsigned length;

- CFDictionaryRef attributes;

-};

-static const UniChar* provideStringAndAttributes(CFIndex stringIndex, CFIndex* charCount, CFDictionaryRef* attributes, void* refCon)

- ProviderInfo* info = static_cast<struct ProviderInfo*>(refCon);

- if (stringIndex < 0 || static_cast<unsigned>(stringIndex) >= info->length)

- return 0;

- *charCount = info->length - stringIndex;

- *attributes = info->attributes;

- return info->cp + stringIndex;

-void ComplexTextController::collectComplexTextRunsForCharacters(const UChar* cp, unsigned length, unsigned stringLocation, const SimpleFontData* fontData)

- if (!fontData) {

- // Create a run of missing glyphs from the primary font.

- m_complexTextRuns.append(ComplexTextRun::create(m_font.primaryFont(), cp, stringLocation, length, m_run.ltr()));

- return;

- }

- bool isSystemFallback = false;

- UChar32 baseCharacter = 0;

- RetainPtr<CFDictionaryRef> stringAttributes;

- if (fontData == SimpleFontData::systemFallback()) {

- // FIXME: This code path does not support small caps.

- isSystemFallback = true;

- U16_GET(cp, 0, 0, length, baseCharacter);

- fontData = m_font.fontDataAt(0)->fontDataForCharacter(baseCharacter);

- RetainPtr<WebCascadeList> cascadeList(AdoptNS, [[WebCascadeList alloc] initWithFont:&m_font character:baseCharacter]);

- stringAttributes.adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, fontData->getCFStringAttributes(m_font.fontDescription().typesettingFeatures(), fontData->platformData().orientation())));

- static const void* attributeKeys[] = { kCTFontCascadeListAttribute };

- const void* values[] = { cascadeList.get() };

- RetainPtr<CFDictionaryRef> attributes(AdoptCF, CFDictionaryCreate(kCFAllocatorDefault, attributeKeys, values, sizeof(attributeKeys) / sizeof(*attributeKeys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));

- RetainPtr<CTFontDescriptorRef> fontDescriptor(AdoptCF, CTFontDescriptorCreateWithAttributes(attributes.get()));

- RetainPtr<CTFontRef> fontWithCascadeList(AdoptCF, CTFontCreateCopyWithAttributes(fontData->platformData().ctFont(), m_font.fontDescription().computedPixelSize(), 0, fontDescriptor.get()));

- CFDictionarySetValue(const_cast<CFMutableDictionaryRef>(stringAttributes.get()), kCTFontAttributeName, fontWithCascadeList.get());

- } else

- stringAttributes = fontData->getCFStringAttributes(m_font.fontDescription().typesettingFeatures(), fontData->platformData().orientation());

- RetainPtr<CTLineRef> line;

- if (!m_mayUseNaturalWritingDirection || m_run.directionalOverride()) {

- static const void* optionKeys[] = { kCTTypesetterOptionForcedEmbeddingLevel };

- const short ltrForcedEmbeddingLevelValue = 0;

- const short rtlForcedEmbeddingLevelValue = 1;

- static const void* ltrOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &ltrForcedEmbeddingLevelValue) };

- static const void* rtlOptionValues[] = { CFNumberCreate(kCFAllocatorDefault, kCFNumberShortType, &rtlForcedEmbeddingLevelValue) };

- static CFDictionaryRef ltrTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, ltrOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

- static CFDictionaryRef rtlTypesetterOptions = CFDictionaryCreate(kCFAllocatorDefault, optionKeys, rtlOptionValues, WTF_ARRAY_LENGTH(optionKeys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);

-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

- ProviderInfo info = { cp, length, stringAttributes.get() };

- RetainPtr<CTTypesetterRef> typesetter(AdoptCF, WKCreateCTTypesetterWithUniCharProviderAndOptions(&provideStringAndAttributes, 0, &info, m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));

-#else

- RetainPtr<CFStringRef> string(AdoptCF, CFStringCreateWithCharactersNoCopy(kCFAllocatorDefault, cp, length, kCFAllocatorNull));

- RetainPtr<CFAttributedStringRef> attributedString(AdoptCF, CFAttributedStringCreate(kCFAllocatorDefault, string.get(), stringAttributes.get()));

- RetainPtr<CTTypesetterRef> typesetter(AdoptCF, CTTypesetterCreateWithAttributedStringAndOptions(attributedString.get(), m_run.ltr() ? ltrTypesetterOptions : rtlTypesetterOptions));

-#endif

- line.adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));

- } else {

- ProviderInfo info = { cp, length, stringAttributes.get() };

- line.adoptCF(CTLineCreateWithUniCharProvider(&provideStringAndAttributes, 0, &info));

- }

- m_coreTextLines.append(line.get());

- CFArrayRef runArray = CTLineGetGlyphRuns(line.get());

- CFIndex runCount = CFArrayGetCount(runArray);

- for (CFIndex r = 0; r < runCount; r++) {

- CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, m_run.ltr() ? r : runCount - 1 - r));

- ASSERT(CFGetTypeID(ctRun) == CTRunGetTypeID());

- CFRange runRange = CTRunGetStringRange(ctRun);

- const SimpleFontData* runFontData = fontData;

- if (isSystemFallback) {

- CFDictionaryRef runAttributes = CTRunGetAttributes(ctRun);

- CTFontRef runFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttributes, kCTFontAttributeName));

- ASSERT(CFGetTypeID(runFont) == CTFontGetTypeID());

- if (!CFEqual(runFont, fontData->platformData().ctFont())) {

- // Begin trying to see if runFont matches any of the fonts in the fallback list.

- RetainPtr<CGFontRef> runCGFont(AdoptCF, CTFontCopyGraphicsFont(runFont, 0));

- unsigned i = 0;

- for (const FontData* candidateFontData = m_font.fontDataAt(i); candidateFontData; candidateFontData = m_font.fontDataAt(++i)) {

- runFontData = candidateFontData->fontDataForCharacter(baseCharacter);

- RetainPtr<CGFontRef> cgFont(AdoptCF, CTFontCopyGraphicsFont(runFontData->platformData().ctFont(), 0));

- if (CFEqual(cgFont.get(), runCGFont.get()))

- break;

- runFontData = 0;

- }

- // If there is no matching font, look up by name in the font cache.

- if (!runFontData) {

- // Rather than using runFont as an NSFont and wrapping it in a FontPlatformData, go through

- // the font cache and ultimately through NSFontManager in order to get an NSFont with the right

- // NSFontRenderingMode.

- RetainPtr<CFStringRef> fontName(AdoptCF, CTFontCopyPostScriptName(runFont));

- if (CFEqual(fontName.get(), CFSTR("LastResort"))) {

- m_complexTextRuns.append(ComplexTextRun::create(m_font.primaryFont(), cp, stringLocation + runRange.location, runRange.length, m_run.ltr()));

- continue;

- }

- runFontData = FontCache::fontCache()->getFontData(m_font.fontDescription(), fontName.get(), false, DoNotRetain).get();

- // Core Text may have used a font that is not known to NSFontManager. In that case, fall back on

- // using the font as returned, even though it may not have the best NSFontRenderingMode.

- if (!runFontData) {

- FontPlatformData runFontPlatformData((NSFont *)runFont, CTFontGetSize(runFont), m_font.fontDescription().usePrinterFont());

- runFontData = FontCache::fontCache()->fontDataFromFontPlatformData(&runFontPlatformData, DoNotRetain).get();

- }

- if (m_fallbackFonts && runFontData != m_font.primaryFont())

- m_fallbackFonts->add(runFontData);

- }

- if (m_fallbackFonts && runFontData != m_font.primaryFont())

- m_fallbackFonts->add(fontData);

- m_complexTextRuns.append(ComplexTextRun::create(ctRun, runFontData, cp, stringLocation, length, runRange));

- }

-} // namespace WebCore