Fix webkitdropzone to accept file drops on non-file: page.

third_party/WebKit/Source/core/clipboard/DataTransfer.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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:
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 109 matching lines @@
 void DataTransfer::setDropEffect(const String& effect) {
   if (!isForDragAndDrop())
     return;
 
   // The attribute must ignore any attempts to set it to a value other than
   // none, copy, link, and move.
   if (effect != "none" && effect != "copy" && effect != "link" &&
       effect != "move")
     return;
 
-  // FIXME: The spec actually allows this in all circumstances, even though
-  // there's no point in setting the drop effect when this condition is not
-  // true.
-  if (canReadTypes())
-    m_dropEffect = effect;
+  // The specification states that dropEffect can be changed at all times, even
+  // if the DataTransfer instance is protected or neutered.
+  //
+  // Allowing these changes seems inconsequential, but findDropZone() in
+  // EventHandler.cpp relies on being able to call setDropEffect during
+  // dragenter, when the DataTransfer policy is DataTransferTypesReadable.
+  m_dropEffect = effect;
 }
 
 void DataTransfer::setEffectAllowed(const String& effect) {
   if (!isForDragAndDrop())
     return;
 
   if (convertEffectAllowedToDragOperation(effect) == DragOperationPrivate) {
     // This means that there was no conversion, and the effectAllowed that
     // we are passed isn't a valid effectAllowed, so we should ignore it,
     // and not set m_effectAllowed.
@@ skipping 312 matching lines @@
 
   m_dragImage = image;
   m_dragLoc = loc;
   m_dragImageElement = node;
 }
 
 bool DataTransfer::hasFileOfType(const String& type) const {
   if (!canReadTypes())
     return false;
 
-  FileList* fileList = files();
-  if (fileList->isEmpty())
-    return false;
-
-  for (unsigned f = 0; f < fileList->length(); f++) {
-    if (equalIgnoringCase(fileList->item(f)->type(), type))
-      return true;
+  for (size_t i = 0; i < m_dataObject->length(); ++i) {
+    if (m_dataObject->item(i)->kind() == DataObjectItem::FileKind) {
+      Blob* blob = m_dataObject->item(i)->getAsFile();
+      if (blob && blob->isFile() && equalIgnoringCase(blob->type(), type))
+        return true;
+    }
   }
   return false;
 }
 
 bool DataTransfer::hasStringOfType(const String& type) const {
   if (!canReadTypes())
     return false;
 
   return types().contains(type);
 }
@@ skipping 22 matching lines @@
   }
 }
 
 DEFINE_TRACE(DataTransfer) {
   visitor->trace(m_dataObject);
   visitor->trace(m_dragImage);
   visitor->trace(m_dragImageElement);
 }
 
 }  // namespace blink