Only generate suggested filenames when actually dragging an image.

third_party/WebKit/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 204 matching lines @@
   return results;
 }
 
 void DataObject::addFilename(const String& filename,
                              const String& displayName,
                              const String& fileSystemId) {
   internalAddFileItem(DataObjectItem::createFromFileWithFileSystemId(
       File::createForUserProvidedFile(filename, displayName), fileSystemId));
 }
 
-void DataObject::addSharedBuffer(const String& name,
-                                 PassRefPtr<SharedBuffer> buffer) {
-  internalAddFileItem(
-      DataObjectItem::createFromSharedBuffer(name, std::move(buffer)));
+void DataObject::addSharedBuffer(PassRefPtr<SharedBuffer> buffer,
+                                 const KURL& sourceURL,
+                                 const String& filenameExtension,
+                                 const AtomicString& contentDisposition) {
+  internalAddFileItem(DataObjectItem::createFromSharedBuffer(
+      std::move(buffer), sourceURL, filenameExtension, contentDisposition));
 }
 
 DataObject::DataObject() : m_modifiers(0) {}
 
 DataObjectItem* DataObject::findStringItem(const String& type) const {
   for (size_t i = 0; i < m_itemList.size(); ++i) {
     if (m_itemList[i]->kind() == DataObjectItem::StringKind &&
         m_itemList[i]->type() == type)
       return m_itemList[i];
   }
@@ skipping 76 matching lines @@
   data.setModifierKeyState(m_modifiers);
   WebVector<WebDragData::Item> itemList(length());
 
   for (size_t i = 0; i < length(); ++i) {
     DataObjectItem* originalItem = item(i);
     WebDragData::Item item;
     if (originalItem->kind() == DataObjectItem::StringKind) {
       item.storageType = WebDragData::Item::StorageTypeString;
       item.stringType = originalItem->type();
       item.stringData = originalItem->getAsString();
+      item.title = originalItem->title();
+      item.baseURL = originalItem->baseURL();
     } else if (originalItem->kind() == DataObjectItem::FileKind) {
       if (originalItem->sharedBuffer()) {
         item.storageType = WebDragData::Item::StorageTypeBinaryData;
         item.binaryData = originalItem->sharedBuffer();
+        item.binaryDataSourceURL = originalItem->baseURL();
+        item.binaryDataFilenameExtension = originalItem->filenameExtension();
+        item.binaryDataContentDisposition = originalItem->title();
       } 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();
             item.fileSystemId = originalItem->fileSystemId();
           } 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