<!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>[170871] 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/170871">170871</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-07-07 19:27:14 -0700 (Mon, 07 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove misleadingly-named Font::isSVGFont()
https://bugs.webkit.org/show_bug.cgi?id=134697
Reviewed by Dean Jackson.
Being a SVG font is a property of the FontData object, not
the Font object. Providing an isSVGFont() function on the
Font class will likely lead to incorrect code and non-obvious
bugs.
No new tests because there is no behavior change.
* platform/graphics/Font.h:
(WebCore::Font::isSVGFont): Deleted.
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::primaryFontDataIsSystemFont):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::constructTextRun):
* rendering/RenderBlock.cpp:
(WebCore::constructTextRunInternal):
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseFor):
* rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::constructTextRun):
* rendering/svg/SVGTextMetrics.cpp:
(WebCore::SVGTextMetrics::constructTextRun):
(WebCore::SVGTextMetrics::SVGTextMetrics):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFonth">trunk/Source/WebCore/platform/graphics/Font.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontMacmm">trunk/Source/WebCore/platform/graphics/mac/FontMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp">trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextMetricscpp">trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/ChangeLog 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-07-07 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Remove misleadingly-named Font::isSVGFont()
+ https://bugs.webkit.org/show_bug.cgi?id=134697
+
+ Reviewed by Dean Jackson.
+
+ Being a SVG font is a property of the FontData object, not
+ the Font object. Providing an isSVGFont() function on the
+ Font class will likely lead to incorrect code and non-obvious
+ bugs.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/Font.h:
+ (WebCore::Font::isSVGFont): Deleted.
+ * platform/graphics/mac/FontMac.mm:
+ (WebCore::Font::primaryFontDataIsSystemFont):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::constructTextRun):
+ * rendering/RenderBlock.cpp:
+ (WebCore::constructTextRunInternal):
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseFor):
+ * rendering/svg/SVGInlineTextBox.cpp:
+ (WebCore::SVGInlineTextBox::constructTextRun):
+ * rendering/svg/SVGTextMetrics.cpp:
+ (WebCore::SVGTextMetrics::constructTextRun):
+ (WebCore::SVGTextMetrics::SVGTextMetrics):
+
</ins><span class="cx"> 2014-07-07 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Move Gamepad index down into PlatformGamepad.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Font.h (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Font.h 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/platform/graphics/Font.h 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -157,7 +157,6 @@
</span><span class="cx"> void setLetterSpacing(float s) { m_letterSpacing = s; }
</span><span class="cx"> bool isFixedPitch() const;
</span><span class="cx"> bool isPrinterFont() const { return m_fontDescription.usePrinterFont(); }
</span><del>- bool isSVGFont() const { return primaryFont()->isSVGFont(); }
</del><span class="cx">
</span><span class="cx"> FontRenderingMode renderingMode() const { return m_fontDescription.renderingMode(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontMac.mm (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/platform/graphics/mac/FontMac.mm 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -576,7 +576,8 @@
</span><span class="cx"> bool Font::primaryFontDataIsSystemFont() const
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED > 1090
</span><del>- return !isSVGFont() && CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(primaryFont()->platformData().ctFont())).get());
</del><ins>+ const auto* fontData = primaryFont();
+ return !fontData->isSVGFont() && CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(fontData->platformData().ctFont())).get());
</ins><span class="cx"> #else
</span><span class="cx"> // System fonts are hidden by having a name that begins with a period, so simply search
</span><span class="cx"> // for that here rather than try to keep the list up to date.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx">
</span><span class="cx"> TextRun run(string, textPos(), expansion(), expansionBehavior(), direction(), dirOverride() || style.rtlOrdering() == VisualOrder, !renderer().canUseSimpleFontCodePath());
</span><span class="cx"> run.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><del>- if (font.isSVGFont())
</del><ins>+ if (font.primaryFont()->isSVGFont())
</ins><span class="cx"> run.setRenderingContext(SVGTextRunRenderingContext::create(renderer()));
</span><span class="cx">
</span><span class="cx"> // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -4114,7 +4114,7 @@
</span><span class="cx"> bool directionalOverride = style.rtlOrdering() == VisualOrder;
</span><span class="cx">
</span><span class="cx"> TextRun run(characters, length, 0, 0, expansion, textDirection, directionalOverride);
</span><del>- if (font.isSVGFont()) {
</del><ins>+ if (font.primaryFont()->isSVGFont()) {
</ins><span class="cx"> ASSERT(context); // FIXME: Thread a RenderObject& to this point so we don't have to dereference anything.
</span><span class="cx"> run.setRenderingContext(SVGTextRunRenderingContext::create(*context));
</span><span class="cx"> }
</span><span class="lines">@@ -4134,7 +4134,7 @@
</span><span class="cx"> directionalOverride |= isOverride(style.unicodeBidi());
</span><span class="cx"> }
</span><span class="cx"> TextRun run(characters, length, 0, 0, expansion, textDirection, directionalOverride);
</span><del>- if (font.isSVGFont()) {
</del><ins>+ if (font.primaryFont()->isSVGFont()) {
</ins><span class="cx"> ASSERT(context); // FIXME: Thread a RenderObject& to this point so we don't have to dereference anything.
</span><span class="cx"> run.setRenderingContext(SVGTextRunRenderingContext::create(*context));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (style.font().codePath(TextRun(textRenderer.text())) != Font::Simple)
</span><span class="cx"> return false;
</span><del>- if (style.font().isSVGFont())
</del><ins>+ if (style.font().primaryFont()->isSVGFont())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // We assume that all lines have metrics based purely on the primary font.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/rendering/svg/SVGInlineTextBox.cpp 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> , direction()
</span><span class="cx"> , dirOverride() || style->rtlOrdering() == VisualOrder /* directionalOverride */);
</span><span class="cx">
</span><del>- if (style->font().isSVGFont())
</del><ins>+ if (style->font().primaryFont()->isSVGFont())
</ins><span class="cx"> run.setRenderingContext(SVGTextRunRenderingContext::create(renderer()));
</span><span class="cx">
</span><span class="cx"> run.disableRoundingHacks();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextMetricscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp (170870 => 170871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2014-07-08 01:56:28 UTC (rev 170870)
+++ trunk/Source/WebCore/rendering/svg/SVGTextMetrics.cpp 2014-07-08 02:27:14 UTC (rev 170871)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> , style.direction()
</span><span class="cx"> , isOverride(style.unicodeBidi()) /* directionalOverride */);
</span><span class="cx">
</span><del>- if (style.font().isSVGFont())
</del><ins>+ if (style.font().primaryFont()->isSVGFont())
</ins><span class="cx"> run.setRenderingContext(SVGTextRunRenderingContext::create(text));
</span><span class="cx">
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> SVGTextMetrics::SVGTextMetrics(RenderSVGInlineText& text, unsigned position, unsigned length, float width, const String& glyphName)
</span><span class="cx"> {
</span><del>- bool needsContext = text.style().font().isSVGFont();
</del><ins>+ bool needsContext = text.style().font().primaryFont()->isSVGFont();
</ins><span class="cx"> float scalingFactor = text.scalingFactor();
</span><span class="cx"> ASSERT(scalingFactor);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>