Merge 100203

Source/WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 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
@@ skipping 287 matching lines @@
         return false;
 
     return true;
 }
 
 bool SecurityOrigin::canReceiveDragData(const SecurityOrigin* dragInitiator) const
 {
     if (this == dragInitiator)
         return true;
 
-    // FIXME: Currently we treat data URLs as having a unique origin, contrary to the
-    // current (9/19/2009) draft of the HTML5 specification. We still want to allow
-    // drop across data URLs, so we special case data URLs below. If we change to
-    // match HTML5 w.r.t. data URL security, then we can remove this check.
-    if (m_protocol == "data")
-        return true;
-
     return canAccess(dragInitiator);  
 }
 
 bool SecurityOrigin::isAccessWhiteListed(const SecurityOrigin* targetOrigin) const
 {
     if (OriginAccessWhiteList* list = originAccessMap().get(toString())) {
         for (size_t i = 0; i < list->size();  ++i) {
            if (list->at(i).matchesOrigin(*targetOrigin))
                return true;
        }
@@ skipping 278 matching lines @@
 
 void SecurityOrigin::resetOriginAccessWhitelists()
 {
     ASSERT(isMainThread());
     OriginAccessMap& map = originAccessMap();
     deleteAllValues(map);
     map.clear();
 }
 
 } // namespace WebCore