Bug 37949 – Do no copy strings into a shared buffer when converting UStrings to Strings

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore JavaScript

[Gavin Barraclough]

UString and String now have the same internal representation; Just re-wrap the internal impl.

[Gavin Barraclough]

Created attachment 53989 [details]
The patch

[Darin Adler]

Comment on attachment 53989 [details]
The patch

>      String identifierToString(const JSC::Identifier&);
>      String ustringToString(const JSC::UString&);
>      JSC::UString stringToUString(const String&);
> -
>      AtomicString identifierToAtomicString(const JSC::Identifier&);
>      AtomicString ustringToAtomicString(const JSC::UString&);
>      AtomicStringImpl* findAtomicString(const JSC::Identifier&);

I think that blank line is good and you need not remove it.

> +    inline String ustringToString(const JSC::UString& u)
> +    {
> +        return u.rep();
> +    }
> +
> +    inline JSC::UString stringToUString(const String& s)
> +    {
> +        return JSC::UString(s.impl());
> +    }
> +
> +    inline String identifierToString(const JSC::Identifier& i)
> +    {
> +        return i.ustring().rep();
> +    }
> +
> +    inline AtomicString ustringToAtomicString(const JSC::UString& u)
> +    {
> +        return AtomicString(u.rep());
> +    }
> +
> +    inline AtomicString identifierToAtomicString(const JSC::Identifier& identifier)
> +    {
> +        return AtomicString(identifier.ustring().rep());
> +    }
> +
>      String valueToStringWithNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null
>      String valueToStringWithUndefinedOrNullCheck(JSC::ExecState*, JSC::JSValue); // null if the value is null or undefined

I suggest putting the function bodies at the end of the file. No need for these definitions to be close the the declarations.

r=me with or without those changes

[Gavin Barraclough]

Transmitting file data ...
Committed revision 58027.