Fixed WebDragData's wrong dependency.

Source/core/clipboard/DataObject.cpp

 /*
  * Copyright (c) 2008, 2009, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/clipboard/DataObject.h"
 
+#include "core/clipboard/DraggedIsolatedFileSystem.h"
 #include "core/clipboard/Pasteboard.h"
 #include "platform/clipboard/ClipboardMimeTypes.h"
 #include "platform/clipboard/ClipboardUtilities.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
+#include "public/platform/WebDragData.h"
 
 namespace blink {
 
 PassRefPtrWillBeRawPtr<DataObject> DataObject::createFromPasteboard(PasteMode pasteMode)
 {
     RefPtrWillBeRawPtr<DataObject> dataObject = create();
     blink::WebClipboard::Buffer buffer = Pasteboard::generalPasteboard()->buffer();
     uint64_t sequenceNumber = blink::Platform::current()->clipboard()->sequenceNumber(buffer);
     bool ignored;
     blink::WebVector<blink::WebString> webTypes = blink::Platform::current()->clipboard()->readAvailableTypes(buffer, &ignored);
@@ skipping 198 matching lines @@
 }
 
 DEFINE_TRACE(DataObject)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_itemList);
     HeapSupplementable<DataObject>::trace(visitor);
 #endif
 }
 
+PassRefPtrWillBeRawPtr<DataObject> DataObject::create(WebDragData data)
+{
+    RefPtrWillBeRawPtr<DataObject> dataObject = create();
+
+    WebVector<WebDragData::Item> items = data.items();
+    for (unsigned i = 0; i < items.size(); ++i) {
+        WebDragData::Item item = items[i];
+
+        switch (item.storageType) {
+        case WebDragData::Item::StorageTypeString:
+            if (String(item.stringType) == mimeTypeTextURIList)
+                dataObject->setURLAndTitle(item.stringData, item.title);
+            else if (String(item.stringType) == mimeTypeTextHTML)
+                dataObject->setHTMLAndBaseURL(item.stringData, item.baseURL);
+            else
+                dataObject->setData(item.stringType, item.stringData);
+            break;
+        case WebDragData::Item::StorageTypeFilename:
+            dataObject->addFilename(item.filenameData, item.displayNameData);
+            break;
+        case WebDragData::Item::StorageTypeBinaryData:
+            // This should never happen when dragging in.
+            break;
+        case WebDragData::Item::StorageTypeFileSystemFile:
+            {
+                // FIXME: The file system URL may refer a user visible file, see http://crbug.com/429077
+                FileMetadata fileMetadata;
+                fileMetadata.length = item.fileSystemFileSize;
+                dataObject->add(File::createForFileSystemFile(item.fileSystemURL, fileMetadata, File::IsNotUserVisible));
+            }
+            break;
+        }
+    }
+
+    if (!data.filesystemId().isNull())
+        DraggedIsolatedFileSystem::prepareForDataObject(dataObject.get(), data.filesystemId());
+    return dataObject.release();
+}
+
+WebDragData DataObject::toWebDragData()
+{
+    WebDragData data;
+    data.initialize();
+    WebVector<WebDragData::Item> itemList(length());
+
+    for (size_t i = 0; i < length(); ++i) {
+        DataObjectItem* originalItem = item(i).get();
+        WebDragData::Item item;
+        if (originalItem->kind() == DataObjectItem::StringKind) {
+            item.storageType = WebDragData::Item::StorageTypeString;
+            item.stringType = originalItem->type();
+            item.stringData = originalItem->getAsString();
+        } else if (originalItem->kind() == DataObjectItem::FileKind) {
+            if (originalItem->sharedBuffer()) {
+                item.storageType = WebDragData::Item::StorageTypeBinaryData;
+                item.binaryData = originalItem->sharedBuffer();
+            } else if (originalItem->isFilename()) {
+                Blob* blob = originalItem->getAsFile();
+                if (blob->isFile()) {
+                    File* file = toFile(blob);
+                    if (file->hasBackingFile()) {
+                        item.storageType = WebDragData::Item::StorageTypeFilename;
+                        item.filenameData = file->path();
+                        item.displayNameData = file->name();
+                    } else if (!file->fileSystemURL().isEmpty()) {
+                        item.storageType = WebDragData::Item::StorageTypeFileSystemFile;
+                        item.fileSystemURL = file->fileSystemURL();
+                        item.fileSystemFileSize = file->size();
+                    } else {
+                        // FIXME: support dragging constructed Files across renderers, see http://crbug.com/394955
+                        item.storageType = WebDragData::Item::StorageTypeString;
+                        item.stringType = "text/plain";
+                        item.stringData = file->name();
+                    }
+                } else {
+                    ASSERT_NOT_REACHED();
+                }
+            } else {
+                ASSERT_NOT_REACHED();
+            }
+        } else {
+            ASSERT_NOT_REACHED();
+        }
+        item.title = originalItem->title();
+        item.baseURL = originalItem->baseURL();
+        itemList[i] = item;
+    }
+    data.swapItems(itemList);
+    return data;
+}
+
 } // namespace blink