Closed Bug 1423742 Opened 2 years ago Closed 2 years ago

Stop using Encoding::ForName in gfxFontUtils

Categories

(Core :: Graphics: Text, defect)

defect
Not set

Tracking

()

RESOLVED FIXED
mozilla59
Tracking Status
firefox59 --- fixed

People

(Reporter: emk, Assigned: emk)

References

Details

Attachments

(1 file)

No description provided.
Assignee: nobody → VYV03354
Status: NEW → ASSIGNED
Comment on attachment 8935146 [details]
Bug 1423742 - Stop using Encoding::ForName in gfxFontUtils.

https://reviewboard.mozilla.org/r/205988/#review211808

Nice to get rid of those strings, thanks. :)

::: gfx/thebes/gfxFontUtils.h:1010
(Diff revision 1)
>      // convert opentype name-table platform/encoding/language values to a charset name
>      // we can use to convert the name data to unicode, or "" if data is UTF16BE

This comment could use an update -- we don't map to a charset name any more, but to an Encoding object. And we don't have a special case for UTF16BE any more.

::: gfx/thebes/gfxFontUtils.cpp:1339
(Diff revision 1)
> -    { ENCODING_ID_MAC_GUJARATI,     ANY,                      "x-mac-gujarati"  },
> -    { ENCODING_ID_MAC_SIMP_CHINESE, LANG_ID_MAC_SIMP_CHINESE, "gb18030"         },
> -    { ENCODING_ID_MAC_SIMP_CHINESE, ANY,                      "gb18030"         }
> +    { ENCODING_ID_MAC_GUJARATI,     ANY,                      X_USER_DEFINED_ENCODING },
> +    { ENCODING_ID_MAC_SIMP_CHINESE, LANG_ID_MAC_SIMP_CHINESE, GB18030_ENCODING },
> +    { ENCODING_ID_MAC_SIMP_CHINESE, ANY,                      GB18030_ENCODING }
>  };
>  
> -const char* gfxFontUtils::gISOFontNameCharsets[] = 
> +const Encoding* gfxFontUtils::gISOFontNameCharsets[] = 

nit, please clean up the trailing space while you're touching this line
Attachment #8935146 - Flags: review?(jfkthame) → review+
Comment on attachment 8935146 [details]
Bug 1423742 - Stop using Encoding::ForName in gfxFontUtils.

https://reviewboard.mozilla.org/r/205988/#review211808

> This comment could use an update -- we don't map to a charset name any more, but to an Encoding object. And we don't have a special case for UTF16BE any more.

Fixed the comment.

> nit, please clean up the trailing space while you're touching this line

Removed the extra trailing space.
Pushed by VYV03354@nifty.ne.jp:
https://hg.mozilla.org/integration/autoland/rev/40a150bb7c4f
Stop using Encoding::ForName in gfxFontUtils. r=jfkthame
https://hg.mozilla.org/mozilla-central/rev/40a150bb7c4f
Status: ASSIGNED → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla59
Blocks: 1425217
You need to log in before you can comment on or make changes to this bug.