<!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>[177975] 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/177975">177975</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-01-06 11:21:28 -0800 (Tue, 06 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename SimpleFontData::AdditionalFontData to SimpleFontData::SVGData
https://bugs.webkit.org/show_bug.cgi?id=140124
Reviewed by Anders Carlsson.
The current name is vague and confusing (as AdditionalFontData is not a FontData).
* platform/graphics/FontGlyphs.cpp:
(WebCore::FontGlyphs::glyphDataForCharacter):
* platform/graphics/SimpleFontData.cpp:
(WebCore::SimpleFontData::SimpleFontData):
(WebCore::SimpleFontData::~SimpleFontData):
(WebCore::fillGlyphPage):
(WebCore::SimpleFontData::createScaledFontData):
* platform/graphics/SimpleFontData.h:
(WebCore::SimpleFontData::widthForGlyph):
* rendering/svg/SVGTextLayoutEngineSpacing.cpp:
(WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
* rendering/svg/SVGTextRunRenderingContext.cpp:
(WebCore::svgFontAndFontFaceElementForFontData):
* svg/SVGFontData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontGlyphscpp">trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatacpp">trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsSimpleFontDatah">trunk/Source/WebCore/platform/graphics/SimpleFontData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutEngineSpacingcpp">trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextRunRenderingContextcpp">trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontDatah">trunk/Source/WebCore/svg/SVGFontData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/ChangeLog 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-06 Antti Koivisto <antti@apple.com>
+
+ Rename SimpleFontData::AdditionalFontData to SimpleFontData::SVGData
+ https://bugs.webkit.org/show_bug.cgi?id=140124
+
+ Reviewed by Anders Carlsson.
+
+ The current name is vague and confusing (as AdditionalFontData is not a FontData).
+
+ * platform/graphics/FontGlyphs.cpp:
+ (WebCore::FontGlyphs::glyphDataForCharacter):
+ * platform/graphics/SimpleFontData.cpp:
+ (WebCore::SimpleFontData::SimpleFontData):
+ (WebCore::SimpleFontData::~SimpleFontData):
+ (WebCore::fillGlyphPage):
+ (WebCore::SimpleFontData::createScaledFontData):
+ * platform/graphics/SimpleFontData.h:
+ (WebCore::SimpleFontData::widthForGlyph):
+ * rendering/svg/SVGTextLayoutEngineSpacing.cpp:
+ (WebCore::SVGTextLayoutEngineSpacing::calculateSVGKerning):
+ * rendering/svg/SVGTextRunRenderingContext.cpp:
+ (WebCore::svgFontAndFontFaceElementForFontData):
+ * svg/SVGFontData.h:
+
</ins><span class="cx"> 2015-01-06 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make explicit which TextIndicator animations are driven manually, and which run automatically
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontGlyphscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/platform/graphics/FontGlyphs.cpp 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> return const_cast<GlyphPage*>(simpleFontData->glyphPage(pageNumber));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GlyphData FontGlyphs::glyphDataForCharacter( UChar32 c, const FontDescription& description, FontDataVariant variant)
</del><ins>+GlyphData FontGlyphs::glyphDataForCharacter(UChar32 c, const FontDescription& description, FontDataVariant variant)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(variant != AutoVariant);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.cpp 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -76,9 +76,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SimpleFontData::SimpleFontData(std::unique_ptr<AdditionalFontData> fontData, float fontSize, bool syntheticBold, bool syntheticItalic)
</del><ins>+SimpleFontData::SimpleFontData(std::unique_ptr<SVGData> svgData, float fontSize, bool syntheticBold, bool syntheticItalic)
</ins><span class="cx"> : m_platformData(FontPlatformData(fontSize, syntheticBold, syntheticItalic))
</span><del>- , m_fontData(WTF::move(fontData))
</del><ins>+ , m_svgData(WTF::move(svgData))
</ins><span class="cx"> , m_treatAsFixedPitch(false)
</span><span class="cx"> , m_isCustomFont(true)
</span><span class="cx"> , m_isLoading(false)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> , m_shouldNotBeUsedForArabic(false)
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><del>- m_fontData->initializeFontData(this, fontSize);
</del><ins>+ m_svgData->initializeFontData(this, fontSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Estimates of avgCharWidth and maxCharWidth for platforms that don't support accessing these values from the font.
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> SimpleFontData::~SimpleFontData()
</span><span class="cx"> {
</span><del>- if (!m_fontData)
</del><ins>+ if (!isSVGFont())
</ins><span class="cx"> platformDestroy();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,8 +171,8 @@
</span><span class="cx"> static bool fillGlyphPage(GlyphPage& pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><del>- if (SimpleFontData::AdditionalFontData* additionalFontData = fontData->fontData())
- return additionalFontData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, fontData);
</del><ins>+ if (auto* svgData = fontData->svgData())
+ return svgData->fillSVGGlyphPage(&pageToFill, offset, length, buffer, bufferLength, fontData);
</ins><span class="cx"> #endif
</span><span class="cx"> bool hasGlyphs = pageToFill.fill(offset, length, buffer, bufferLength, fontData);
</span><span class="cx"> #if ENABLE(OPENTYPE_VERTICAL)
</span><span class="lines">@@ -405,9 +405,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SimpleFontData> SimpleFontData::createScaledFontData(const FontDescription& fontDescription, float scaleFactor) const
</span><span class="cx"> {
</span><del>- // FIXME: Support scaled fonts that used AdditionalFontData.
- if (m_fontData)
- return 0;
</del><ins>+ if (isSVGFont())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return platformCreateScaledFontData(fontDescription, scaleFactor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsSimpleFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/SimpleFontData.h (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/platform/graphics/SimpleFontData.h 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -70,15 +70,14 @@
</span><span class="cx">
</span><span class="cx"> class SimpleFontData final : public FontData {
</span><span class="cx"> public:
</span><del>- class AdditionalFontData {
</del><ins>+ class SVGData {
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- virtual ~AdditionalFontData() { }
</del><ins>+ virtual ~SVGData() { }
</ins><span class="cx">
</span><span class="cx"> virtual void initializeFontData(SimpleFontData*, float fontSize) = 0;
</span><span class="cx"> virtual float widthForSVGGlyph(Glyph, float fontSize) const = 0;
</span><span class="cx"> virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData*) const = 0;
</span><del>- virtual bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const = 0;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Used to create platform fonts.
</span><span class="lines">@@ -88,9 +87,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Used to create SVG Fonts.
</span><del>- static PassRefPtr<SimpleFontData> create(std::unique_ptr<AdditionalFontData> fontData, float fontSize, bool syntheticBold, bool syntheticItalic)
</del><ins>+ static PassRefPtr<SimpleFontData> create(std::unique_ptr<SVGData> svgData, float fontSize, bool syntheticBold, bool syntheticItalic)
</ins><span class="cx"> {
</span><del>- return adoptRef(new SimpleFontData(WTF::move(fontData), fontSize, syntheticBold, syntheticItalic));
</del><ins>+ return adoptRef(new SimpleFontData(WTF::move(svgData), fontSize, syntheticBold, syntheticItalic));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~SimpleFontData();
</span><span class="lines">@@ -176,8 +175,8 @@
</span><span class="cx"> void determinePitch();
</span><span class="cx"> Pitch pitch() const { return m_treatAsFixedPitch ? FixedPitch : VariablePitch; }
</span><span class="cx">
</span><del>- AdditionalFontData* fontData() const { return m_fontData.get(); }
- bool isSVGFont() const { return m_fontData != nullptr; }
</del><ins>+ const SVGData* svgData() const { return m_svgData.get(); }
+ bool isSVGFont() const { return !!m_svgData; }
</ins><span class="cx">
</span><span class="cx"> virtual bool isCustomFont() const override { return m_isCustomFont; }
</span><span class="cx"> virtual bool isLoading() const override { return m_isLoading; }
</span><span class="lines">@@ -218,7 +217,7 @@
</span><span class="cx"> private:
</span><span class="cx"> SimpleFontData(const FontPlatformData&, bool isCustomFont = false, bool isLoading = false, bool isTextOrientationFallback = false);
</span><span class="cx">
</span><del>- SimpleFontData(std::unique_ptr<AdditionalFontData>, float fontSize, bool syntheticBold, bool syntheticItalic);
</del><ins>+ SimpleFontData(std::unique_ptr<SVGData>, float fontSize, bool syntheticBold, bool syntheticItalic);
</ins><span class="cx">
</span><span class="cx"> void platformInit();
</span><span class="cx"> void platformGlyphInit();
</span><span class="lines">@@ -251,7 +250,7 @@
</span><span class="cx"> float m_avgCharWidth;
</span><span class="cx">
</span><span class="cx"> FontPlatformData m_platformData;
</span><del>- std::unique_ptr<AdditionalFontData> m_fontData;
</del><ins>+ std::unique_ptr<SVGData> m_svgData;
</ins><span class="cx">
</span><span class="cx"> mutable RefPtr<GlyphPage> m_glyphPageZero;
</span><span class="cx"> mutable HashMap<unsigned, RefPtr<GlyphPage>> m_glyphPages;
</span><span class="lines">@@ -348,8 +347,8 @@
</span><span class="cx"> if (width != cGlyphSizeUnknown)
</span><span class="cx"> return width;
</span><span class="cx">
</span><del>- if (m_fontData)
- width = m_fontData->widthForSVGGlyph(glyph, m_platformData.size());
</del><ins>+ if (isSVGFont())
+ width = m_svgData->widthForSVGGlyph(glyph, m_platformData.size());
</ins><span class="cx"> #if ENABLE(OPENTYPE_VERTICAL)
</span><span class="cx"> else if (m_verticalData)
</span><span class="cx"> #if USE(CG) || USE(CAIRO)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutEngineSpacingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> ASSERT(fontData.isCustomFont());
</span><span class="cx"> ASSERT(fontData.isSVGFont());
</span><span class="cx">
</span><del>- const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData.fontData());
</del><ins>+ auto* svgFontData = static_cast<const SVGFontData*>(fontData.svgData());
</ins><span class="cx"> SVGFontFaceElement* svgFontFace = svgFontData->svgFontFaceElement();
</span><span class="cx"> ASSERT(svgFontFace);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextRunRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/rendering/svg/SVGTextRunRenderingContext.cpp 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> ASSERT(fontData->isCustomFont());
</span><span class="cx"> ASSERT(fontData->isSVGFont());
</span><span class="cx">
</span><del>- const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->fontData());
</del><ins>+ auto* svgFontData = static_cast<const SVGFontData*>(fontData->svgData());
</ins><span class="cx">
</span><span class="cx"> fontFace = svgFontData->svgFontFaceElement();
</span><span class="cx"> ASSERT(fontFace);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontData.h (177974 => 177975)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontData.h 2015-01-06 19:19:31 UTC (rev 177974)
+++ trunk/Source/WebCore/svg/SVGFontData.h 2015-01-06 19:21:28 UTC (rev 177975)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> class SVGFontElement;
</span><span class="cx"> class SVGFontFaceElement;
</span><span class="cx">
</span><del>-class SVGFontData : public SimpleFontData::AdditionalFontData {
</del><ins>+class SVGFontData : public SimpleFontData::SVGData {
</ins><span class="cx"> public:
</span><span class="cx"> explicit SVGFontData(SVGFontFaceElement*);
</span><span class="cx"> virtual ~SVGFontData() { }
</span><span class="lines">@@ -36,8 +36,9 @@
</span><span class="cx"> virtual void initializeFontData(SimpleFontData*, float fontSize) override;
</span><span class="cx"> virtual float widthForSVGGlyph(Glyph, float fontSize) const override;
</span><span class="cx"> virtual bool fillSVGGlyphPage(GlyphPage*, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData*) const override;
</span><del>- virtual bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const override;
</del><span class="cx">
</span><ins>+ bool applySVGGlyphSelection(WidthIterator&, GlyphData&, bool mirror, int currentCharacter, unsigned& advanceLength, String& normalizedSpacesStringCache) const;
+
</ins><span class="cx"> SVGFontFaceElement* svgFontFaceElement() const { return m_svgFontFaceElement; }
</span><span class="cx">
</span><span class="cx"> float horizontalOriginX() const { return m_horizontalOriginX; }
</span></span></pre>
</div>
</div>
</body>
</html>