<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[194843] tags/Safari-601.5.8.2/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/194843">194843</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-01-10 23:27:30 -0800 (Sun, 10 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/194719">r194719</a>. rdar://problem/23769758</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari601582SourceWebCoreChangeLog">tags/Safari-601.5.8.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicsFontcpp">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicsFonth">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicsFontCascadeh">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicscocoaFontCocoamm">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm</a></li>
<li><a href="#tagsSafari601582SourceWebCoreplatformgraphicsmacComplexTextControllercpp">tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari601582SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/ChangeLog (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/ChangeLog 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/ChangeLog 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-01-10 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r194719.
+
+ 2016-01-07 Matthew Hanson <matthew_hanson@apple.com>
+
+ Fix the Mavericks build after r194287. rdar://problem/23769758
+
+ Unreviewed build fix.
+
+ * platform/graphics/Font.cpp:
+ Do not implement Font::noSynthesizableFeaturesFont() on Mavericks.
+
+ * platform/graphics/Font.h:
+ No not declare Font::noSynthesizableFeaturesFont() on Mavericks.
+
+ * platform/graphics/FontCascade.h:
+ Declare the old method signature for fontForCombiningCharacterSequence on Mavericks.
+
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::fontForCombiningCharacterSequence):
+ Implement the old method (with old method signature) on Mavericks.
+
+ * platform/graphics/cocoa/FontCocoa.mm:
+ (WebCore::Font::platformCreateScaledFont):
+ Use the old implementation (prior to the merge of r194287) on Mavericks.
+ Use the new implementation (which uses noSynthesizableFeaturesFont) on > Mavericks.
+
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::collectComplexTextRuns):
+ Use the old implementation (prior to the merge of r194287) on Mavericks.
+ Use the new implementation (which uses noSynthesizableFeaturesFont) on > Mavericks.
+
</ins><span class="cx"> 2015-12-17 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r193932. rdar://problem/23886464
</span></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.cpp (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.cpp 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.cpp 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> return m_derivedFontData->smallCaps;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><ins>+#if (PLATFORM(COCOA) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> const Font& Font::noSynthesizableFeaturesFont() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_derivedFontData)
</span></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.h (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.h 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/Font.h 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -106,7 +106,9 @@
</span><span class="cx"> PassRefPtr<Font> emphasisMarkFont(const FontDescription&) const;
</span><span class="cx"> PassRefPtr<Font> brokenIdeographFont() const;
</span><span class="cx"> PassRefPtr<Font> nonSyntheticItalicFont() const;
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> const Font& noSynthesizableFeaturesFont() const;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<Font> variantFont(const FontDescription& description, FontVariant variant) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/FontCascade.h (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/FontCascade.h 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/FontCascade.h 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -191,8 +191,12 @@
</span><span class="cx"> GlyphData glyphDataForCharacter(UChar32, bool mirror, FontVariant = AutoVariant) const;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> const Font* fontForCombiningCharacterSequence(const UChar*, size_t length) const;
</span><ins>+#else
+ const Font* fontForCombiningCharacterSequence(const UChar*, size_t length, FontVariant) const;
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static bool isCJKIdeograph(UChar32);
</span><span class="cx"> static bool isCJKIdeographOrSymbol(UChar32);
</span></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -756,6 +756,7 @@
</span><span class="cx"> return controller.offsetForPosition(x, includePartialGlyphs);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> const Font* FontCascade::fontForCombiningCharacterSequence(const UChar* characters, size_t length) const
</span><span class="cx"> {
</span><span class="cx"> UChar32 baseCharacter;
</span><span class="lines">@@ -809,4 +810,65 @@
</span><span class="cx"> return Font::systemFallback();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#else
+const Font* FontCascade::fontForCombiningCharacterSequence(const UChar* characters, size_t length, FontVariant variant) const
+{
+ UChar32 baseCharacter;
+ size_t baseCharacterLength = 0;
+ U16_NEXT(characters, baseCharacterLength, length, baseCharacter);
+
+ GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, variant);
+
+ if (!baseCharacterGlyphData.glyph)
+ return 0;
+
+ if (length == baseCharacterLength)
+ return baseCharacterGlyphData.font;
+
+ bool triedBaseCharacterFont = false;
+
+ for (unsigned i = 0; !fallbackRangesAt(i).isNull(); ++i) {
+ const Font* font = fallbackRangesAt(i).fontForCharacter(baseCharacter);
+ if (!font)
+ continue;
+#if PLATFORM(IOS)
+ if (baseCharacter >= 0x0600 && baseCharacter <= 0x06ff && font->shouldNotBeUsedForArabic())
+ continue;
+#endif
+ if (variant == NormalVariant) {
+ if (font->platformData().orientation() == Vertical) {
+ if (isCJKIdeographOrSymbol(baseCharacter) && !font->hasVerticalGlyphs()) {
+ variant = BrokenIdeographVariant;
+ font = font->brokenIdeographFont().get();
+ } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientationVerticalRight) {
+ Font* verticalRightFont = font->verticalRightOrientationFont().get();
+ Glyph verticalRightGlyph = verticalRightFont->glyphForCharacter(baseCharacter);
+ if (verticalRightGlyph == baseCharacterGlyphData.glyph)
+ font = verticalRightFont;
+ } else {
+ Font* uprightFont = font->uprightOrientationFont().get();
+ Glyph uprightGlyph = uprightFont->glyphForCharacter(baseCharacter);
+ if (uprightGlyph != baseCharacterGlyphData.glyph)
+ font = uprightFont;
+ }
+ }
+ } else {
+ if (const Font* variantFont = font->variantFont(m_fontDescription, variant).get())
+ font = variantFont;
+ }
+
+ if (font == baseCharacterGlyphData.font)
+ triedBaseCharacterFont = true;
+
+ if (font->canRenderCombiningCharacterSequence(characters, length))
+ return font;
+ }
+
+ if (!triedBaseCharacterFont && baseCharacterGlyphData.font && baseCharacterGlyphData.font->canRenderCombiningCharacterSequence(characters, length))
+ return baseCharacterGlyphData.font;
+
+ return Font::systemFallback();
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
</ins></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicscocoaFontCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/cocoa/FontCocoa.mm 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -315,6 +315,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps fontVariantCaps, UChar32 character) const
</span><span class="cx"> {
</span><span class="cx"> #if (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90300) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101104)
</span><span class="lines">@@ -569,15 +570,73 @@
</span><span class="cx"> RetainPtr<CTFontRef> ctFont = createCTFontWithoutSynthesizableFeatures(m_platformData.font());
</span><span class="cx"> return createDerivativeFont(ctFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.m_syntheticBold, m_platformData.m_syntheticOblique);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<Font> Font::platformCreateScaledFont(const FontDescription&, float scaleFactor) const
</span><span class="cx"> {
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> float size = m_platformData.size() * scaleFactor;
</span><span class="cx"> CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(m_platformData.font());
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontCopyFontDescriptor(m_platformData.font()));
</span><span class="cx"> RetainPtr<CTFontRef> scaledFont = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
</span><span class="cx">
</span><span class="cx"> return createDerivativeFont(scaledFont.get(), size, m_platformData.orientation(), fontTraits, m_platformData.m_syntheticBold, m_platformData.m_syntheticOblique);
</span><ins>+#else
+#if !CORETEXT_WEB_FONTS
+ if (isCustomFont()) {
+ FontPlatformData scaledFontData(m_platformData);
+ scaledFontData.m_size = scaledFontData.m_size * scaleFactor;
+ return Font::create(scaledFontData, true, false);
+ }
+#endif
+
+ float size = m_platformData.size() * scaleFactor;
+
+#if USE(APPKIT)
+ BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
+ FontPlatformData scaledFontData(reinterpret_cast<CTFontRef>([[NSFontManager sharedFontManager] convertFont:m_platformData.nsFont() toSize:size]), size, false, false, m_platformData.orientation());
+
+ if (scaledFontData.font()) {
+ NSFontManager *fontManager = [NSFontManager sharedFontManager];
+ NSFontTraitMask fontTraits = [fontManager traitsOfFont:m_platformData.nsFont()];
+
+ if (m_platformData.m_syntheticBold)
+ fontTraits |= NSBoldFontMask;
+ if (m_platformData.m_syntheticOblique)
+ fontTraits |= NSItalicFontMask;
+
+ NSFontTraitMask scaledFontTraits = [fontManager traitsOfFont:scaledFontData.nsFont()];
+ scaledFontData.m_syntheticBold = (fontTraits & NSBoldFontMask) && !(scaledFontTraits & NSBoldFontMask);
+ scaledFontData.m_syntheticOblique = (fontTraits & NSItalicFontMask) && !(scaledFontTraits & NSItalicFontMask);
+
+ return Font::create(scaledFontData);
+ }
+ END_BLOCK_OBJC_EXCEPTIONS;
+
+ return nullptr;
+#else
+ CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(m_platformData.font());
+ RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontCopyFontDescriptor(m_platformData.font()));
+ RetainPtr<CTFontRef> scaledFont = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
+ FontPlatformData scaledFontData(scaledFont.get(), size, false, false, m_platformData.orientation());
+
+ if (scaledFontData.font()) {
+ if (m_platformData.m_syntheticBold)
+ fontTraits |= kCTFontBoldTrait;
+ if (m_platformData.m_syntheticOblique)
+ fontTraits |= kCTFontItalicTrait;
+
+ CTFontSymbolicTraits scaledFontTraits = CTFontGetSymbolicTraits(scaledFontData.font());
+ scaledFontData.m_syntheticBold = (fontTraits & kCTFontBoldTrait) && !(scaledFontTraits & kCTFontTraitBold);
+ scaledFontData.m_syntheticOblique = (fontTraits & kCTFontItalicTrait) && !(scaledFontTraits & kCTFontTraitItalic);
+
+ return Font::create(scaledFontData);
+ }
+
+ return nullptr;
+#endif
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Font::determinePitch()
</span></span></pre></div>
<a id="tagsSafari601582SourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (194842 => 194843)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-01-11 07:22:02 UTC (rev 194842)
+++ tags/Safari-601.5.8.2/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2016-01-11 07:27:30 UTC (rev 194843)
</span><span class="lines">@@ -305,6 +305,7 @@
</span><span class="cx">
</span><span class="cx"> void ComplexTextController::collectComplexTextRuns()
</span><span class="cx"> {
</span><ins>+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
</ins><span class="cx"> if (!m_end)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -431,6 +432,101 @@
</span><span class="cx">
</span><span class="cx"> if (!m_run.ltr())
</span><span class="cx"> m_complexTextRuns.reverse();
</span><ins>+#else
+ if (!m_end)
+ return;
+
+ // We break up glyph run generation for the string by Font.
+ 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())
+ m_smallCapsBuffer.resize(m_end);
+
+ unsigned indexOfFontTransition = 0;
+ const UChar* curr = cp;
+ const UChar* end = cp + m_end;
+
+ const Font* font;
+ bool isMissingGlyph;
+ const Font* nextFont;
+ bool nextIsMissingGlyph;
+
+ unsigned markCount;
+ const UChar* sequenceStart = curr;
+ UChar32 baseCharacter;
+ if (!advanceByCombiningCharacterSequence(curr, end, baseCharacter, markCount))
+ return;
+
+ UChar uppercaseCharacter = 0;
+
+ bool isSmallCaps;
+ bool nextIsSmallCaps = m_font.isSmallCaps() && !(U_GET_GC_MASK(baseCharacter) & U_GC_M_MASK) && (uppercaseCharacter = u_toupper(baseCharacter)) != baseCharacter;
+ ASSERT(uppercaseCharacter == 0 || u_toupper(baseCharacter) <= 0xFFFF);
+
+ if (nextIsSmallCaps) {
+ m_smallCapsBuffer[sequenceStart - cp] = uppercaseCharacter;
+ for (unsigned i = 0; i < markCount; ++i)
+ m_smallCapsBuffer[sequenceStart - cp + i + 1] = sequenceStart[i + 1];
+ }
+
+ nextIsMissingGlyph = false;
+ nextFont = m_font.fontForCombiningCharacterSequence(sequenceStart, curr - sequenceStart, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
+ if (!nextFont)
+ nextIsMissingGlyph = true;
+
+ while (curr < end) {
+ font = nextFont;
+ isMissingGlyph = nextIsMissingGlyph;
+ isSmallCaps = nextIsSmallCaps;
+ int index = curr - cp;
+
+ if (!advanceByCombiningCharacterSequence(curr, end, baseCharacter, markCount))
+ return;
+
+ if (m_font.isSmallCaps()) {
+ ASSERT(u_toupper(baseCharacter) <= 0xFFFF);
+ uppercaseCharacter = u_toupper(baseCharacter);
+ nextIsSmallCaps = uppercaseCharacter != baseCharacter;
+ if (nextIsSmallCaps) {
+ m_smallCapsBuffer[index] = uppercaseCharacter;
+ for (unsigned i = 0; i < markCount; ++i)
+ m_smallCapsBuffer[index + i + 1] = cp[index + i + 1];
+ }
+ }
+
+ nextIsMissingGlyph = false;
+ if (baseCharacter == zeroWidthJoiner)
+ nextFont = font;
+ else {
+ nextFont = m_font.fontForCombiningCharacterSequence(cp + index, curr - cp - index, nextIsSmallCaps ? SmallCapsVariant : NormalVariant);
+ if (!nextFont)
+ nextIsMissingGlyph = true;
+ }
+
+ if (nextFont != font || nextIsMissingGlyph != isMissingGlyph) {
+ int itemStart = static_cast<int>(indexOfFontTransition);
+ int itemLength = index - indexOfFontTransition;
+ collectComplexTextRunsForCharacters((isSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, !isMissingGlyph ? font : 0);
+ indexOfFontTransition = index;
+ }
+ }
+
+ int itemLength = m_end - indexOfFontTransition;
+ if (itemLength) {
+ int itemStart = indexOfFontTransition;
+ collectComplexTextRunsForCharacters((nextIsSmallCaps ? m_smallCapsBuffer.data() : cp) + itemStart, itemLength, itemStart, !nextIsMissingGlyph ? nextFont : 0);
+ }
+
+ if (!m_run.ltr())
+ m_complexTextRuns.reverse();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CFIndex ComplexTextController::ComplexTextRun::indexAt(size_t i) const
</span></span></pre>
</div>
</div>
</body>
</html>