ChangeLog

2018-03-05  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 NOBODY (OOPS!).

        No new tests because there is no behavior change.

        * svg/SVGToOTFFontConversion.cpp:

        (WebCore::SVGToOTFFontConverter::appendOS2Table):

        (WebCore::SVGToOTFFontConverter::SVGToOTFFontConverter):

2018-03-05  Myles C. Maxfield  <mmaxfield@apple.com>

        [Cocoa] Allow user-installed fonts to be disabled

Source/WebCore/svg/SVGToOTFFontConversion.cpp

@@private:

    int m_descent;

    unsigned m_featureCountGSUB;

    unsigned m_tablesAppendedCount;

267 ~~char~~ m_weight;

267 uint8_t m_weight;

    bool m_italic;

    bool m_error { false };

};

@@void SVGToOTFFontConverter::appendOS2Table()

    append16(2); // Version

    append16(clampTo<int16_t>(averageAdvance));

502 append16(~~clampTo<uint16_t>(~~m_weight)); // Weight class

502 append16(m_weight); // Weight class

    append16(5); // Width class

    append16(0); // Protected font

    // WebKit handles these superscripts and subscripts

@@void SVGToOTFFontConverter::appendOS2Table()

            for (auto& segment : segments) {

                bool ok;

                int value = segment.toInt(&ok);

528 if (ok && value >= 0 && value <= 0~~xFF~~)

528 if (ok && value >= std::numeric_limits<uint8_t>::min() && value <= std::numeric_limits<uint8_t>::max())

                    panoseBytes[numPanoseBytes++] = value;

            }

        }

@@SVGToOTFFontConverter::SVGToOTFFontConverter(const SVGFontElement& fontElement)

            bool ok;

            int value = segment.toInt(ok);

            if (ok && value >= 0 && value < 1000) {

1464 m_weight = (value + 50) / 100;

1464 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()));