1218315 - Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16 again

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Makoto Kato [:m_kato]]

By old bug (Bug 949821), we replace with MOZ_UTF16.  But I found some landings (such as bug 1205399 etc) that still use NS_LITERAL_STRING(...).get().

Let's replace it with MOZ_UTF16() again!

Comment 1

[Makoto Kato [:m_kato]]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=fbe69125b186

Comment 2

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on browser

Comment 3

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on dom

Comment 4

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on netwerk

Comment 5

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on rdf

Comment 6

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on widget

Comment 7

[Makoto Kato [:m_kato]]

Attachment: Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on xpcom

Comment 8

[Makoto Kato [:m_kato]]

Comment on attachment 8679314 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on browser

use MOZ_UTF16 instead of NS_LITERAL_STRING().get().

This is generated by same sed script of bug 949821

Comment 9

[Makoto Kato [:m_kato]]

Comment on attachment 8679315 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on dom

Use MOZ_UTF16 instead of NS_LITERAL_STRING().get().

This is generated by same sed script of bug 949821 except to nsXULContentUtils.cpp

nsXULContentUtils.cpp should replace with it too.

Comment 10

[Makoto Kato [:m_kato]]

Comment on attachment 8679316 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on netwerk

use MOZ_UTF16 instead of NS_LITERAL_STRING().get().

(This fix isn't generated by sed script since this uses macro)

Comment 11

[Makoto Kato [:m_kato]]

Comment on attachment 8679318 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on rdf

Use AssignLiteral instead of Assign(NS_LIETARL_STRING(...).get()).

Comment 12

[Makoto Kato [:m_kato]]

Comment on attachment 8679319 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on widget

use MOZ_UTF16 instead of NS_LITERAL_STRING().get().

This is generated by same sed script of bug 949821

Comment 13

[Makoto Kato [:m_kato]]

Comment on attachment 8679321 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on xpcom

use MOZ_UTF16 instead of NS_LITERAL_STRING().get().

This is generated by same sed script of bug 949821

Comment 14

[Nathan Froyd [:froydnj]]

Comment on attachment 8679321 [details] [diff] [review]
Replace NS_LITERAL_STRING(...).get() with MOZ_UTF16(...) on xpcom

Review of attachment 8679321 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks for fixing all these!

Comment 15

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/7102bfea6bbf
https://hg.mozilla.org/integration/mozilla-inbound/rev/5931f379416e
https://hg.mozilla.org/integration/mozilla-inbound/rev/9a8f4587e564
https://hg.mozilla.org/integration/mozilla-inbound/rev/5caf6fd04aed
https://hg.mozilla.org/integration/mozilla-inbound/rev/18e8b44eb565
https://hg.mozilla.org/integration/mozilla-inbound/rev/35d613de217d

Comment 16

[Bas Schouten (:bas.schouten)]

This broke the Visual Studio 2015 build.

Comment 17

[Makoto Kato [:m_kato]]

Attachment: Use L"..." instead of MOZ_UTF16(...) for MSVS2015

VS2015 (not official compiler version) causes bustage due to char16_t to LPCWSTR conversion.

So Use L"" instead.

Comment 18

[Makoto Kato [:m_kato]]

(In reply to Bas Schouten (:bas.schouten) from comment #16)
> This broke the Visual Studio 2015 build.

Sorry, I will fix soon.

Comment 19

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c537a7eb9bbd

Comment 20

[Bas Schouten (:bas.schouten)]

(In reply to Makoto Kato [:m_kato] from comment #18)
> (In reply to Bas Schouten (:bas.schouten) from comment #16)
> > This broke the Visual Studio 2015 build.
> 
> Sorry, I will fix soon.

No problem! Thanks a lot for the quick fix!

Comment 21

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/7102bfea6bbf
https://hg.mozilla.org/mozilla-central/rev/5931f379416e
https://hg.mozilla.org/mozilla-central/rev/9a8f4587e564
https://hg.mozilla.org/mozilla-central/rev/5caf6fd04aed
https://hg.mozilla.org/mozilla-central/rev/18e8b44eb565
https://hg.mozilla.org/mozilla-central/rev/35d613de217d
https://hg.mozilla.org/mozilla-central/rev/c537a7eb9bbd