<!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>[200919] trunk/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/200919">200919</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-14 09:54:07 -0700 (Sat, 14 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allocate MacGlyphToPathTranslator / CairoGlyphToPathTranslator on the stack
https://bugs.webkit.org/show_bug.cgi?id=157690
Reviewed by Myles C. Maxfield.
Allocate MacGlyphToPathTranslator / CairoGlyphToPathTranslator on the
stack. We also now use the subclass type for the local variable so it
will bypass the vtable for various virtual function calls (if the compiler
was not already smart enough to figure this out).
* platform/graphics/cairo/FontCairo.cpp:
(WebCore::FontCascade::dashesForIntersectionsWithRect):
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::dashesForIntersectionsWithRect):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoFontCairocpp">trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200918 => 200919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-14 14:59:55 UTC (rev 200918)
+++ trunk/Source/WebCore/ChangeLog 2016-05-14 16:54:07 UTC (rev 200919)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-14 Chris Dumez <cdumez@apple.com>
+
+ Allocate MacGlyphToPathTranslator / CairoGlyphToPathTranslator on the stack
+ https://bugs.webkit.org/show_bug.cgi?id=157690
+
+ Reviewed by Myles C. Maxfield.
+
+ Allocate MacGlyphToPathTranslator / CairoGlyphToPathTranslator on the
+ stack. We also now use the subclass type for the local variable so it
+ will bypass the vtable for various virtual function calls (if the compiler
+ was not already smart enough to figure this out).
+
+ * platform/graphics/cairo/FontCairo.cpp:
+ (WebCore::FontCascade::dashesForIntersectionsWithRect):
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::dashesForIntersectionsWithRect):
+
</ins><span class="cx"> 2016-05-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed attempt to fix the iOS build after the protector variables renaming.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoFontCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp (200918 => 200919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2016-05-14 14:59:55 UTC (rev 200918)
+++ trunk/Source/WebCore/platform/graphics/cairo/FontCairo.cpp 2016-05-14 16:54:07 UTC (rev 200919)
</span><span class="lines">@@ -221,16 +221,14 @@
</span><span class="cx"> , m_translation(AffineTransform().translate(textOrigin.x(), textOrigin.y()))
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-private:
- bool containsMorePaths() override
- {
- return m_index != m_glyphBuffer.size();
- }
- Path path() override;
- std::pair<float, float> extents() override;
- GlyphUnderlineType underlineType() override;
- void advance() override;
</del><span class="cx">
</span><ins>+ bool containsMorePaths() final { return m_index != m_glyphBuffer.size(); }
+ Path path() final;
+ std::pair<float, float> extents() final;
+ GlyphUnderlineType underlineType() final;
+ void advance() final;
+
+private:
</ins><span class="cx"> int m_index;
</span><span class="cx"> const TextRun& m_textRun;
</span><span class="cx"> const GlyphBuffer& m_glyphBuffer;
</span><span class="lines">@@ -297,9 +295,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Handle SVG + non-SVG interleaved runs. https://bugs.webkit.org/show_bug.cgi?id=133778
</span><span class="cx"> FloatPoint origin = FloatPoint(textOrigin.x() + deltaX, textOrigin.y());
</span><del>- std::unique_ptr<GlyphToPathTranslator> translator = std::make_unique<CairoGlyphToPathTranslator>(run, glyphBuffer, origin);
</del><ins>+ CairoGlyphToPathTranslator translator(run, glyphBuffer, origin);
</ins><span class="cx"> DashArray result;
</span><del>- for (int index = 0; translator->containsMorePaths(); ++index, translator->advance()) {
</del><ins>+ for (int index = 0; translator.containsMorePaths(); ++index, translator.advance()) {
</ins><span class="cx"> float centerOfLine = lineExtents.y() + (lineExtents.height() / 2);
</span><span class="cx"> GlyphIterationState info = GlyphIterationState(FloatPoint(), FloatPoint(), centerOfLine, lineExtents.x() + lineExtents.width(), lineExtents.x());
</span><span class="cx"> const Font* localFontData = glyphBuffer.fontAt(index);
</span><span class="lines">@@ -308,9 +306,9 @@
</span><span class="cx"> result.clear();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- switch (translator->underlineType()) {
</del><ins>+ switch (translator.underlineType()) {
</ins><span class="cx"> case GlyphToPathTranslator::GlyphUnderlineType::SkipDescenders: {
</span><del>- Path path = translator->path();
</del><ins>+ Path path = translator.path();
</ins><span class="cx"> path.apply([&info](const PathElement& pathElement) {
</span><span class="cx"> findPathIntersections(info, pathElement);
</span><span class="cx"> });
</span><span class="lines">@@ -321,7 +319,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GlyphToPathTranslator::GlyphUnderlineType::SkipGlyph: {
</span><del>- std::pair<float, float> extents = translator->extents();
</del><ins>+ std::pair<float, float> extents = translator.extents();
</ins><span class="cx"> result.append(extents.first - lineExtents.x());
</span><span class="cx"> result.append(extents.second - lineExtents.x());
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (200918 => 200919)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-05-14 14:59:55 UTC (rev 200918)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2016-05-14 16:54:07 UTC (rev 200919)
</span><span class="lines">@@ -427,16 +427,13 @@
</span><span class="cx"> , m_translation(CGAffineTransformScale(CGAffineTransformMakeTranslation(textOrigin.x(), textOrigin.y()), 1, -1))
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-private:
- bool containsMorePaths() override
- {
- return m_index != m_glyphBuffer.size();
- }
- Path path() override;
- std::pair<float, float> extents() override;
- GlyphUnderlineType underlineType() override;
- void advance() override;
</del><ins>+ bool containsMorePaths() final { return m_index != m_glyphBuffer.size(); }
+ Path path() final;
+ std::pair<float, float> extents() final;
+ GlyphUnderlineType underlineType() final;
+ void advance() final;
</ins><span class="cx">
</span><ins>+private:
</ins><span class="cx"> int m_index;
</span><span class="cx"> const TextRun& m_textRun;
</span><span class="cx"> const GlyphBuffer& m_glyphBuffer;
</span><span class="lines">@@ -489,9 +486,9 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Handle SVG + non-SVG interleaved runs. https://bugs.webkit.org/show_bug.cgi?id=133778
</span><span class="cx"> FloatPoint origin = FloatPoint(textOrigin.x() + deltaX, textOrigin.y());
</span><del>- std::unique_ptr<GlyphToPathTranslator> translator = std::make_unique<MacGlyphToPathTranslator>(run, glyphBuffer, origin);
</del><ins>+ MacGlyphToPathTranslator translator(run, glyphBuffer, origin);
</ins><span class="cx"> DashArray result;
</span><del>- for (int index = 0; translator->containsMorePaths(); ++index, translator->advance()) {
</del><ins>+ for (int index = 0; translator.containsMorePaths(); ++index, translator.advance()) {
</ins><span class="cx"> GlyphIterationState info = GlyphIterationState(CGPointMake(0, 0), CGPointMake(0, 0), lineExtents.y(), lineExtents.y() + lineExtents.height(), lineExtents.x() + lineExtents.width(), lineExtents.x());
</span><span class="cx"> const Font* localFont = glyphBuffer.fontAt(index);
</span><span class="cx"> if (!localFont) {
</span><span class="lines">@@ -499,9 +496,9 @@
</span><span class="cx"> result.clear();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- switch (translator->underlineType()) {
</del><ins>+ switch (translator.underlineType()) {
</ins><span class="cx"> case GlyphToPathTranslator::GlyphUnderlineType::SkipDescenders: {
</span><del>- Path path = translator->path();
</del><ins>+ Path path = translator.path();
</ins><span class="cx"> CGPathApply(path.platformPath(), &info, &findPathIntersections);
</span><span class="cx"> if (info.minX < info.maxX) {
</span><span class="cx"> result.append(info.minX - lineExtents.x());
</span><span class="lines">@@ -510,7 +507,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case GlyphToPathTranslator::GlyphUnderlineType::SkipGlyph: {
</span><del>- std::pair<float, float> extents = translator->extents();
</del><ins>+ std::pair<float, float> extents = translator.extents();
</ins><span class="cx"> result.append(extents.first - lineExtents.x());
</span><span class="cx"> result.append(extents.second - lineExtents.x());
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>