webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 3 deletions

diff --git a/Source/WebCore/html/FormDataList.cpp b/Source/WebCore/html/FormDataList.cpp
index 48fc62969..644faf721 100644
--- a/Source/WebCore/html/FormDataList.cpp
+++ b/Source/WebCore/html/FormDataList.cpp
@@ -22,6 +22,7 @@
 #include "FormDataList.h"
 
 #include "LineEnding.h"
+#include <wtf/text/StringView.h>
 
 namespace WebCore {
 
@@ -32,7 +33,7 @@ FormDataList::FormDataList(const TextEncoding& c)
 
 void FormDataList::appendString(const String& s)
 {
-    CString cstr = m_encoding.encode(s.deprecatedCharacters(), s.length(), EntitiesForUnencodables);
+    CString cstr = m_encoding.encode(s, EntitiesForUnencodables);
     m_items.append(normalizeLineEndingsToCRLF(cstr));
 }
 
@@ -41,9 +42,9 @@ void FormDataList::appendString(const CString& s)
     m_items.append(s);
 }
 
-void FormDataList::appendBlob(PassRefPtr<Blob> blob, const String& filename)
+void FormDataList::appendBlob(Ref<Blob>&& blob, const String& filename)
 {
-    m_items.append(Item(blob, filename));
+    m_items.append(Item(WTFMove(blob), filename));
 }
 
 } // namespace