Bug 183339 – Change the type of SVGToOTFFontConverter::m_weight to be not a char

• Status: RESOLVED
• Resolution: FIXED
• Component: SVG

[Said Abou-Hallawa]

This is a follow up for Darin's comment in https://bugs.webkit.org/show_bug.cgi?id=183165#c2. If m_weight is negative, clampTo<uint16_t> or static_cast<uint16_t> will give the wrong value.

[Myles C. Maxfield]

m_result is a Vector<char> because that's what SharedBuffer::create() accepts.

[Myles C. Maxfield]

Created attachment 335067 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 335067 [details]
Patch

Clearing flags on attachment: 335067

Committed r229328: <https://trac.webkit.org/changeset/229328>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/38185027>

[Darin Adler]

(In reply to Myles C. Maxfield from comment #1)
> m_result is a Vector<char> because that's what SharedBuffer::create()
> accepts.

At some point I intend to change Vector<char> to Vector<uint8_t> throughout WebKit for this sort of thing.

[Myles C. Maxfield]

(In reply to Darin Adler from comment #6)
> (In reply to Myles C. Maxfield from comment #1)
> > m_result is a Vector<char> because that's what SharedBuffer::create()
> > accepts.
> 
> At some point I intend to change Vector<char> to Vector<uint8_t> throughout
> WebKit for this sort of thing.

Yes! 👍

[Darin Adler]

Comment on attachment 335067 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=335067&action=review

> Source/WebCore/svg/SVGToOTFFontConversion.cpp:528
> +                if (ok && value >= std::numeric_limits<uint8_t>::min() && value <= std::numeric_limits<uint8_t>::max())

If this pattern is common I think we should add a helper function.

> Source/WebCore/svg/SVGToOTFFontConversion.cpp: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()));

This is what clampTo is for, and it’s much easier to read:

    m_weight = clampTo<uint8_t>((value + 50) / 100);