Changeset 230398 in webkit

Timestamp:

Apr 9, 2018 3:52:54 AM (6 years ago)

Author:

Carlos Garcia Campos

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):

Location:

releases/WebKitGTK/webkit-2.20/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGToOTFFontConversion.cpp (modified) (4 diffs)

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Myles C. Maxfield  <mmaxfield@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  <antti@apple.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/svg/SVGToOTFFontConversion.cpp

@@ -265 +265 @@
     unsigned m_featureCountGSUB;
     unsigned m_tablesAppendedCount;
-    char m_weight;
+    uint8_t m_weight;
     bool m_italic;
     bool m_error { false };
@@ -500 +500 @@
     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
@@ -526 +526 @@
                 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;
             }
@@ -1462 +1462 @@
             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;
             }