| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 1634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1645 static bool findDropZone(Node* target, DataTransfer* dataTransfer) | 1645 static bool findDropZone(Node* target, DataTransfer* dataTransfer) |
| 1646 { | 1646 { |
| 1647 Element* element = target->isElementNode() ? toElement(target) : target->par
entElement(); | 1647 Element* element = target->isElementNode() ? toElement(target) : target->par
entElement(); |
| 1648 for (; element; element = element->parentElement()) { | 1648 for (; element; element = element->parentElement()) { |
| 1649 bool matched = false; | 1649 bool matched = false; |
| 1650 AtomicString dropZoneStr = element->fastGetAttribute(webkitdropzoneAttr)
; | 1650 AtomicString dropZoneStr = element->fastGetAttribute(webkitdropzoneAttr)
; |
| 1651 | 1651 |
| 1652 if (dropZoneStr.isEmpty()) | 1652 if (dropZoneStr.isEmpty()) |
| 1653 continue; | 1653 continue; |
| 1654 | 1654 |
| 1655 UseCounter::count(element->document(), UseCounter::PrefixedHTMLElementDr
opzone); |
| 1656 |
| 1655 dropZoneStr = dropZoneStr.lower(); | 1657 dropZoneStr = dropZoneStr.lower(); |
| 1656 | 1658 |
| 1657 SpaceSplitString keywords(dropZoneStr, false); | 1659 SpaceSplitString keywords(dropZoneStr, false); |
| 1658 if (keywords.isNull()) | 1660 if (keywords.isNull()) |
| 1659 continue; | 1661 continue; |
| 1660 | 1662 |
| 1661 DragOperation dragOperation = DragOperationNone; | 1663 DragOperation dragOperation = DragOperationNone; |
| 1662 for (unsigned i = 0; i < keywords.size(); i++) { | 1664 for (unsigned i = 0; i < keywords.size(); i++) { |
| 1663 DragOperation op = convertDropZoneOperationToDragOperation(keywords[
i]); | 1665 DragOperation op = convertDropZoneOperationToDragOperation(keywords[
i]); |
| 1664 if (op != DragOperationNone) { | 1666 if (op != DragOperationNone) { |
| (...skipping 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3827 unsigned EventHandler::accessKeyModifiers() | 3829 unsigned EventHandler::accessKeyModifiers() |
| 3828 { | 3830 { |
| 3829 #if OS(MACOSX) | 3831 #if OS(MACOSX) |
| 3830 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3832 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3831 #else | 3833 #else |
| 3832 return PlatformEvent::AltKey; | 3834 return PlatformEvent::AltKey; |
| 3833 #endif | 3835 #endif |
| 3834 } | 3836 } |
| 3835 | 3837 |
| 3836 } // namespace blink | 3838 } // namespace blink |
| OLD | NEW |