<!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>[177620] 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/177620">177620</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-12-19 20:41:57 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SVG -> OTF Converter] Make placeholders more robust
https://bugs.webkit.org/show_bug.cgi?id=139836
Reviewed by Dan Bernstein.
This patch creates a Placeholder object which hides the complexity of
populating offsets to subtables.
No new tests because there is no behavior change.
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::Placeholder::Placeholder):
(WebCore::SVGToOTFFontConverter::Placeholder::populate):
(WebCore::SVGToOTFFontConverter::Placeholder::~Placeholder):
(WebCore::SVGToOTFFontConverter::appendArabicReplacementSubtable):
(WebCore::SVGToOTFFontConverter::appendGSUBTable):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoresvgSVGToOTFFontConversioncpp">trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177619 => 177620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-20 04:39:03 UTC (rev 177619)
+++ trunk/Source/WebCore/ChangeLog 2014-12-20 04:41:57 UTC (rev 177620)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-19 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [SVG -> OTF Converter] Make placeholders more robust
+ https://bugs.webkit.org/show_bug.cgi?id=139836
+
+ Reviewed by Dan Bernstein.
+
+ This patch creates a Placeholder object which hides the complexity of
+ populating offsets to subtables.
+
+ No new tests because there is no behavior change.
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::Placeholder::Placeholder):
+ (WebCore::SVGToOTFFontConverter::Placeholder::populate):
+ (WebCore::SVGToOTFFontConverter::Placeholder::~Placeholder):
+ (WebCore::SVGToOTFFontConverter::appendArabicReplacementSubtable):
+ (WebCore::SVGToOTFFontConverter::appendGSUBTable):
+
</ins><span class="cx"> 2014-12-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix initial / inherit support for '-webkit-perspective-origin' CSS property
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGToOTFFontConversioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (177619 => 177620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-12-20 04:39:03 UTC (rev 177619)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-12-20 04:41:57 UTC (rev 177620)
</span><span class="lines">@@ -77,6 +77,41 @@
</span><span class="cx"> float verticalAdvance;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ class Placeholder {
+ public:
+ Placeholder(SVGToOTFFontConverter& converter, size_t baseOfOffset)
+ : m_converter(converter)
+ , m_baseOfOffset(baseOfOffset)
+ , m_location(m_converter.m_result.size())
+#if !ASSERT_DISABLED
+ , m_written(false)
+#endif
+ {
+ m_converter.append16(0);
+ }
+ void populate()
+ {
+ ASSERT(!m_written);
+ size_t delta = m_converter.m_result.size() - m_baseOfOffset;
+ ASSERT(delta < std::numeric_limits<uint16_t>::max());
+ m_converter.overwrite16(m_location, delta);
+#if !ASSERT_DISABLED
+ m_written = true;
+#endif
+ }
+ ~Placeholder()
+ {
+ ASSERT(m_written);
+ }
+ private:
+ SVGToOTFFontConverter& m_converter;
+ const size_t m_baseOfOffset;
+ const size_t m_location;
+#if !ASSERT_DISABLED
+ bool m_written;
+#endif
+ };
+
</ins><span class="cx"> struct KerningData {
</span><span class="cx"> KerningData(uint16_t glyph1, uint16_t glyph2, int16_t adjustment)
</span><span class="cx"> : glyph1(glyph1)
</span><span class="lines">@@ -89,6 +124,11 @@
</span><span class="cx"> int16_t adjustment;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ Placeholder placeholder(size_t baseOfOffset)
+ {
+ return Placeholder(*this, baseOfOffset);
+ }
+
</ins><span class="cx"> void append32(uint32_t value)
</span><span class="cx"> {
</span><span class="cx"> WebCore::append32(m_result, value);
</span><span class="lines">@@ -577,12 +617,12 @@
</span><span class="cx"> overwrite16(subtableRecordLocation + 6, m_result.size() - subtableRecordLocation);
</span><span class="cx"> auto subtableLocation = m_result.size();
</span><span class="cx"> append16(2); // Format 2
</span><del>- append16(0); // Placeholder for offset to coverage table, relative to beginning of substitution table
</del><ins>+ Placeholder toCoverageTable = placeholder(subtableLocation);
</ins><span class="cx"> append16(arabicFinalReplacements.size()); // GlyphCount
</span><span class="cx"> for (auto& pair : arabicFinalReplacements)
</span><span class="cx"> append16(pair.second);
</span><span class="cx">
</span><del>- overwrite16(subtableLocation + 2, m_result.size() - subtableLocation);
</del><ins>+ toCoverageTable.populate();
</ins><span class="cx"> append16(1); // CoverageFormat
</span><span class="cx"> append16(arabicFinalReplacements.size()); // GlyphCount
</span><span class="cx"> for (auto& pair : arabicFinalReplacements)
</span><span class="lines">@@ -596,10 +636,8 @@
</span><span class="cx">
</span><span class="cx"> append32(0x00010000); // Version
</span><span class="cx"> append16(headerSize); // Offset to ScriptList
</span><del>- auto featureListOffsetLocation = m_result.size();
- append16(0); // Placeholder for FeatureList offset
- auto lookupListOffsetLocation = m_result.size();
- append16(0); // Placeholder for LookupList offset
</del><ins>+ Placeholder toFeatureList = placeholder(tableLocation);
+ Placeholder toLookupList = placeholder(tableLocation);
</ins><span class="cx"> ASSERT(tableLocation + headerSize == m_result.size());
</span><span class="cx">
</span><span class="cx"> // ScriptList
</span><span class="lines">@@ -622,7 +660,7 @@
</span><span class="cx"> append16(i); // Index of our feature into the FeatureList
</span><span class="cx">
</span><span class="cx"> // FeatureList
</span><del>- overwrite16(featureListOffsetLocation, m_result.size() - tableLocation);
</del><ins>+ toFeatureList.populate();
</ins><span class="cx"> auto featureListLocation = m_result.size();
</span><span class="cx"> size_t featureListSize = 2 + 6 * featureCount;
</span><span class="cx"> size_t featureTableSize = 6;
</span><span class="lines">@@ -646,7 +684,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // LookupList
</span><del>- overwrite16(lookupListOffsetLocation, m_result.size() - tableLocation);
</del><ins>+ toLookupList.populate();
</ins><span class="cx"> auto lookupListLocation = m_result.size();
</span><span class="cx"> append16(featureCount); // LookupCount
</span><span class="cx"> for (unsigned i = 0; i < featureCount; ++i)
</span></span></pre>
</div>
</div>
</body>
</html>