Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / blob / BlobData.cpp

diff --git a/src/third_party/WebKit/Source/platform/blob/BlobData.cpp b/src/third_party/WebKit/Source/platform/blob/BlobData.cpp
index 17d99b9..6dd0db6 100644 (file)
--- a/src/third_party/WebKit/Source/platform/blob/BlobData.cpp
+++ b/src/third_party/WebKit/Source/platform/blob/BlobData.cpp
@@ -43,7 +43,7 @@
 #include "wtf/text/CString.h"
 #include "wtf/text/TextEncoding.h"
 
-namespace WebCore {
+namespace blink {
 
 const long long BlobDataItem::toEndOfFile = -1;
 
@@ -70,7 +70,6 @@ PassOwnPtr<BlobData> BlobData::create()
 void BlobData::detachFromCurrentThread()
 {
     m_contentType = m_contentType.isolatedCopy();
-    m_contentDisposition = m_contentDisposition.isolatedCopy();
     for (size_t i = 0; i < m_items.size(); ++i)
         m_items.at(i).detachFromCurrentThread();
 }
@@ -107,7 +106,7 @@ void BlobData::appendText(const String& text, bool doNormalizeLineEndingsToNativ
 
     CString utf8Text = UTF8Encoding().normalizeAndEncode(text, WTF::EntitiesForUnencodables);
     if (doNormalizeLineEndingsToNative) {
-        WebCore::normalizeLineEndingsToNative(utf8Text, *buffer);
+        normalizeLineEndingsToNative(utf8Text, *buffer);
     } else {
         buffer->append(utf8Text.data(), utf8Text.length());
     }
@@ -115,7 +114,7 @@ void BlobData::appendText(const String& text, bool doNormalizeLineEndingsToNativ
     m_items.append(BlobDataItem(data.release()));
 }
 
-void BlobData::appendBytes(const void* bytes, long long length)
+void BlobData::appendBytes(const void* bytes, size_t length)
 {
     RefPtr<RawData> data = RawData::create();
     Vector<char>* buffer = data->mutableData();
@@ -191,4 +190,4 @@ BlobDataHandle::~BlobDataHandle()
     BlobRegistry::removeBlobDataRef(m_uuid);
 }
 
-} // namespace WebCore
+} // namespace blink