Bug 95904 – Remove String::operator+=() from windows platform code

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Patrick R. Gansterer]

Remove String::operator+=() from windows platform code

[Patrick R. Gansterer]

Created attachment 162354 [details]
Patch

[Benjamin Poulain]

Comment on attachment 162354 [details]
Patch

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

> Source/WebCore/platform/win/ClipboardWin.cpp:150
> -    String result(static_cast<UChar*>(fsPathBuffer));
> -    result += String(extension);
> -    return result;
> +    return String(static_cast<UChar*>(fsPathBuffer)) + extension;

I think you'd better use makeString(static_cast<UChar*>(fsPathBuffer), extension).

> Source/WebKit/win/AccessibleBase.cpp:377
> -            accessKeyModifiers += "Ctrl+";
> +            accessKeyModifiersBuilder.append("Ctrl+");
>          if (modifiers & PlatformEvent::AltKey)
> -            accessKeyModifiers += "Alt+";
> +            accessKeyModifiersBuilder.append("Alt+");
>          if (modifiers & PlatformEvent::ShiftKey)
> -            accessKeyModifiers += "Shift+";
> +            accessKeyModifiersBuilder.append("Shift+");
>          if (modifiers & PlatformEvent::MetaKey)
> -            accessKeyModifiers += "Win+";
> +            accessKeyModifiersBuilder.append("Win+");

append() -> appendLiteral()

> Source/WebKit/win/ChangeLog:15
> +        (if):

Confused prepare-ChangeLog is confused

> Source/WebKit/win/WebView.cpp:5549
> +            result.append(", "); \

appendLiteral()

> Source/WebKit/win/WebView.cpp:5550
> +        result.append(#name); \

appendLiteral()

> Source/WebKit/win/WebView.cpp:-5561
> -    if (lparam & GCS_COMPATTR) {
> -        result = "GCS_COMPATTR";
> -        needsComma = true;
> -    }

This is strange, but I can't figure why this code is there.
Maybe needsComma was not in APPEND_ARGUMENT_NAME originally.

> Source/WebKit2/UIProcess/win/WebView.cpp:1245
> +            result.append(", "); \
> +        result.append(#name); \

appendLiteral().

[Patrick R. Gansterer]

Created attachment 162362 [details]
Patch

[Build Bot]

Comment on attachment 162362 [details]
Patch

Attachment 162362 [details] did not pass win-ews (win):
Output: http://queues.webkit.org/results/13769123

[Patrick R. Gansterer]

Created attachment 162431 [details]
Patch

[WebKit Review Bot]

Comment on attachment 162431 [details]
Patch

Clearing flags on attachment: 162431

Committed r127732: <http://trac.webkit.org/changeset/127732>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.