Title: [230398] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 230398
- Author
- carlo...@webkit.org
- Date
- 2018-04-09 03:52:54 -0700 (Mon, 09 Apr 2018)
Log Message
Merge r229328 - Change the type of SVGToOTFFontConverter::m_weight to be not a char
https://bugs.webkit.org/show_bug.cgi?id=183339
Reviewed by Alex Christensen.
No new tests because there is no behavior change.
* svg/SVGToOTFFontConversion.cpp:
(WebCore::SVGToOTFFontConverter::appendOS2Table):
(WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (230397 => 230398)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-09 10:52:49 UTC (rev 230397)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-04-09 10:52:54 UTC (rev 230398)
@@ -1,3 +1,16 @@
+2018-03-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Change the type of SVGToOTFFontConverter::m_weight to be not a char
+ https://bugs.webkit.org/show_bug.cgi?id=183339
+
+ Reviewed by Alex Christensen.
+
+ No new tests because there is no behavior change.
+
+ * svg/SVGToOTFFontConversion.cpp:
+ (WebCore::SVGToOTFFontConverter::appendOS2Table):
+ (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):
+
2018-03-05 Antti Koivisto <an...@apple.com>
Don't invalidate all children when doing insertion/deletion in presence of backward positional selectors
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/svg/SVGToOTFFontConversion.cpp (230397 => 230398)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2018-04-09 10:52:49 UTC (rev 230397)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/svg/SVGToOTFFontConversion.cpp 2018-04-09 10:52:54 UTC (rev 230398)
@@ -264,7 +264,7 @@
int m_descent;
unsigned m_featureCountGSUB;
unsigned m_tablesAppendedCount;
- char m_weight;
+ uint8_t m_weight;
bool m_italic;
bool m_error { false };
};
@@ -499,7 +499,7 @@
append16(2); // Version
append16(clampTo<int16_t>(averageAdvance));
- append16(clampTo<uint16_t>(m_weight)); // Weight class
+ append16(m_weight); // Weight class
append16(5); // Width class
append16(0); // Protected font
// WebKit handles these superscripts and subscripts
@@ -525,7 +525,7 @@
for (auto& segment : segments) {
bool ok;
int value = segment.toInt(&ok);
- if (ok && value >= 0 && value <= 0xFF)
+ if (ok && value >= std::numeric_limits<uint8_t>::min() && value <= std::numeric_limits<uint8_t>::max())
panoseBytes[numPanoseBytes++] = value;
}
}
@@ -1461,7 +1461,7 @@
bool ok;
int value = segment.toInt(ok);
if (ok && value >= 0 && value < 1000) {
- m_weight = (value + 50) / 100;
+ m_weight = std::max(std::min((value + 50) / 100, static_cast<int>(std::numeric_limits<uint8_t>::max())), static_cast<int>(std::numeric_limits<uint8_t>::min()));
break;
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes