Merge 87848 - 2011-06-01 Daniel Cheng <dcheng@chromium.org>

Source/WebCore/platform/chromium/ClipboardChromium.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 206 matching lines @@
     CachedImage* cachedImage = getCachedImage(element);
     if (!cachedImage || !cachedImage->image() || !cachedImage->isLoaded())
         return;
 
     SharedBuffer* imageBuffer = cachedImage->image()->data();
     if (!imageBuffer || !imageBuffer->size())
         return;
 
     dataObject->setFileContent(imageBuffer);
 
-    // Determine the filename for the file contents of the image.  We try to
-    // use the alt tag if one exists, otherwise we fall back on the suggested
-    // filename in the http header, and finally we resort to using the filename
-    // in the URL.
+    // Determine the filename for the file contents of the image.
+    String filename = cachedImage->response().suggestedFilename();
+    if (filename.isEmpty())
+        filename = url.lastPathComponent();
+    if (filename.isEmpty())
+        filename = element->getAttribute(altAttr);
+    else {
+        // Strip any existing extension. Assume that alt text is usually not a filename.
+        int extensionIndex = filename.reverseFind('.');
+        if (extensionIndex != -1)
+            filename.truncate(extensionIndex);
+    }
+    filename = ClipboardChromium::validateFileName(filename, dataObject);
+
     String extension = MIMETypeRegistry::getPreferredExtensionForMIMEType(
         cachedImage->response().mimeType());
     dataObject->setFileExtension(extension.isEmpty() ? emptyString() : "." + extension);
-    String title = element->getAttribute(altAttr);
-    if (title.isEmpty())
-        title = cachedImage->response().suggestedFilename();
 
-    title = ClipboardChromium::validateFileName(title, dataObject);
-    dataObject->setFileContentFilename(title + dataObject->fileExtension());
+    dataObject->setFileContentFilename(filename + dataObject->fileExtension());
 }
 
 void ClipboardChromium::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame)
 {
     if (!m_dataObject)
         return;
 
     m_dataObject->setData(mimeTypeURL, url);
     m_dataObject->setUrlTitle(title);
 
@@ skipping 78 matching lines @@
         // Iterate through the types and add them.
         HashSet<String> types = m_dataObject->types();
         for (HashSet<String>::const_iterator it = types.begin(); it != types.end(); ++it)
             items->addPasteboardItem(*it);
     }
     return items;
 }
 #endif
 
 } // namespace WebCore