diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/win/WebView.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/win/WebView.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/win/WebView.cpp b/Source/WebKit2/UIProcess/win/WebView.cpp index 28d26f1f3..70b875bb6 100644 --- a/Source/WebKit2/UIProcess/win/WebView.cpp +++ b/Source/WebKit2/UIProcess/win/WebView.cpp @@ -55,6 +55,7 @@ #include <WebCore/WebCoreInstanceHandle.h> #include <WebCore/WindowMessageBroadcaster.h> #include <WebCore/WindowsTouch.h> +#include <wtf/text/StringBuilder.h> #include <wtf/text/WTFString.h> #if USE(CG) @@ -1240,14 +1241,14 @@ static void compositionToUnderlines(const Vector<DWORD>& clauses, const Vector<B #define APPEND_ARGUMENT_NAME(name) \ if (lparam & name) { \ if (needsComma) \ - result += ", "; \ - result += #name; \ + result.appendLiteral(", "); \ + result.appendLiteral(#name); \ needsComma = true; \ } static String imeCompositionArgumentNames(LPARAM lparam) { - String result; + StringBuilder result; bool needsComma = false; APPEND_ARGUMENT_NAME(GCS_COMPATTR); @@ -1265,7 +1266,7 @@ static String imeCompositionArgumentNames(LPARAM lparam) APPEND_ARGUMENT_NAME(CS_INSERTCHAR); APPEND_ARGUMENT_NAME(CS_NOMOVECARET); - return result; + return result.toString(); } static String imeRequestName(WPARAM wparam) @@ -1430,7 +1431,7 @@ PassRefPtr<WebContextMenuProxy> WebView::createContextMenuProxy(WebPageProxy* pa } #if ENABLE(INPUT_TYPE_COLOR) -PassRefPtr<WebColorChooserProxy> WebView::createColorChooserProxy(WebPageProxy*, const WebCore::Color&) +PassRefPtr<WebColorChooserProxy> WebView::createColorChooserProxy(WebPageProxy*, const WebCore::Color&, const WebCore::IntRect&) { notImplemented(); return 0; |