Title: [174372] trunk/Source/WebCore
- Revision
- 174372
- Author
- mmaxfi...@apple.com
- Date
- 2014-10-06 15:44:33 -0700 (Mon, 06 Oct 2014)
Log Message
Unreviewed merge fix for r174279.
https://bugs.webkit.org/show_bug.cgi?id=137097
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::convertSVGToOTFFont):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174371 => 174372)
--- trunk/Source/WebCore/ChangeLog 2014-10-06 22:17:09 UTC (rev 174371)
+++ trunk/Source/WebCore/ChangeLog 2014-10-06 22:44:33 UTC (rev 174372)
@@ -1,3 +1,11 @@
+2014-10-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Unreviewed merge fix for r174279.
+ https://bugs.webkit.org/show_bug.cgi?id=137097
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::convertSVGToOTFFont):
+
2014-10-06 David Hyatt <hy...@apple.com>
REGRESSION (Simple Line Layout): Inline block baselines computed incorrectly
Modified: trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp (174371 => 174372)
--- trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-10-06 22:17:09 UTC (rev 174371)
+++ trunk/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2014-10-06 22:44:33 UTC (rev 174372)
@@ -1167,8 +1167,6 @@
void SVGToOTFFontConverter::convertSVGToOTFFont()
{
- Vector<char> result;
-
if (m_glyphs.isEmpty())
return;
@@ -1185,7 +1183,7 @@
append16(integralLog2(roundedNumTables)); // entrySelector: "Log2(maximum power of 2 <= numTables)."
append16(numTables * 16 - searchRange); // rangeShift: "NumTables x 16-searchRange."
- ASSERT(result.size() == headerSize);
+ ASSERT(m_result.size() == headerSize);
// Leave space for the directory entries.
for (size_t i = 0; i < directoryEntrySize * numTables; ++i)
@@ -1211,7 +1209,7 @@
// checksumAdjustment: "To compute: set it to 0, calculate the checksum for the 'head' table and put it in the table directory,
// sum the entire font as uint32, then store B1B0AFBA - sum. The checksum for the 'head' table will now be wrong. That is OK."
- overwrite32(headTableOffset + 8, 0xB1B0AFBAU - calculateChecksum(0, result.size()));
+ overwrite32(headTableOffset + 8, 0xB1B0AFBAU - calculateChecksum(0, m_result.size()));
}
Vector<char> convertSVGToOTFFont(const SVGFontElement& element)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
