<!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>[211836] trunk</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/211836">211836</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-02-07 13:37:44 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] [GTK] [EFL] Compile (but don't use, yet) the platform-independent piece of ComplexTextController
https://bugs.webkit.org/show_bug.cgi?id=167927
Reviewed by Brent Fulgham.
Source/WebCore:
This patch simply moves some functions around to enable the Win, GTK, and EFL ports to compile the
platform-independent pieces of ComplexTextController. Those parts of ComplexTextController have
some dependencies which were previously only available on the Cocoa ports; however, those
dependencies are easily created or moved from elsewhere. The next step is to populate the
ComplexTextController::collectComplexTextRunsForCharacters() function for DirectWrite and HarfBuzz.
Once that is done, UniscribeController and HarfBuzzShaper can be deleted.
Adds ComplexTextController TestWebKitAPI tests to the Win and GTK ports.
* CMakeLists.txt: Everyone can compile the platform-independent piece of ComplexTextController.
* PlatformEfl.cmake: Add the HarfBuzz-specific piece.
* PlatformGTK.cmake: Ditto.
* PlatformWin.cmake: Add the DirectWrite-specific piece.
* platform/graphics/ComplexTextController.cpp:
(WebCore::TextLayoutDeleter::operator()): ComplexTextController shouldn't be enabled yet for Win,
GTK, or EFL.
(WebCore::FontCascade::createLayout): Ditto.
(WebCore::FontCascade::width): Ditto.
(WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Moved shared code to the shared
file.
* platform/graphics/Font.cpp:
(WebCore::Font::noSynthesizableFeaturesFont): Default implementation for other ports.
(WebCore::Font::variantCapsSupportsCharacterForSynthesis): Ditto.
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::fontForCombiningCharacterSequence): Ditto.
(WebCore::FontCascade::drawEmphasisMarksForComplexText): Ditto.
(WebCore::FontCascade::createLayout): Deleted. Moved to ComplexTextController.
(WebCore::TextLayoutDeleter::operator()): Deleted. Ditto.
* platform/graphics/FontCascade.h: fontForCombiningCharacterSequence() should exist on all ports.
* platform/graphics/cairo/FontCairoHarfbuzzNG.cpp:
(WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Shared among all ports.
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Ditto.
* platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp: Added.
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Empty implementation of
HarfBuzz-specific piece of ComplexTextController.
* platform/graphics/mac/ComplexTextControllerCoreText.mm: Moved constructors to shared file.
* platform/graphics/win/ComplexTextControllerDirectWrite.cpp: Added.
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Empty implementation of
Direct Write-specific piece of ComplexTextController.
* platform/graphics/win/FontWin.cpp:
(WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Shared among all ports.
Tools:
Enable ComplexTextController API tests on the Win and GTK ports.
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/PlatformWin.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsComplexTextControllerh">trunk/Source/WebCore/platform/graphics/ComplexTextController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontcpp">trunk/Source/WebCore/platform/graphics/Font.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoFontCairoHarfbuzzNGcpp">trunk/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontWincpp">trunk/Source/WebCore/platform/graphics/win/FontWin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWincmake">trunk/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreComplexTextControllercpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsharfbuzzComplexTextControllerHarfBuzzcpp">trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinComplexTextControllerDirectWritecpp">trunk/Source/WebCore/platform/graphics/win/ComplexTextControllerDirectWrite.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -2169,6 +2169,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/BitmapImage.cpp
</span><span class="cx"> platform/graphics/Color.cpp
</span><ins>+ platform/graphics/ComplexTextController.cpp
</ins><span class="cx"> platform/graphics/CrossfadeGeneratedImage.cpp
</span><span class="cx"> platform/graphics/DisplayRefreshMonitorClient.cpp
</span><span class="cx"> platform/graphics/ExtendedColor.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/ChangeLog 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2017-02-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Win] [GTK] [EFL] Compile (but don't use, yet) the platform-independent piece of ComplexTextController
+ https://bugs.webkit.org/show_bug.cgi?id=167927
+
+ Reviewed by Brent Fulgham.
+
+ This patch simply moves some functions around to enable the Win, GTK, and EFL ports to compile the
+ platform-independent pieces of ComplexTextController. Those parts of ComplexTextController have
+ some dependencies which were previously only available on the Cocoa ports; however, those
+ dependencies are easily created or moved from elsewhere. The next step is to populate the
+ ComplexTextController::collectComplexTextRunsForCharacters() function for DirectWrite and HarfBuzz.
+ Once that is done, UniscribeController and HarfBuzzShaper can be deleted.
+
+ Adds ComplexTextController TestWebKitAPI tests to the Win and GTK ports.
+
+ * CMakeLists.txt: Everyone can compile the platform-independent piece of ComplexTextController.
+ * PlatformEfl.cmake: Add the HarfBuzz-specific piece.
+ * PlatformGTK.cmake: Ditto.
+ * PlatformWin.cmake: Add the DirectWrite-specific piece.
+ * platform/graphics/ComplexTextController.cpp:
+ (WebCore::TextLayoutDeleter::operator()): ComplexTextController shouldn't be enabled yet for Win,
+ GTK, or EFL.
+ (WebCore::FontCascade::createLayout): Ditto.
+ (WebCore::FontCascade::width): Ditto.
+ (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun): Moved shared code to the shared
+ file.
+ * platform/graphics/Font.cpp:
+ (WebCore::Font::noSynthesizableFeaturesFont): Default implementation for other ports.
+ (WebCore::Font::variantCapsSupportsCharacterForSynthesis): Ditto.
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::fontForCombiningCharacterSequence): Ditto.
+ (WebCore::FontCascade::drawEmphasisMarksForComplexText): Ditto.
+ (WebCore::FontCascade::createLayout): Deleted. Moved to ComplexTextController.
+ (WebCore::TextLayoutDeleter::operator()): Deleted. Ditto.
+ * platform/graphics/FontCascade.h: fontForCombiningCharacterSequence() should exist on all ports.
+ * platform/graphics/cairo/FontCairoHarfbuzzNG.cpp:
+ (WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Shared among all ports.
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Ditto.
+ * platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp: Added.
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Empty implementation of
+ HarfBuzz-specific piece of ComplexTextController.
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm: Moved constructors to shared file.
+ * platform/graphics/win/ComplexTextControllerDirectWrite.cpp: Added.
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters): Empty implementation of
+ Direct Write-specific piece of ComplexTextController.
+ * platform/graphics/win/FontWin.cpp:
+ (WebCore::FontCascade::drawEmphasisMarksForComplexText): Deleted. Shared among all ports.
+
</ins><span class="cx"> 2017-02-07 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Revert r166597
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -138,6 +138,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/gstreamer/ImageGStreamerCairo.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
</ins><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFace.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzShaper.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/gstreamer/ImageGStreamerCairo.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp
</ins><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFace.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
</span><span class="cx"> platform/graphics/harfbuzz/HarfBuzzShaper.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/PlatformWin.cmake 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><span class="cx"> platform/graphics/win/ColorDirect2D.cpp
</span><ins>+ platform/graphics/win/ComplexTextControllerDirectWrite.cpp
</ins><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><span class="cx"> platform/graphics/win/FloatPointDirect2D.cpp
</span><span class="cx"> platform/graphics/win/FloatRectDirect2D.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -92,19 +92,39 @@
</span><span class="cx">
</span><span class="cx"> void TextLayoutDeleter::operator()(TextLayout* layout) const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> delete layout;
</span><ins>+#else
+ ASSERT_UNUSED(layout, !layout);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<TextLayout, TextLayoutDeleter> FontCascade::createLayout(RenderText& text, float xPos, bool collapseWhiteSpace) const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!collapseWhiteSpace || !TextLayout::isNeeded(text, *this))
</span><span class="cx"> return nullptr;
</span><span class="cx"> return std::unique_ptr<TextLayout, TextLayoutDeleter>(new TextLayout(text, *this, xPos));
</span><ins>+#else
+ UNUSED_PARAM(text);
+ UNUSED_PARAM(xPos);
+ UNUSED_PARAM(collapseWhiteSpace);
+ return nullptr;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float FontCascade::width(TextLayout& layout, unsigned from, unsigned len, HashSet<const Font*>* fallbackFonts)
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> return layout.width(from, len, fallbackFonts);
</span><ins>+#else
+ UNUSED_PARAM(layout);
+ UNUSED_PARAM(from);
+ UNUSED_PARAM(len);
+ UNUSED_PARAM(fallbackFonts);
+ ASSERT_NOT_REACHED();
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ComplexTextController::computeExpansionOpportunity()
</span><span class="lines">@@ -703,7 +723,6 @@
</span><span class="cx"> const CGGlyph* glyphs = complexTextRun.glyphs();
</span><span class="cx"> const FloatSize* advances = complexTextRun.baseAdvances();
</span><span class="cx">
</span><del>- bool lastRun = runIndex + 1 == runCount;
</del><span class="cx"> float spaceWidth = font.spaceWidth() - font.syntheticBoldOffset();
</span><span class="cx"> const UChar* cp = complexTextRun.characters();
</span><span class="cx"> FloatPoint glyphOrigin;
</span><span class="lines">@@ -720,14 +739,6 @@
</span><span class="cx"> isMonotonic = false;
</span><span class="cx"> }
</span><span class="cx"> UChar ch = *(cp + characterIndex);
</span><del>- bool lastGlyph = lastRun && i + 1 == glyphCount;
- UChar nextCh;
- if (lastGlyph)
- nextCh = ' ';
- else if (i + 1 < glyphCount)
- nextCh = *(cp + complexTextRun.indexAt(i + 1));
- else
- nextCh = *(m_complexTextRuns[runIndex + 1]->characters() + m_complexTextRuns[runIndex + 1]->indexAt(0));
</del><span class="cx">
</span><span class="cx"> bool treatAsSpace = FontCascade::treatAsSpace(ch);
</span><span class="cx"> CGGlyph glyph = treatAsSpace ? font.spaceGlyph() : glyphs[i];
</span><span class="lines">@@ -830,4 +841,51 @@
</span><span class="cx"> m_totalWidth += widthSinceLastCommit;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// 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 Font& font, const UChar* characters, unsigned stringLocation, unsigned stringLength, unsigned indexBegin, unsigned indexEnd, bool ltr)
+ : m_font(font)
+ , m_characters(characters)
+ , m_stringLength(stringLength)
+ , m_indexBegin(indexBegin)
+ , m_indexEnd(indexEnd)
+ , m_stringLocation(stringLocation)
+ , m_isLTR(ltr)
+{
+ auto runLengthInCodeUnits = m_indexEnd - m_indexBegin;
+ m_coreTextIndices.reserveInitialCapacity(runLengthInCodeUnits);
+ unsigned r = m_indexBegin;
+ while (r < m_indexEnd) {
+ m_coreTextIndices.uncheckedAppend(r);
+ UChar32 character;
+ U16_NEXT(m_characters, r, m_stringLength, character);
+ }
+ m_glyphCount = m_coreTextIndices.size();
+ if (!ltr) {
+ for (unsigned r = 0, end = m_glyphCount - 1; r < m_glyphCount / 2; ++r, --end)
+ std::swap(m_coreTextIndices[r], m_coreTextIndices[end]);
+ }
+
+ // Synthesize a run of missing glyphs.
+ m_glyphs.fill(0, m_glyphCount);
+ m_baseAdvances.fill(FloatSize(m_font.widthForGlyph(0), 0), m_glyphCount);
+}
+
+ComplexTextController::ComplexTextRun::ComplexTextRun(const Vector<FloatSize>& advances, const Vector<FloatPoint>& origins, const Vector<Glyph>& glyphs, const Vector<unsigned>& stringIndices, FloatSize initialAdvance, const Font& font, const UChar* characters, unsigned stringLocation, unsigned stringLength, unsigned indexBegin, unsigned indexEnd, bool ltr)
+ : m_baseAdvances(advances)
+ , m_glyphOrigins(origins)
+ , m_glyphs(glyphs)
+ , m_coreTextIndices(stringIndices)
+ , m_initialAdvance(initialAdvance)
+ , m_font(font)
+ , m_characters(characters)
+ , m_stringLength(stringLength)
+ , m_indexBegin(indexBegin)
+ , m_indexEnd(indexEnd)
+ , m_glyphCount(glyphs.size())
+ , m_stringLocation(stringLocation)
+ , m_isLTR(ltr)
+{
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsComplexTextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.h (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ComplexTextController.h 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.h 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -195,7 +195,9 @@
</span><span class="cx"> Vector<unsigned, 16> m_runIndices;
</span><span class="cx"> Vector<unsigned, 16> m_glyphCountFromStartToIndex;
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> Vector<RetainPtr<CTLineRef>> m_coreTextLines;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> Vector<String> m_stringsFor8BitRuns;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/Font.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -292,9 +292,9 @@
</span><span class="cx"> return m_derivedFontData->smallCaps.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> const Font& Font::noSynthesizableFeaturesFont() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!m_derivedFontData)
</span><span class="cx"> m_derivedFontData = std::make_unique<DerivedFonts>(isCustomFont());
</span><span class="cx"> if (!m_derivedFontData->noSynthesizableFeatures)
</span><span class="lines">@@ -301,8 +301,10 @@
</span><span class="cx"> m_derivedFontData->noSynthesizableFeatures = createFontWithoutSynthesizableFeatures();
</span><span class="cx"> ASSERT(m_derivedFontData->noSynthesizableFeatures != this);
</span><span class="cx"> return *m_derivedFontData->noSynthesizableFeatures;
</span><ins>+#else
+ return *this;
+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> const Font* Font::emphasisMarkFont(const FontDescription& fontDescription) const
</span><span class="cx"> {
</span><span class="lines">@@ -505,4 +507,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+bool Font::variantCapsSupportsCharacterForSynthesis(FontVariantCaps, UChar32) const
+{
+ return false;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -431,25 +431,6 @@
</span><span class="cx"> return m_fonts->glyphDataForCharacter(c, m_fontDescription, variant);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
-
-std::unique_ptr<TextLayout, TextLayoutDeleter> FontCascade::createLayout(RenderText&, float, bool) const
-{
- return nullptr;
-}
-
-void TextLayoutDeleter::operator()(TextLayout*) const
-{
-}
-
-float FontCascade::width(TextLayout&, unsigned, unsigned, HashSet<const Font*>*)
-{
- ASSERT_NOT_REACHED();
- return 0;
-}
-
-#endif
-
</del><span class="cx"> static const char* fontFamiliesWithInvalidCharWidth[] = {
</span><span class="cx"> "American Typewriter",
</span><span class="cx"> "Arial Hebrew",
</span><span class="lines">@@ -1468,5 +1449,30 @@
</span><span class="cx"> return offset;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+// FIXME: Unify this with the macOS and iOS implementation.
+const Font* FontCascade::fontForCombiningCharacterSequence(const UChar* characters, size_t length) const
+{
+ UChar32 baseCharacter;
+ size_t baseCharacterLength = 0;
+ U16_NEXT(characters, baseCharacterLength, length, baseCharacter);
+ GlyphData baseCharacterGlyphData = glyphDataForCharacter(baseCharacter, false, NormalVariant);
</ins><span class="cx">
</span><ins>+ if (!baseCharacterGlyphData.glyph)
+ return nullptr;
+ return baseCharacterGlyphData.font;
</ins><span class="cx"> }
</span><ins>+#endif
+
+void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, unsigned to) const
+{
+ GlyphBuffer glyphBuffer;
+ float initialAdvance = getGlyphsAndAdvancesForComplexText(run, from, to, glyphBuffer, ForTextEmphasis);
+
+ if (glyphBuffer.isEmpty())
+ return;
+
+ drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -184,10 +184,8 @@
</span><span class="cx"> const Font& primaryFont() const;
</span><span class="cx"> const FontRanges& fallbackRangesAt(unsigned) const;
</span><span class="cx"> GlyphData glyphDataForCharacter(UChar32, bool mirror, FontVariant = AutoVariant) const;
</span><del>-
-#if PLATFORM(COCOA)
</del><ins>+
</ins><span class="cx"> const Font* fontForCombiningCharacterSequence(const UChar*, size_t length) const;
</span><del>-#endif
</del><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="trunkSourceWebCoreplatformgraphicscairoFontCairoHarfbuzzNGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/cairo/FontCairoHarfbuzzNG.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -52,11 +52,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& /* context */, const TextRun& /* run */, const AtomicString& /* mark */, const FloatPoint& /* point */, unsigned /* from */, unsigned /* to */) const
-{
- notImplemented();
-}
-
</del><span class="cx"> bool FontCascade::canReturnFallbackFontsForComplexText()
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -531,17 +531,6 @@
</span><span class="cx"> return initialAdvance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, unsigned to) const
-{
- GlyphBuffer glyphBuffer;
- float initialAdvance = getGlyphsAndAdvancesForComplexText(run, from, to, glyphBuffer, ForTextEmphasis);
-
- if (glyphBuffer.isEmpty())
- return;
-
- drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
-}
-
</del><span class="cx"> float FontCascade::floatWidthForComplexText(const TextRun& run, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
</span><span class="cx"> {
</span><span class="cx"> ComplexTextController controller(*this, run, true, fallbackFonts);
</span><span class="lines">@@ -560,6 +549,7 @@
</span><span class="cx"> return controller.offsetForPosition(x, includePartialGlyphs);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// FIXME: Use this on all ports.
</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></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsharfbuzzComplexTextControllerHarfBuzzcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp (0 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+* Copyright (C) 2017 Apple Inc. All rights reserved.
+*
+* 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 "ComplexTextController.h"
+
+namespace WebCore {
+
+void ComplexTextController::collectComplexTextRunsForCharacters(const UChar*, unsigned, unsigned, const Font*)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "ComplexTextController.h"
</span><span class="cx">
</span><span class="cx"> #include "CoreTextSPI.h"
</span><span class="lines">@@ -165,54 +164,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// 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 Font& font, const UChar* characters, unsigned stringLocation, unsigned stringLength, unsigned indexBegin, unsigned indexEnd, bool ltr)
- : m_font(font)
- , m_characters(characters)
- , m_stringLength(stringLength)
- , m_indexBegin(indexBegin)
- , m_indexEnd(indexEnd)
- , m_stringLocation(stringLocation)
- , m_isLTR(ltr)
-{
- auto runLengthInCodeUnits = m_indexEnd - m_indexBegin;
- m_coreTextIndices.reserveInitialCapacity(runLengthInCodeUnits);
- unsigned r = m_indexBegin;
- while (r < m_indexEnd) {
- m_coreTextIndices.uncheckedAppend(r);
- UChar32 character;
- U16_NEXT(m_characters, r, m_stringLength, character);
- }
- m_glyphCount = m_coreTextIndices.size();
- if (!ltr) {
- for (unsigned r = 0, end = m_glyphCount - 1; r < m_glyphCount / 2; ++r, --end)
- std::swap(m_coreTextIndices[r], m_coreTextIndices[end]);
- }
-
- // Synthesize a run of missing glyphs.
- m_glyphs.fill(0, m_glyphCount);
- m_baseAdvances.fill(FloatSize(m_font.widthForGlyph(0), 0), m_glyphCount);
-}
-
-
-ComplexTextController::ComplexTextRun::ComplexTextRun(const Vector<FloatSize>& advances, const Vector<FloatPoint>& origins, const Vector<Glyph>& glyphs, const Vector<unsigned>& stringIndices, FloatSize initialAdvance, const Font& font, const UChar* characters, unsigned stringLocation, unsigned stringLength, unsigned indexBegin, unsigned indexEnd, bool ltr)
- : m_baseAdvances(advances)
- , m_glyphOrigins(origins)
- , m_glyphs(glyphs)
- , m_coreTextIndices(stringIndices)
- , m_initialAdvance(initialAdvance)
- , m_font(font)
- , m_characters(characters)
- , m_stringLength(stringLength)
- , m_indexBegin(indexBegin)
- , m_indexEnd(indexEnd)
- , m_glyphCount(glyphs.size())
- , m_stringLocation(stringLocation)
- , m_isLTR(ltr)
-{
-}
-
</del><span class="cx"> struct ProviderInfo {
</span><span class="cx"> const UChar* cp;
</span><span class="cx"> unsigned length;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinComplexTextControllerDirectWritecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/win/ComplexTextControllerDirectWrite.cpp (0 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ComplexTextControllerDirectWrite.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/win/ComplexTextControllerDirectWrite.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+* Copyright (C) 2017 Apple Inc. All rights reserved.
+*
+* 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 "ComplexTextController.h"
+
+namespace WebCore {
+
+void ComplexTextController::collectComplexTextRunsForCharacters(const UChar*, unsigned, unsigned, const Font*)
+{
+ // FIXME: Implement this.
+ ASSERT_NOT_REACHED();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontWin.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontWin.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Source/WebCore/platform/graphics/win/FontWin.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -91,17 +91,6 @@
</span><span class="cx"> return beforeWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FontCascade::drawEmphasisMarksForComplexText(GraphicsContext& context, const TextRun& run, const AtomicString& mark, const FloatPoint& point, unsigned from, unsigned to) const
-{
- GlyphBuffer glyphBuffer;
- float initialAdvance = getGlyphsAndAdvancesForComplexText(run, from, to, glyphBuffer, ForTextEmphasis);
-
- if (glyphBuffer.isEmpty())
- return;
-
- drawEmphasisMarks(context, glyphBuffer, mark, FloatPoint(point.x() + initialAdvance, point.y()));
-}
-
</del><span class="cx"> float FontCascade::floatWidthForComplexText(const TextRun& run, HashSet<const Font*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
</span><span class="cx"> {
</span><span class="cx"> UniscribeController controller(this, run, fallbackFonts);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Tools/ChangeLog 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Win] [GTK] [EFL] Compile (but don't use, yet) the platform-independent piece of ComplexTextController
+ https://bugs.webkit.org/show_bug.cgi?id=167927
+
+ Reviewed by Brent Fulgham.
+
+ Enable ComplexTextController API tests on the Win and GTK ports.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+
</ins><span class="cx"> 2017-02-07 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> File index appended to previous file in svn-create-patch with SVN 1.9
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx"> ${test_main_SOURCES}
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/TestsController.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/ComplexTextController.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/FileSystem.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/GridPosition.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/HTMLParserIdioms.cpp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/TestsController.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/AffineTransform.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/CalculationValue.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WebCore/ComplexTextController.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/CSSParser.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/FloatRect.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/FloatPoint.cpp
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp (211835 => 211836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp 2017-02-07 21:29:50 UTC (rev 211835)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ComplexTextController.cpp 2017-02-07 21:37:44 UTC (rev 211836)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> runs.append(WTFMove(run2));
</span><span class="cx"> ComplexTextController controller(font, textRun, runs);
</span><span class="cx">
</span><del>- CGFloat totalWidth = 0;
</del><ins>+ float totalWidth = 0;
</ins><span class="cx"> for (size_t i = 1; i < advances.size(); ++i)
</span><span class="cx"> totalWidth += advances[i].width();
</span><span class="cx"> EXPECT_NEAR(controller.totalWidth(), spaceWidth + totalWidth, 0.0001);
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> runs.append(WTFMove(run));
</span><span class="cx"> ComplexTextController controller(font, textRun, runs);
</span><span class="cx">
</span><del>- CGFloat totalWidth = 0;
</del><ins>+ float totalWidth = 0;
</ins><span class="cx"> for (size_t i = 1; i < advances.size(); ++i)
</span><span class="cx"> totalWidth += advances[i].width();
</span><span class="cx"> EXPECT_NEAR(controller.totalWidth(), totalWidth, 0.0001);
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> runs.append(WTFMove(run3));
</span><span class="cx"> ComplexTextController controller(font, textRun, runs);
</span><span class="cx">
</span><del>- CGFloat totalWidth = 14.0397830018083 + 12.0 + 43.8119349005425;
</del><ins>+ float totalWidth = 14.0397830018083 + 12.0 + 43.8119349005425;
</ins><span class="cx"> EXPECT_NEAR(controller.totalWidth(), totalWidth, 0.0001);
</span><span class="cx"> GlyphBuffer glyphBuffer;
</span><span class="cx"> EXPECT_NEAR(controller.runWidthSoFar(), 0, 0.0001);
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> runs.append(WTFMove(run));
</span><span class="cx"> ComplexTextController controller(font, textRun, runs);
</span><span class="cx">
</span><del>- CGFloat totalWidth = 100 + 24;
</del><ins>+ float totalWidth = 100 + 24;
</ins><span class="cx"> EXPECT_NEAR(controller.totalWidth(), totalWidth, 0.0001);
</span><span class="cx"> GlyphBuffer glyphBuffer;
</span><span class="cx"> EXPECT_NEAR(controller.runWidthSoFar(), 0, 0.0001);
</span></span></pre>
</div>
</div>
</body>
</html>