Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / mhtml / ArchiveResource.cpp

diff --git a/src/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp b/src/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp
index 46b899e..dd4c6aa 100644 (file)
--- a/src/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp
+++ b/src/third_party/WebKit/Source/platform/mhtml/ArchiveResource.cpp
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "platform/mhtml/ArchiveResource.h"
 
-namespace WebCore {
+namespace blink {
 
 inline ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KURL& url, const AtomicString& mimeType, const AtomicString& textEncoding, const String& frameName, const ResourceResponse& response)
     : m_url(url)
@@ -42,19 +42,22 @@ inline ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KUR
     ASSERT(m_data);
 }
 
-PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const AtomicString& mimeType, const AtomicString& textEncoding, const String& frameName, const ResourceResponse& response)
+ArchiveResource::~ArchiveResource()
+{
+}
+
+PassRefPtrWillBeRawPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const AtomicString& mimeType, const AtomicString& textEncoding, const String& frameName, const ResourceResponse& response)
 {
     if (!data)
         return nullptr;
     if (response.isNull()) {
-        unsigned dataSize = data->size();
-        return adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName,
-            ResourceResponse(url, mimeType, dataSize, textEncoding, String())));
+        const ResourceResponse& resourceResponse = ResourceResponse(url, mimeType, data->size(), textEncoding, String());
+        return adoptRefWillBeNoop(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse));
     }
-    return adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, response));
+    return adoptRefWillBeNoop(new ArchiveResource(data, url, mimeType, textEncoding, frameName, response));
 }
 
-PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
+PassRefPtrWillBeRawPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
 {
     return create(data, url, response.mimeType(), response.textEncodingName(), String(), response);
 }