From 284837daa07b29d6a63a748544a90b1f5842ac5c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 10 Sep 2012 19:10:20 +0200
Subject: Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d
 (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot
---
 Source/WebCore/plugins/PluginView.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'Source/WebCore/plugins/PluginView.cpp')

diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp
index 0d6857f25..9672e91f6 100644
--- a/Source/WebCore/plugins/PluginView.cpp
+++ b/Source/WebCore/plugins/PluginView.cpp
@@ -64,6 +64,7 @@
 #include "Settings.h"
 #include "npruntime_impl.h"
 #include <wtf/ASCIICType.h>
+#include <wtf/text/WTFString.h>
 
 #if OS(WINDOWS) && ENABLE(NETSCAPE_PLUGIN_API)
 #include "PluginMessageThrottlerWin.h"
@@ -81,7 +82,6 @@ using JSC::ExecState;
 using JSC::JSLock;
 using JSC::JSObject;
 using JSC::JSValue;
-using JSC::UString;
 #endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
@@ -1133,12 +1133,8 @@ static inline HTTPHeaderMap parseRFC822HeaderFields(const Vector<char>& buffer,
                     value = String(colon, eol - colon);
 
                 String oldValue = headerFields.get(lastKey);
-                if (!oldValue.isNull()) {
-                    String tmp = oldValue;
-                    tmp += ", ";
-                    tmp += value;
-                    value = tmp;
-                }
+                if (!oldValue.isNull())
+                    value = oldValue + ", " + value;
 
                 headerFields.set(lastKey, value);
             }
-- 
cgit v1.2.1