[Thread-safe] Take deep copy of String/KURL in FormData::deepCopy()

Review URL: https://codereview.chromium.org/594473002

git-svn-id: svn://svn.chromium.org/blink/trunk@183963 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/platform/blink_platform.gypi

@@ -923,6 +923,7 @@
       'graphics/test/MockDiscardablePixelRef.h',
       'image-decoders/ImageDecoderTest.cpp',
       'mac/ScrollElasticityControllerTest.mm',
+      'network/FormDataTest.cpp',
       'network/HTTPParsersTest.cpp',
       'network/ResourceRequestTest.cpp',
       'scheduler/SchedulerTest.cpp',

third_party/WebKit/Source/platform/network/FormData.cpp

@@ -95,13 +95,13 @@ PassRefPtr<FormData> FormData::deepCopy() const
             formData->m_elements.uncheckedAppend(FormDataElement(e.m_data));
             break;
         case FormDataElement::encodedFile:
-            formData->m_elements.uncheckedAppend(FormDataElement(e.m_filename, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
+            formData->m_elements.uncheckedAppend(FormDataElement(e.m_filename.isolatedCopy(), e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
             break;
         case FormDataElement::encodedBlob:
-            formData->m_elements.uncheckedAppend(FormDataElement(e.m_blobUUID, e.m_optionalBlobDataHandle));
+            formData->m_elements.uncheckedAppend(FormDataElement(e.m_blobUUID.isolatedCopy(), e.m_optionalBlobDataHandle));
             break;
         case FormDataElement::encodedFileSystemURL:
-            formData->m_elements.uncheckedAppend(FormDataElement(e.m_fileSystemURL, e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
+            formData->m_elements.uncheckedAppend(FormDataElement(e.m_fileSystemURL.copy(), e.m_fileStart, e.m_fileLength, e.m_expectedFileModificationTime));
             break;
         }
     }

third_party/WebKit/Source/platform/network/FormDataTest.cpp

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef FormDataTest_h
+#define FormDataTest_h
+
+#include "config.h"
+#include "platform/network/FormData.h"
+
+#include <gtest/gtest.h>
+
+namespace blink {
+
+namespace {
+
+class FormDataTest : public ::testing::Test {
+public:
+    void checkDeepCopied(const String& a, const String& b)
+    {
+        EXPECT_EQ(a, b);
+        if (b.impl())
+            EXPECT_NE(a.impl(), b.impl());
+    }
+
+    void checkDeepCopied(const KURL& a, const KURL& b)
+    {
+        EXPECT_EQ(a, b);
+        checkDeepCopied(a.string(), b.string());
+        if (a.innerURL() && b.innerURL())
+            checkDeepCopied(*a.innerURL(), *b.innerURL());
+    }
+
+    void checkDeepCopied(const FormDataElement& a, const FormDataElement& b)
+    {
+        EXPECT_EQ(a, b);
+        checkDeepCopied(a.m_filename, b.m_filename);
+        checkDeepCopied(a.m_blobUUID, b.m_blobUUID);
+        checkDeepCopied(a.m_fileSystemURL, b.m_fileSystemURL);
+    }
+};
+
+TEST_F(FormDataTest, DeepCopy)
+{
+    RefPtr<FormData> original(FormData::create());
+    original->appendData("Foo", 3);
+    original->appendFileRange("example.txt", 12345, 56789, 9999.0);
+    original->appendBlob("originalUUID", nullptr);
+    original->appendFileSystemURLRange(KURL(KURL(), "ws://localhost/"), 23456, 34567, 1111.0);
+
+    RefPtr<FormData> copy = original->deepCopy();
+
+    // Check that contents are copied (compare the copy with expected values).
+    const Vector<FormDataElement>& originalElements = original->elements();
+    const Vector<FormDataElement>& copyElements = copy->elements();
+    ASSERT_EQ(4ul, copyElements.size());
+
+    Vector<char> fooVector;
+    fooVector.append("Foo", 3);
+
+    EXPECT_EQ(FormDataElement::data, copyElements[0].m_type);
+    EXPECT_EQ(fooVector, copyElements[0].m_data);
+
+    EXPECT_EQ(FormDataElement::encodedFile, copyElements[1].m_type);
+    EXPECT_EQ(String("example.txt"), copyElements[1].m_filename);
+    EXPECT_EQ(12345ll, copyElements[1].m_fileStart);
+    EXPECT_EQ(56789ll, copyElements[1].m_fileLength);
+    EXPECT_EQ(9999.0, copyElements[1].m_expectedFileModificationTime);
+
+    EXPECT_EQ(FormDataElement::encodedBlob, copyElements[2].m_type);
+    EXPECT_EQ(String("originalUUID"), copyElements[2].m_blobUUID);
+
+    EXPECT_EQ(FormDataElement::encodedFileSystemURL, copyElements[3].m_type);
+    EXPECT_EQ(KURL(KURL(), String("ws://localhost/")), copyElements[3].m_fileSystemURL);
+    EXPECT_EQ(23456ll, copyElements[3].m_fileStart);
+    EXPECT_EQ(34567ll, copyElements[3].m_fileLength);
+    EXPECT_EQ(1111.0, copyElements[3].m_expectedFileModificationTime);
+
+    // Check that contents are copied (compare the copy with the original).
+    EXPECT_EQ(*original, *copy);
+
+    // Check pointers are different, i.e. deep-copied.
+    ASSERT_NE(original.get(), copy.get());
+
+    for (size_t i = 0; i < 4; ++i) {
+        if (copyElements[i].m_filename.impl()) {
+            EXPECT_NE(originalElements[i].m_filename.impl(), copyElements[i].m_filename.impl());
+            EXPECT_TRUE(copyElements[i].m_filename.impl()->hasOneRef());
+        }
+
+        if (copyElements[i].m_blobUUID.impl()) {
+            EXPECT_NE(originalElements[i].m_blobUUID.impl(), copyElements[i].m_blobUUID.impl());
+            EXPECT_TRUE(copyElements[i].m_blobUUID.impl()->hasOneRef());
+        }
+
+        if (copyElements[i].m_fileSystemURL.string().impl()) {
+            EXPECT_NE(originalElements[i].m_fileSystemURL.string().impl(), copyElements[i].m_fileSystemURL.string().impl());
+            EXPECT_TRUE(copyElements[i].m_fileSystemURL.string().impl()->hasOneRef());
+        }
+
+        EXPECT_EQ(nullptr, copyElements[i].m_fileSystemURL.innerURL());
+
+        // m_optionalBlobDataHandle is not checked, because BlobDataHandle is ThreadSafeRefCounted.
+    }
+}
+
+} // namespace
+
+} // namespace blink
+
+#endif