Changeset 166965 in webkit
- Timestamp:
- Apr 8, 2014, 3:06:16 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 64 edited
- 6 moved
-
LayoutTests/ChangeLog (modified) (1 diff)
-
LayoutTests/fast/dom/dom-constructors-expected.txt (modified) (2 diffs)
-
LayoutTests/fast/dom/dom-constructors.html (modified) (2 diffs)
-
LayoutTests/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (modified) (2 diffs)
-
Source/WebCore/CMakeLists.txt (modified) (4 diffs)
-
Source/WebCore/ChangeLog (modified) (1 diff)
-
Source/WebCore/Configurations/WebCore.xcconfig (modified) (1 diff)
-
Source/WebCore/DerivedSources.cpp (modified) (2 diffs)
-
Source/WebCore/DerivedSources.make (modified) (2 diffs)
-
Source/WebCore/WebCore.exp.in (modified) (3 diffs)
-
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (modified) (10 diffs)
-
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (modified) (10 diffs)
-
Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (19 diffs)
-
Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (modified) (2 diffs)
-
Source/WebCore/bindings/js/JSDataTransferCustom.cpp (moved) (moved from trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp ) (2 diffs)
-
Source/WebCore/bindings/js/JSEventCustom.cpp (modified) (1 diff)
-
Source/WebCore/dom/ClipboardEvent.cpp (modified) (2 diffs)
-
Source/WebCore/dom/ClipboardEvent.h (modified) (2 diffs)
-
Source/WebCore/dom/DOMAllInOne.cpp (modified) (2 diffs)
-
Source/WebCore/dom/DataTransfer.cpp (moved) (moved from trunk/Source/WebCore/dom/Clipboard.cpp ) (23 diffs)
-
Source/WebCore/dom/DataTransfer.h (moved) (moved from trunk/Source/WebCore/dom/Clipboard.h ) (7 diffs)
-
Source/WebCore/dom/DataTransfer.idl (moved) (moved from trunk/Source/WebCore/dom/Clipboard.idl ) (1 diff)
-
Source/WebCore/dom/DataTransferAccessPolicy.h (moved) (moved from trunk/Source/WebCore/dom/ClipboardAccessPolicy.h ) (1 diff)
-
Source/WebCore/dom/DataTransferItemList.h (modified) (1 diff)
-
Source/WebCore/dom/DataTransferMac.mm (moved) (moved from trunk/Source/WebCore/dom/ClipboardMac.mm ) (2 diffs)
-
Source/WebCore/dom/Event.h (modified) (3 diffs)
-
Source/WebCore/dom/Event.idl (modified) (1 diff)
-
Source/WebCore/dom/MouseEvent.cpp (modified) (7 diffs)
-
Source/WebCore/dom/MouseEvent.h (modified) (5 diffs)
-
Source/WebCore/dom/MouseEvent.idl (modified) (1 diff)
-
Source/WebCore/dom/WheelEvent.cpp (modified) (1 diff)
-
Source/WebCore/editing/Editor.cpp (modified) (9 diffs)
-
Source/WebCore/editing/Editor.h (modified) (4 diffs)
-
Source/WebCore/editing/ios/EditorIOS.mm (modified) (2 diffs)
-
Source/WebCore/editing/mac/EditorMac.mm (modified) (4 diffs)
-
Source/WebCore/loader/EmptyClients.h (modified) (1 diff)
-
Source/WebCore/page/DragClient.h (modified) (2 diffs)
-
Source/WebCore/page/DragController.cpp (modified) (15 diffs)
-
Source/WebCore/page/DragController.h (modified) (2 diffs)
-
Source/WebCore/page/DragState.h (modified) (2 diffs)
-
Source/WebCore/page/EventHandler.cpp (modified) (20 diffs)
-
Source/WebCore/page/EventHandler.h (modified) (4 diffs)
-
Source/WebCore/page/efl/EventHandlerEfl.cpp (modified) (2 diffs)
-
Source/WebCore/page/gtk/DragControllerGtk.cpp (modified) (2 diffs)
-
Source/WebCore/page/gtk/EventHandlerGtk.cpp (modified) (2 diffs)
-
Source/WebCore/page/mac/DragControllerMac.mm (modified) (2 diffs)
-
Source/WebCore/page/mac/EventHandlerMac.mm (modified) (3 diffs)
-
Source/WebCore/page/win/DragControllerWin.cpp (modified) (2 diffs)
-
Source/WebCore/page/win/EventHandlerWin.cpp (modified) (2 diffs)
-
Source/WebCore/platform/Pasteboard.h (modified) (2 diffs)
-
Source/WebCore/platform/gtk/PasteboardGtk.cpp (modified) (1 diff)
-
Source/WebCore/platform/mac/PasteboardMac.mm (modified) (1 diff)
-
Source/WebCore/platform/win/PasteboardWin.cpp (modified) (3 diffs)
-
Source/WebKit/ios/ChangeLog (modified) (1 diff)
-
Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (modified) (1 diff)
-
Source/WebKit/mac/ChangeLog (modified) (1 diff)
-
Source/WebKit/mac/WebCoreSupport/WebDragClient.h (modified) (1 diff)
-
Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (modified) (3 diffs)
-
Source/WebKit/mac/WebView/WebPDFView.mm (modified) (1 diff)
-
Source/WebKit/win/WebCoreSupport/WebDragClient.cpp (modified) (4 diffs)
-
Source/WebKit/win/WebCoreSupport/WebDragClient.h (modified) (1 diff)
-
Source/WebKit2/ChangeLog (modified) (1 diff)
-
Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp (modified) (2 diffs)
-
Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h (modified) (1 diff)
-
Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r166960 r166965 1 2014-04-08 Alexey Proskuryakov <ap@apple.com> 2 3 Rename Clipboard to DataTransfer 4 https://bugs.webkit.org/show_bug.cgi?id=131371 5 6 Reviewed by Anders Carlsson. 7 8 * fast/dom/dom-constructors-expected.txt: 9 * fast/dom/dom-constructors.html: 10 * js/dom/global-constructors-attributes-expected.txt: 11 * platform/efl/js/dom/global-constructors-attributes-expected.txt: 12 * platform/gtk-wk1/js/dom/global-constructors-attributes-expected.txt: 13 * platform/gtk-wk2/js/dom/global-constructors-attributes-expected.txt: 14 * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt: 15 * platform/mac/js/dom/global-constructors-attributes-expected.txt: 16 * platform/win/js/dom/global-constructors-attributes-expected.txt: 17 1 18 2014-04-08 Brent Fulgham <bfulgham@apple.com> 2 19 -
trunk/LayoutTests/fast/dom/dom-constructors-expected.txt
r164036 r166965 72 72 PASS TryAllocate('HTMLElement') is 'exception' 73 73 PASS TryAllocate('CanvasRenderingContext2D') is 'exception' 74 PASS TryAllocate('Clipboard') is 'exception'75 74 PASS TryAllocate('Counter') is 'exception' 76 75 PASS TryAllocate('CSSCharsetRule') is 'exception' … … 87 86 PASS TryAllocate('CSSValue') is 'exception' 88 87 PASS TryAllocate('CSSValueList') is 'exception' 88 PASS TryAllocate('DataTransfer') is 'exception' 89 89 PASS TryAllocate('DOMImplementation') is 'exception' 90 90 PASS TryAllocate('HTMLCollection') is 'exception' -
trunk/LayoutTests/fast/dom/dom-constructors.html
r164036 r166965 82 82 'HTMLElement', 83 83 'CanvasRenderingContext2D', 84 'Clipboard',85 84 'Counter', 86 85 'CSSCharsetRule', … … 97 96 'CSSValue', 98 97 'CSSValueList', 98 'DataTransfer', 99 99 'DOMImplementation', 100 100 'HTMLCollection', -
trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt
r165651 r166965 189 189 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 190 190 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 191 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard192 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false193 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false194 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false195 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true196 191 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 197 192 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 264 259 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 265 260 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 261 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 262 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 263 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 264 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 265 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 266 266 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode 267 267 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt
r165806 r166965 189 189 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 190 190 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 191 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard192 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false193 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false194 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false195 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true196 191 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 197 192 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 264 259 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 265 260 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 261 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 262 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 263 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 264 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 265 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 266 266 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode 267 267 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt
r166911 r166965 194 194 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 195 195 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 196 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard197 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false198 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false199 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false200 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true201 196 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 202 197 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 269 264 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 270 265 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 266 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 267 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 268 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 269 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 270 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 271 271 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode 272 272 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt
r166201 r166965 189 189 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 190 190 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 191 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard192 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false193 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false194 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false195 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true196 191 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 197 192 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 264 259 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 265 260 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 261 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 262 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 263 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 264 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 265 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 266 266 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode 267 267 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
r166201 r166965 189 189 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 190 190 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 191 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard192 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false193 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false194 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false195 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true196 191 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 197 192 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 264 259 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 265 260 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 261 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 262 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 263 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 264 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 265 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 266 266 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode 267 267 PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false -
trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt
r163974 r166965 134 134 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false 135 135 PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true 136 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard137 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false138 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false139 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false140 PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true141 136 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent 142 137 PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false … … 204 199 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false 205 200 PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true 201 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer 202 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false 203 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false 204 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false 205 PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true 206 206 PASS Object.getOwnPropertyDescriptor(global, 'Document').value is Document 207 207 PASS Object.getOwnPropertyDescriptor(global, 'Document').hasOwnProperty('get') is false -
trunk/Source/WebCore/CMakeLists.txt
r166752 r166965 345 345 dom/ClientRect.idl 346 346 dom/ClientRectList.idl 347 dom/Clipboard.idl348 347 dom/Comment.idl 349 348 dom/CompositionEvent.idl … … 355 354 dom/DOMStringList.idl 356 355 dom/DOMStringMap.idl 356 dom/DataTransfer.idl 357 357 dom/DataTransferItem.idl 358 358 dom/DataTransferItemList.idl … … 1128 1128 dom/ClientRect.cpp 1129 1129 dom/ClientRectList.cpp 1130 dom/Clipboard.cpp1131 1130 dom/ClipboardEvent.cpp 1132 1131 dom/CollectionIndexCache.cpp … … 1142 1141 dom/DOMNamedFlowCollection.cpp 1143 1142 dom/DOMStringList.cpp 1143 dom/DataTransfer.cpp 1144 1144 dom/DataTransferItem.cpp 1145 1145 dom/DatasetDOMStringMap.cpp -
trunk/Source/WebCore/ChangeLog
r166964 r166965 1 2014-04-08 Alexey Proskuryakov <ap@apple.com> 2 3 Rename Clipboard to DataTransfer 4 https://bugs.webkit.org/show_bug.cgi?id=131371 5 6 Reviewed by Anders Carlsson. 7 8 This is the name used in HTML5, and it's much better than the confusing Clipboard one. 9 10 Renamed related enums too, and made DataTransferAccessPolicy an enum class. 11 12 * CMakeLists.txt: 13 * Configurations/WebCore.xcconfig: 14 * DerivedSources.cpp: 15 * DerivedSources.make: 16 * WebCore.exp.in: 17 * WebCore.vcxproj/WebCore.vcxproj: 18 * WebCore.vcxproj/WebCore.vcxproj.filters: 19 * WebCore.xcodeproj/project.pbxproj: 20 * bindings/js/JSBindingsAllInOne.cpp: 21 * bindings/js/JSClipboardCustom.cpp: Removed. 22 * bindings/js/JSDataTransferCustom.cpp: Copied from Source/WebCore/bindings/js/JSClipboardCustom.cpp. 23 (WebCore::JSDataTransfer::types): 24 (WebCore::JSClipboard::types): Deleted. 25 * bindings/js/JSEventCustom.cpp: 26 * dom/Clipboard.cpp: Removed. 27 * dom/Clipboard.h: Removed. 28 * dom/Clipboard.idl: Removed. 29 * dom/ClipboardAccessPolicy.h: Removed. 30 * dom/ClipboardEvent.cpp: 31 (WebCore::ClipboardEvent::ClipboardEvent): 32 * dom/ClipboardEvent.h: 33 (WebCore::ClipboardEvent::create): 34 (WebCore::ClipboardEvent::clipboard): Deleted. 35 * dom/ClipboardMac.mm: Removed. 36 * dom/DOMAllInOne.cpp: 37 * dom/DataTransfer.cpp: Copied from Source/WebCore/dom/Clipboard.cpp. 38 (WebCore::DataTransfer::DataTransfer): 39 (WebCore::DataTransfer::createForCopyAndPaste): 40 (WebCore::DataTransfer::~DataTransfer): 41 (WebCore::DataTransfer::setAccessPolicy): 42 (WebCore::DataTransfer::canReadTypes): 43 (WebCore::DataTransfer::canReadData): 44 (WebCore::DataTransfer::canWriteData): 45 (WebCore::DataTransfer::clearData): 46 (WebCore::DataTransfer::getData): 47 (WebCore::DataTransfer::setData): 48 (WebCore::DataTransfer::types): 49 (WebCore::DataTransfer::files): 50 (WebCore::DataTransfer::dropEffect): 51 (WebCore::DataTransfer::setDropEffect): 52 (WebCore::DataTransfer::effectAllowed): 53 (WebCore::DataTransfer::setEffectAllowed): 54 (WebCore::DataTransfer::setDragImage): 55 (WebCore::DataTransfer::createForDragAndDrop): 56 (WebCore::DataTransfer::canSetDragImage): 57 (WebCore::DataTransfer::updateDragImage): 58 (WebCore::DataTransfer::createDragImage): 59 (WebCore::DragImageLoader::DragImageLoader): 60 (WebCore::DragImageLoader::imageChanged): 61 (WebCore::DataTransfer::sourceOperation): 62 (WebCore::DataTransfer::destinationOperation): 63 (WebCore::DataTransfer::setSourceOperation): 64 (WebCore::DataTransfer::setDestinationOperation): 65 (WebCore::Clipboard::Clipboard): Deleted. 66 (WebCore::Clipboard::createForCopyAndPaste): Deleted. 67 (WebCore::Clipboard::~Clipboard): Deleted. 68 (WebCore::Clipboard::setAccessPolicy): Deleted. 69 (WebCore::Clipboard::canReadTypes): Deleted. 70 (WebCore::Clipboard::canReadData): Deleted. 71 (WebCore::Clipboard::canWriteData): Deleted. 72 (WebCore::Clipboard::clearData): Deleted. 73 (WebCore::Clipboard::getData): Deleted. 74 (WebCore::Clipboard::setData): Deleted. 75 (WebCore::Clipboard::types): Deleted. 76 (WebCore::Clipboard::files): Deleted. 77 (WebCore::Clipboard::dropEffect): Deleted. 78 (WebCore::Clipboard::setDropEffect): Deleted. 79 (WebCore::Clipboard::effectAllowed): Deleted. 80 (WebCore::Clipboard::setEffectAllowed): Deleted. 81 (WebCore::Clipboard::setDragImage): Deleted. 82 (WebCore::Clipboard::createForDragAndDrop): Deleted. 83 (WebCore::Clipboard::canSetDragImage): Deleted. 84 (WebCore::Clipboard::updateDragImage): Deleted. 85 (WebCore::Clipboard::createDragImage): Deleted. 86 (WebCore::Clipboard::sourceOperation): Deleted. 87 (WebCore::Clipboard::destinationOperation): Deleted. 88 (WebCore::Clipboard::setSourceOperation): Deleted. 89 (WebCore::Clipboard::setDestinationOperation): Deleted. 90 * dom/DataTransfer.h: Copied from Source/WebCore/dom/Clipboard.h. 91 * dom/DataTransfer.idl: Copied from Source/WebCore/dom/Clipboard.idl. 92 * dom/DataTransferAccessPolicy.h: Copied from Source/WebCore/dom/ClipboardAccessPolicy.h. 93 * dom/DataTransferItemList.h: 94 * dom/DataTransferMac.mm: Copied from Source/WebCore/dom/ClipboardMac.mm. 95 (WebCore::DataTransfer::createDragImage): 96 (WebCore::Clipboard::createDragImage): Deleted. 97 * dom/Event.h: 98 (WebCore::Event::clipboardData): 99 (WebCore::Event::internalDataTransfer): 100 (WebCore::Event::clipboard): Deleted. 101 * dom/Event.idl: 102 * dom/MouseEvent.cpp: 103 (WebCore::MouseEvent::create): 104 (WebCore::MouseEvent::MouseEvent): 105 (WebCore::MouseEvent::initMouseEvent): 106 * dom/MouseEvent.h: 107 (WebCore::MouseEvent::dataTransfer): 108 * dom/MouseEvent.idl: 109 * dom/WheelEvent.cpp: 110 * editing/Editor.cpp: 111 (WebCore::Editor::canDHTMLCut): 112 (WebCore::Editor::canDHTMLCopy): 113 (WebCore::Editor::canDHTMLPaste): 114 (WebCore::Editor::tryDHTMLCopy): 115 (WebCore::Editor::tryDHTMLCut): 116 (WebCore::Editor::tryDHTMLPaste): 117 (WebCore::Editor::dispatchCPPEvent): 118 (WebCore::Editor::performCutOrCopy): 119 (WebCore::Editor::selectedTextForDataTransfer): 120 (WebCore::Editor::selectedTextForClipboard): Deleted. 121 * editing/Editor.h: 122 * editing/ios/EditorIOS.mm: 123 (WebCore::Editor::stringSelectionForPasteboardWithImageAltText): 124 * editing/mac/EditorMac.mm: 125 (WebCore::Editor::takeFindStringFromSelection): 126 (WebCore::Editor::stringSelectionForPasteboardWithImageAltText): 127 * loader/EmptyClients.h: 128 * page/DragClient.h: 129 * page/DragController.cpp: 130 (WebCore::DragController::dragExited): 131 (WebCore::DragController::performDrag): 132 (WebCore::DragController::tryDHTMLDrag): 133 (WebCore::DragController::startDrag): 134 (WebCore::DragController::doImageDrag): 135 (WebCore::DragController::doSystemDrag): 136 * page/DragController.h: 137 * page/DragState.h: 138 * page/EventHandler.cpp: 139 (WebCore::EventHandler::dispatchDragEvent): 140 (WebCore::hasFileOfType): 141 (WebCore::hasStringOfType): 142 (WebCore::hasDropZoneType): 143 (WebCore::findDropZone): 144 (WebCore::EventHandler::updateDragAndDrop): 145 (WebCore::EventHandler::cancelDragAndDrop): 146 (WebCore::EventHandler::performDragAndDrop): 147 (WebCore::EventHandler::freeDataTransfer): 148 (WebCore::EventHandler::dragSourceEndedAt): 149 (WebCore::EventHandler::dispatchDragSrcEvent): 150 (WebCore::EventHandler::handleDrag): 151 (WebCore::EventHandler::freeClipboard): Deleted. 152 * page/EventHandler.h: 153 * page/efl/EventHandlerEfl.cpp: 154 (WebCore::EventHandler::createDraggingDataTransfer): 155 (WebCore::EventHandler::createDraggingClipboard): Deleted. 156 * page/gtk/DragControllerGtk.cpp: 157 (WebCore::DragController::declareAndWriteDragImage): 158 * page/gtk/EventHandlerGtk.cpp: 159 (WebCore::EventHandler::createDraggingDataTransfer): 160 (WebCore::EventHandler::createDraggingClipboard): Deleted. 161 * page/mac/DragControllerMac.mm: 162 (WebCore::DragController::declareAndWriteDragImage): 163 * page/mac/EventHandlerMac.mm: 164 (WebCore::EventHandler::createDraggingDataTransfer): 165 (WebCore::EventHandler::createDraggingClipboard): Deleted. 166 * page/win/DragControllerWin.cpp: 167 (WebCore::DragController::declareAndWriteDragImage): 168 * page/win/EventHandlerWin.cpp: 169 (WebCore::EventHandler::createDraggingataTransfer): 170 (WebCore::EventHandler::createDraggingClipboard): Deleted. 171 * platform/Pasteboard.h: 172 * platform/gtk/PasteboardGtk.cpp: 173 (WebCore::Pasteboard::writeSelection): 174 * platform/mac/PasteboardMac.mm: 175 * platform/win/PasteboardWin.cpp: 176 (WebCore::Pasteboard::writeRangeToDataObject): 177 (WebCore::Pasteboard::writeSelection): 178 1 179 2014-04-08 Jer Noble <jer.noble@apple.com> 2 180 -
trunk/Source/WebCore/Configurations/WebCore.xcconfig
r163657 r166965 113 113 114 114 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)); 115 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm C lipboardMac.mm ColorMac.mm Cursor.cpp CursorMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp;115 EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollingStateScrollingNodeMac.mm ScrollingTreeScrollingNodeMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm mac/LayerPool.mm DisplayRefreshMonitorMac.cpp; 116 116 EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos); 117 117 EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm JSTouch* JSGesture* DOMGesture* DOMTouch* KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h; -
trunk/Source/WebCore/DerivedSources.cpp
r166782 r166965 76 76 #include "JSClientRect.cpp" 77 77 #include "JSClientRectList.cpp" 78 #include "JSClipboard.cpp"79 78 #include "JSCloseEvent.cpp" 80 79 #include "JSCommandLineAPIHost.cpp" … … 105 104 #include "JSDatabaseCallback.cpp" 106 105 #include "JSDatabaseSync.cpp" 106 #include "JSDataTransfer.cpp" 107 107 #include "JSDataTransferItem.cpp" 108 108 #include "JSDataTransferItemList.cpp" -
trunk/Source/WebCore/DerivedSources.make
r166782 r166965 252 252 $(WebCore)/dom/ClientRect.idl \ 253 253 $(WebCore)/dom/ClientRectList.idl \ 254 $(WebCore)/dom/Clipboard.idl \255 254 $(WebCore)/dom/Comment.idl \ 256 255 $(WebCore)/dom/CompositionEvent.idl \ … … 261 260 $(WebCore)/dom/DOMStringList.idl \ 262 261 $(WebCore)/dom/DOMStringMap.idl \ 262 $(WebCore)/dom/DataTransfer.idl \ 263 263 $(WebCore)/dom/DataTransferItem.idl \ 264 264 $(WebCore)/dom/DataTransferItemList.idl \ -
trunk/Source/WebCore/WebCore.exp.in
r166886 r166965 79 79 __ZN7WebCore10LayoutRectC1ERKNS_9FloatRectE 80 80 __ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringENS1_10PassRefPtrINS_9DOMWindowEEERKNS_18PlatformMouseEventEiNS5_INS_4NodeEEE 81 __ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_ 9ClipboardEEEb81 __ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_12DataTransferEEEb 82 82 __ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOptionE 83 83 __ZN7WebCore10Pasteboard21createForCopyAndPasteEv … … 190 190 __ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE 191 191 __ZN7WebCore11writeToFileEiPKci 192 __ZN7WebCore12DataTransferD1Ev 192 193 __ZN7WebCore12EditingStyleD1Ev 193 194 __ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE … … 1308 1309 __ZN7WebCore8toUInt16EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE 1309 1310 __ZN7WebCore8toUInt64EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE 1310 __ZN7WebCore9ClipboardD1Ev1311 1311 __ZN7WebCore9DOMWindow30dispatchAllPendingUnloadEventsEv 1312 1312 __ZN7WebCore9DOMWindow36dispatchAllPendingBeforeUnloadEventsEv -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r166782 r166965 996 996 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 997 997 </ClCompile> 998 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.cpp">999 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>1000 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>1001 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>1002 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>1003 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>1004 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>1005 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>1006 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>1007 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>1008 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>1009 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>1010 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>1011 </ClCompile>1012 998 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp"> 1013 999 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 1333 1319 </ClCompile> 1334 1320 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp"> 1321 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 1322 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 1323 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 1324 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 1325 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 1326 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> 1327 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 1328 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 1329 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 1330 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 1331 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 1332 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 1333 </ClCompile> 1334 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp"> 1335 1335 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 1336 1336 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> … … 12378 12378 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 12379 12379 </ClCompile> 12380 <ClCompile Include="..\dom\Clipboard.cpp">12381 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>12382 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>12383 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>12384 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>12385 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>12386 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>12387 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>12388 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>12389 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>12390 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>12391 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>12392 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>12393 </ClCompile>12394 12380 <ClCompile Include="..\dom\ClipboardEvent.cpp"> 12395 12381 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 12491 12477 </ClCompile> 12492 12478 <ClCompile Include="..\dom\DatasetDOMStringMap.cpp"> 12479 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 12480 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 12481 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 12482 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 12483 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 12484 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> 12485 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 12486 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 12487 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 12488 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 12489 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 12490 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 12491 </ClCompile> 12492 <ClCompile Include="..\dom\DataTransfer.cpp"> 12493 12493 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 12494 12494 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> … … 16055 16055 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 16056 16056 </ClCompile> 16057 <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">16058 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>16059 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>16060 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>16061 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>16062 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>16063 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>16064 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>16065 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>16066 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>16067 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>16068 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>16069 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>16070 </ClCompile>16071 16057 <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp"> 16072 16058 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 16154 16140 </ClCompile> 16155 16141 <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp"> 16142 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 16143 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> 16144 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild> 16145 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild> 16146 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild> 16147 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild> 16148 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> 16149 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> 16150 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild> 16151 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild> 16152 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild> 16153 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 16154 </ClCompile> 16155 <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp"> 16156 16156 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 16157 16157 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> … … 18114 18114 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRect.h" /> 18115 18115 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.h" /> 18116 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h" />18117 18116 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h" /> 18118 18117 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSComment.h" /> … … 18139 18138 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.h" /> 18140 18139 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h" /> 18140 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h" /> 18141 18141 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h" /> 18142 18142 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItemList.h" /> … … 20233 20233 <ClInclude Include="..\dom\ClientRect.h" /> 20234 20234 <ClInclude Include="..\dom\ClientRectList.h" /> 20235 <ClInclude Include="..\dom\Clipboard.h" />20236 <ClInclude Include="..\dom\ClipboardAccessPolicy.h" />20237 20235 <ClInclude Include="..\dom\ClipboardEvent.h" /> 20238 20236 <ClInclude Include="..\dom\CollectionIndexCache.h" /> … … 20244 20242 <ClInclude Include="..\dom\CustomEvent.h" /> 20245 20243 <ClInclude Include="..\dom\DatasetDOMStringMap.h" /> 20244 <ClInclude Include="..\dom\DataTransfer.h" /> 20245 <ClInclude Include="..\dom\DataTransferAccessPolicy.h" /> 20246 20246 <ClInclude Include="..\dom\DataTransferItem.h" /> 20247 20247 <ClInclude Include="..\dom\DataTransferItemList.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r166782 r166965 3055 3055 <Filter>dom</Filter> 3056 3056 </ClCompile> 3057 <ClCompile Include="..\dom\Clipboard.cpp">3058 <Filter>dom</Filter>3059 </ClCompile>3060 3057 <ClCompile Include="..\dom\ClipboardEvent.cpp"> 3061 3058 <Filter>dom</Filter> … … 3077 3074 </ClCompile> 3078 3075 <ClCompile Include="..\dom\DatasetDOMStringMap.cpp"> 3076 <Filter>dom</Filter> 3077 </ClCompile> 3078 <ClCompile Include="..\dom\DataTransfer.cpp"> 3079 3079 <Filter>dom</Filter> 3080 3080 </ClCompile> … … 4264 4264 <Filter>bindings\js</Filter> 4265 4265 </ClCompile> 4266 <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">4267 <Filter>bindings\js</Filter>4268 </ClCompile>4269 4266 <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp"> 4270 4267 <Filter>bindings\js</Filter> … … 4286 4283 </ClCompile> 4287 4284 <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp"> 4285 <Filter>bindings\js</Filter> 4286 </ClCompile> 4287 <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp"> 4288 4288 <Filter>bindings\js</Filter> 4289 4289 </ClCompile> … … 5225 5225 <Filter>DerivedSources</Filter> 5226 5226 </ClCompile> 5227 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.cpp">5228 <Filter>DerivedSources</Filter>5229 </ClCompile>5230 5227 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp"> 5231 5228 <Filter>DerivedSources</Filter> … … 5298 5295 </ClCompile> 5299 5296 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp"> 5297 <Filter>DerivedSources</Filter> 5298 </ClCompile> 5299 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp"> 5300 5300 <Filter>DerivedSources</Filter> 5301 5301 </ClCompile> … … 10004 10004 <Filter>dom</Filter> 10005 10005 </ClInclude> 10006 <ClInclude Include="..\dom\Clipboard.h">10007 <Filter>dom</Filter>10008 </ClInclude>10009 <ClInclude Include="..\dom\ClipboardAccessPolicy.h">10010 <Filter>dom</Filter>10011 </ClInclude>10012 10006 <ClInclude Include="..\dom\ClipboardEvent.h"> 10013 10007 <Filter>dom</Filter> … … 10032 10026 </ClInclude> 10033 10027 <ClInclude Include="..\dom\DatasetDOMStringMap.h"> 10028 <Filter>dom</Filter> 10029 </ClInclude> 10030 <ClInclude Include="..\dom\DataTransfer.h"> 10031 <Filter>dom</Filter> 10032 </ClInclude> 10033 <ClInclude Include="..\dom\DataTransferAccessPolicy.h"> 10034 10034 <Filter>dom</Filter> 10035 10035 </ClInclude> … … 13039 13039 <Filter>DerivedSources</Filter> 13040 13040 </ClInclude> 13041 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h">13042 <Filter>DerivedSources</Filter>13043 </ClInclude>13044 13041 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h"> 13045 13042 <Filter>DerivedSources</Filter> … … 13112 13109 </ClInclude> 13113 13110 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h"> 13111 <Filter>DerivedSources</Filter> 13112 </ClInclude> 13113 <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h"> 13114 13114 <Filter>DerivedSources</Filter> 13115 13115 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r166880 r166965 1716 1716 4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1717 1717 4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */; }; 1718 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };1718 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1719 1719 4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1720 1720 4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */; }; … … 2494 2494 85031B3C0A44EFC700F992E0 /* BeforeUnloadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */; }; 2495 2495 85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */; }; 2496 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* Clipboard.h */; settings = {ATTRIBUTES = (Private, ); }; };2496 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* DataTransfer.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2497 2497 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */; }; 2498 2498 85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */; }; … … 3275 3275 93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; }; 3276 3276 93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; }; 3277 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };3277 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* DataTransferMac.mm */; }; 3278 3278 93F19B0308245E59001E9ABC /* XSLStyleSheetLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24906D18A7E004A6FA3 /* XSLStyleSheetLibxslt.cpp */; }; 3279 3279 93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; }; … … 3778 3778 A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */; }; 3779 3779 A781C6A713828B5D0012A62A /* DocumentMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A781C6A613828B5D0012A62A /* DocumentMarker.cpp */; }; 3780 A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* Clipboard.cpp */; };3780 A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* DataTransfer.cpp */; }; 3781 3781 A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */; }; 3782 3782 A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */; }; … … 5196 5196 BCA2B061105047600043BD1C /* UserScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B0601050475F0043BD1C /* UserScript.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5197 5197 BCA2B08B10505BCD0043BD1C /* UserScriptTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B08A10505BCD0043BD1C /* UserScriptTypes.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5198 BCA83E4F0D7CE1E9003421A8 /* JS Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */; };5199 BCA83E500D7CE1E9003421A8 /* JS Clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */; };5200 BCA83E520D7CE205003421A8 /* JS ClipboardCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */; };5198 BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */; }; 5199 BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */; }; 5200 BCA83E520D7CE205003421A8 /* JSDataTransferCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */; }; 5201 5201 BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA846D40DC67A350026C309 /* RenderReplica.cpp */; }; 5202 5202 BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA846D50DC67A350026C309 /* RenderReplica.h */; }; … … 7960 7960 2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; }; 7961 7961 2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; }; 7962 2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };7962 2D90660C0665D937006B6F1A /* DataTransferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataTransferMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; }; 7963 7963 2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSecurityPolicy.cpp; sourceTree = "<group>"; }; 7964 7964 2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSecurityPolicy.h; sourceTree = "<group>"; }; … … 8687 8687 4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; }; 8688 8688 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplaceCF.cpp; sourceTree = "<group>"; }; 8689 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };8689 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransferAccessPolicy.h; sourceTree = "<group>"; }; 8690 8690 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorDeleteAction.h; sourceTree = "<group>"; }; 8691 8691 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaFeatureNames.cpp; sourceTree = "<group>"; }; … … 9539 9539 85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BeforeUnloadEvent.cpp; sourceTree = "<group>"; }; 9540 9540 85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BeforeUnloadEvent.h; sourceTree = "<group>"; }; 9541 85031B280A44EFC700F992E0 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };9541 85031B280A44EFC700F992E0 /* DataTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransfer.h; sourceTree = "<group>"; }; 9542 9542 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ClipboardEvent.cpp; sourceTree = "<group>"; }; 9543 9543 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardEvent.h; sourceTree = "<group>"; }; … … 10836 10836 A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeScopeAdopter.h; sourceTree = "<group>"; }; 10837 10837 A781C6A613828B5D0012A62A /* DocumentMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarker.cpp; sourceTree = "<group>"; }; 10838 A784941A0B5FE507001E237A /* Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Clipboard.cpp; sourceTree = "<group>"; };10838 A784941A0B5FE507001E237A /* DataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DataTransfer.cpp; sourceTree = "<group>"; }; 10839 10839 A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeterShadowElement.cpp; sourceTree = "<group>"; }; 10840 10840 A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeterShadowElement.h; sourceTree = "<group>"; }; … … 12478 12478 BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScheduledAction.cpp; sourceTree = "<group>"; }; 12479 12479 BCA378BB0D15F64200B793D6 /* ScheduledAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScheduledAction.h; sourceTree = "<group>"; }; 12480 BCA83E360D7CDC4E003421A8 /* Clipboard.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Clipboard.idl; sourceTree = "<group>"; };12481 BCA83E4D0D7CE1E9003421A8 /* JS Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClipboard.cpp; sourceTree = "<group>"; };12482 BCA83E4E0D7CE1E9003421A8 /* JS Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClipboard.h; sourceTree = "<group>"; };12483 BCA83E510D7CE205003421A8 /* JS ClipboardCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClipboardCustom.cpp; sourceTree = "<group>"; };12480 BCA83E360D7CDC4E003421A8 /* DataTransfer.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DataTransfer.idl; sourceTree = "<group>"; }; 12481 BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataTransfer.cpp; sourceTree = "<group>"; }; 12482 BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDataTransfer.h; sourceTree = "<group>"; }; 12483 BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataTransferCustom.cpp; sourceTree = "<group>"; }; 12484 12484 BCA846D40DC67A350026C309 /* RenderReplica.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderReplica.cpp; sourceTree = "<group>"; }; 12485 12485 BCA846D50DC67A350026C309 /* RenderReplica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderReplica.h; sourceTree = "<group>"; }; … … 18943 18943 65DF31DF09D1CC60000BE325 /* JSCharacterData.cpp */, 18944 18944 65DF31E009D1CC60000BE325 /* JSCharacterData.h */, 18945 BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */,18946 BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */,18947 18945 93F9B6DE0BA0FB7200854064 /* JSComment.cpp */, 18948 18946 93F9B6DF0BA0FB7200854064 /* JSComment.h */, 18949 18947 FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */, 18950 18948 FE6FD48C0F676E9300092873 /* JSCoordinates.h */, 18949 BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */, 18950 BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */, 18951 18951 31FB1A63120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp */, 18952 18952 31FB1A64120A5D3F00DC02A0 /* JSDeviceMotionEvent.h */, … … 20520 20520 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */, 20521 20521 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */, 20522 BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,20523 20522 A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */, 20524 20523 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */, … … 20531 20530 AD726FEA16D9F40B003A4E6D /* JSCSSStyleDeclarationCustom.h */, 20532 20531 BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */, 20532 BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */, 20533 20533 4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */, 20534 20534 31FB1A6B120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp */, … … 22139 22139 BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */, 22140 22140 BCC0657C0F3CE1B700CD2D87 /* ClientRectList.idl */, 22141 A784941A0B5FE507001E237A /* Clipboard.cpp */,22142 85031B280A44EFC700F992E0 /* Clipboard.h */,22143 BCA83E360D7CDC4E003421A8 /* Clipboard.idl */,22144 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */,22145 22141 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */, 22146 22142 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */, 22147 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,22148 22143 E425A49918292B840020CFCF /* CollectionIndexCache.h */, 22149 22144 9BD8A95918BEFC7600987E9A /* CollectionIndexCache.cpp */, … … 22164 22159 62CD32571157E57C0063B0A7 /* CustomEvent.h */, 22165 22160 62CD32581157E57C0063B0A7 /* CustomEvent.idl */, 22161 A784941A0B5FE507001E237A /* DataTransfer.cpp */, 22162 85031B280A44EFC700F992E0 /* DataTransfer.h */, 22163 BCA83E360D7CDC4E003421A8 /* DataTransfer.idl */, 22164 2D90660C0665D937006B6F1A /* DataTransferMac.mm */, 22165 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */, 22166 22166 BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */, 22167 22167 BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */, … … 23122 23122 BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */, 23123 23123 BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */, 23124 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */,23125 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,23124 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */, 23125 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */, 23126 23126 85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */, 23127 23127 FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */, … … 24273 24273 BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */, 24274 24274 BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */, 24275 BCA83E500D7CE1E9003421A8 /* JS Clipboard.h in Headers */,24275 BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */, 24276 24276 51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */, 24277 24277 A584FE3C1864E2D800843B10 /* JSCommandLineAPIHost.h in Headers */, … … 26784 26784 BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */, 26785 26785 BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */, 26786 A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */,26786 A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */, 26787 26787 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */, 26788 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,26788 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */, 26789 26789 CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */, 26790 26790 CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */, … … 27675 27675 BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */, 27676 27676 BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */, 27677 BCA83E4F0D7CE1E9003421A8 /* JS Clipboard.cpp in Sources */,27678 BCA83E520D7CE205003421A8 /* JS ClipboardCustom.cpp in Sources */,27677 BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */, 27678 BCA83E520D7CE205003421A8 /* JSDataTransferCustom.cpp in Sources */, 27679 27679 51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */, 27680 27680 A584FE3B1864E2D800843B10 /* JSCommandLineAPIHost.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
r163568 r166965 44 44 #include "JSCanvasRenderingContext2DCustom.cpp" 45 45 #include "JSCanvasRenderingContextCustom.cpp" 46 #include "JSClipboardCustom.cpp"47 46 #include "JSCommandLineAPIHostCustom.cpp" 48 47 #include "JSCryptoCustom.cpp" … … 63 62 #include "JSDOMWindowShell.cpp" 64 63 #include "JSDOMWrapper.cpp" 64 #include "JSDataTransferCustom.cpp" 65 65 #include "JSDedicatedWorkerGlobalScopeCustom.cpp" 66 66 #include "JSDeviceOrientationEventCustom.cpp" -
trunk/Source/WebCore/bindings/js/JSDataTransferCustom.cpp
r166873 r166965 28 28 29 29 #include "config.h" 30 #include "JS Clipboard.h"30 #include "JSDataTransfer.h" 31 31 32 #include " Clipboard.h"32 #include "DataTransfer.h" 33 33 34 34 using namespace JSC; … … 36 36 namespace WebCore { 37 37 38 JSValue JS Clipboard::types(ExecState* exec) const38 JSValue JSDataTransfer::types(ExecState* exec) const 39 39 { 40 40 Vector<String> types = impl().types(); -
trunk/Source/WebCore/bindings/js/JSEventCustom.cpp
r166128 r166965 30 30 #include "JSEvent.h" 31 31 32 #include " Clipboard.h"32 #include "DataTransfer.h" 33 33 #include "Event.h" 34 34 #include "EventHeaders.h" 35 35 #include "EventInterfaces.h" 36 36 #include "EventNames.h" 37 #include "JS Clipboard.h"37 #include "JSDataTransfer.h" 38 38 #include <runtime/JSLock.h> 39 39 #include <wtf/HashMap.h> -
trunk/Source/WebCore/dom/ClipboardEvent.cpp
r156241 r166965 24 24 #include "ClipboardEvent.h" 25 25 26 #include " Clipboard.h"26 #include "DataTransfer.h" 27 27 #include "EventNames.h" 28 28 … … 33 33 } 34 34 35 ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr< Clipboard> clipboard)36 : Event(eventType, canBubble, cancelable), m_ clipboard(clipboard)35 ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<DataTransfer> dataTransfer) 36 : Event(eventType, canBubble, cancelable), m_dataTransfer(dataTransfer) 37 37 { 38 38 } -
trunk/Source/WebCore/dom/ClipboardEvent.h
r162139 r166965 29 29 namespace WebCore { 30 30 31 class Clipboard;31 class DataTransfer; 32 32 33 33 class ClipboardEvent : public Event { … … 39 39 return adoptRef(new ClipboardEvent); 40 40 } 41 static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr< Clipboard> clipboardArg)41 static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer> clipboardArg) 42 42 { 43 43 return adoptRef(new ClipboardEvent(type, canBubbleArg, cancelableArg, clipboardArg)); 44 44 } 45 45 46 Clipboard* clipboard() const { return m_clipboard.get(); }46 virtual DataTransfer* internalDataTransfer() const override { return m_dataTransfer.get(); } 47 47 48 48 private: 49 49 ClipboardEvent(); 50 ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr< Clipboard>);50 ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer>); 51 51 52 52 virtual EventInterface eventInterface() const override; 53 53 virtual bool isClipboardEvent() const override; 54 54 55 RefPtr< Clipboard> m_clipboard;55 RefPtr<DataTransfer> m_dataTransfer; 56 56 }; 57 57 -
trunk/Source/WebCore/dom/DOMAllInOne.cpp
r164853 r166965 38 38 #include "ClientRect.cpp" 39 39 #include "ClientRectList.cpp" 40 #include "Clipboard.cpp"41 40 #include "ClipboardEvent.cpp" 42 41 #include "CollectionIndexCache.cpp" … … 51 50 #include "DOMNamedFlowCollection.cpp" 52 51 #include "DOMStringList.cpp" 52 #include "DataTransfer.cpp" 53 53 #include "DatasetDOMStringMap.cpp" 54 54 #include "DecodedDataDocumentParser.cpp" -
trunk/Source/WebCore/dom/DataTransfer.cpp
r166873 r166965 25 25 26 26 #include "config.h" 27 #include " Clipboard.h"27 #include "DataTransfer.h" 28 28 29 29 #include "CachedImage.h" … … 45 45 WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED; 46 46 public: 47 explicit DragImageLoader( Clipboard*);47 explicit DragImageLoader(DataTransfer*); 48 48 void startLoading(CachedResourceHandle<CachedImage>&); 49 49 void stopLoading(CachedResourceHandle<CachedImage>&); … … 51 51 private: 52 52 virtual void imageChanged(CachedImage*, const IntRect*) override; 53 Clipboard* m_clipboard;53 DataTransfer* m_dataTransfer; 54 54 }; 55 55 56 56 #endif 57 57 58 Clipboard::Clipboard(ClipboardAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, ClipboardType type, bool forFileDrag)58 DataTransfer::DataTransfer(DataTransferAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, Type type, bool forFileDrag) 59 59 : m_policy(policy) 60 60 , m_pasteboard(pasteboard) … … 73 73 } 74 74 75 PassRefPtr< Clipboard> Clipboard::createForCopyAndPaste(ClipboardAccessPolicy policy)76 { 77 return adoptRef(new Clipboard(policy, policy == ClipboardWritable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste()));78 } 79 80 Clipboard::~Clipboard()75 PassRefPtr<DataTransfer> DataTransfer::createForCopyAndPaste(DataTransferAccessPolicy policy) 76 { 77 return adoptRef(new DataTransfer(policy, policy == DataTransferAccessPolicy::Writable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste())); 78 } 79 80 DataTransfer::~DataTransfer() 81 81 { 82 82 #if ENABLE(DRAG_SUPPORT) … … 86 86 } 87 87 88 void Clipboard::setAccessPolicy(ClipboardAccessPolicy policy)89 { 90 // Once the clipboardgoes numb, it can never go back.91 ASSERT(m_policy != ClipboardNumb || policy == ClipboardNumb);88 void DataTransfer::setAccessPolicy(DataTransferAccessPolicy policy) 89 { 90 // Once the dataTransfer goes numb, it can never go back. 91 ASSERT(m_policy != DataTransferAccessPolicy::Numb || policy == DataTransferAccessPolicy::Numb); 92 92 m_policy = policy; 93 93 } 94 94 95 bool Clipboard::canReadTypes() const96 { 97 return m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable || m_policy == ClipboardWritable;98 } 99 100 bool Clipboard::canReadData() const101 { 102 return m_policy == ClipboardReadable || m_policy == ClipboardWritable;103 } 104 105 bool Clipboard::canWriteData() const106 { 107 return m_policy == ClipboardWritable;108 } 109 110 void Clipboard::clearData(const String& type)95 bool DataTransfer::canReadTypes() const 96 { 97 return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::TypesReadable || m_policy == DataTransferAccessPolicy::Writable; 98 } 99 100 bool DataTransfer::canReadData() const 101 { 102 return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::Writable; 103 } 104 105 bool DataTransfer::canWriteData() const 106 { 107 return m_policy == DataTransferAccessPolicy::Writable; 108 } 109 110 void DataTransfer::clearData(const String& type) 111 111 { 112 112 if (!canWriteData()) … … 116 116 } 117 117 118 void Clipboard::clearData()118 void DataTransfer::clearData() 119 119 { 120 120 if (!canWriteData()) … … 124 124 } 125 125 126 String Clipboard::getData(const String& type) const126 String DataTransfer::getData(const String& type) const 127 127 { 128 128 if (!canReadData()) … … 137 137 } 138 138 139 bool Clipboard::setData(const String& type, const String& data)139 bool DataTransfer::setData(const String& type, const String& data) 140 140 { 141 141 if (!canWriteData()) … … 150 150 } 151 151 152 Vector<String> Clipboard::types() const152 Vector<String> DataTransfer::types() const 153 153 { 154 154 if (!canReadTypes()) … … 158 158 } 159 159 160 PassRefPtr<FileList> Clipboard::files() const160 PassRefPtr<FileList> DataTransfer::files() const 161 161 { 162 162 // FIXME: We could cache the computed file list if it was necessary and helpful. 163 163 // Currently, each access gets a new copy, and thus setData() modifications to the 164 // clipboardare not reflected in any FileList objects the page has accessed and stored.164 // dataTransfer are not reflected in any FileList objects the page has accessed and stored. 165 165 166 166 if (!canReadData()) … … 181 181 #if !ENABLE(DRAG_SUPPORT) 182 182 183 String Clipboard::dropEffect() const183 String DataTransfer::dropEffect() const 184 184 { 185 185 return ASCIILiteral("none"); 186 186 } 187 187 188 void Clipboard::setDropEffect(const String&)189 { 190 } 191 192 String Clipboard::effectAllowed() const188 void DataTransfer::setDropEffect(const String&) 189 { 190 } 191 192 String DataTransfer::effectAllowed() const 193 193 { 194 194 return ASCIILiteral("uninitialized"); 195 195 } 196 196 197 void Clipboard::setEffectAllowed(const String&)198 { 199 } 200 201 void Clipboard::setDragImage(Element*, int, int)197 void DataTransfer::setEffectAllowed(const String&) 198 { 199 } 200 201 void DataTransfer::setDragImage(Element*, int, int) 202 202 { 203 203 } … … 205 205 #else 206 206 207 PassRefPtr< Clipboard> Clipboard::createForDragAndDrop()208 { 209 return adoptRef(new Clipboard(ClipboardWritable, Pasteboard::createForDragAndDrop(), DragAndDrop));210 } 211 212 PassRefPtr< Clipboard> Clipboard::createForDragAndDrop(ClipboardAccessPolicy policy, const DragData& dragData)213 { 214 return adoptRef(new Clipboard(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));215 } 216 217 bool Clipboard::canSetDragImage() const207 PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop() 208 { 209 return adoptRef(new DataTransfer(DataTransferAccessPolicy::Writable, Pasteboard::createForDragAndDrop(), DragAndDrop)); 210 } 211 212 PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop(DataTransferAccessPolicy policy, const DragData& dragData) 213 { 214 return adoptRef(new DataTransfer(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles())); 215 } 216 217 bool DataTransfer::canSetDragImage() const 218 218 { 219 219 // Note that the spec doesn't actually allow drag image modification outside the dragstart … … 221 221 // supported this in the past. On many ports, attempting to set a drag image outside the 222 222 // dragstart operation is a no-op anyway. 223 return m_forDrag && (m_policy == ClipboardImageWritable || m_policy == ClipboardWritable);224 } 225 226 void Clipboard::setDragImage(Element* element, int x, int y)223 return m_forDrag && (m_policy == DataTransferAccessPolicy::ImageWritable || m_policy == DataTransferAccessPolicy::Writable); 224 } 225 226 void DataTransfer::setDragImage(Element* element, int x, int y) 227 227 { 228 228 if (!canSetDragImage()) … … 251 251 } 252 252 253 void Clipboard::updateDragImage()253 void DataTransfer::updateDragImage() 254 254 { 255 255 // Don't allow setting the image if we haven't started dragging yet; we'll rely on the dragging code … … 268 268 #if !PLATFORM(COCOA) 269 269 270 DragImageRef Clipboard::createDragImage(IntPoint& location) const270 DragImageRef DataTransfer::createDragImage(IntPoint& location) const 271 271 { 272 272 location = m_dragLocation; … … 286 286 #endif 287 287 288 DragImageLoader::DragImageLoader( Clipboard* clipboard)289 : m_ clipboard(clipboard)288 DragImageLoader::DragImageLoader(DataTransfer* dataTransfer) 289 : m_dataTransfer(dataTransfer) 290 290 { 291 291 } … … 304 304 void DragImageLoader::imageChanged(CachedImage*, const IntRect*) 305 305 { 306 m_ clipboard->updateDragImage();306 m_dataTransfer->updateDragImage(); 307 307 } 308 308 … … 351 351 } 352 352 353 DragOperation Clipboard::sourceOperation() const353 DragOperation DataTransfer::sourceOperation() const 354 354 { 355 355 DragOperation operation = dragOpFromIEOp(m_effectAllowed); … … 358 358 } 359 359 360 DragOperation Clipboard::destinationOperation() const360 DragOperation DataTransfer::destinationOperation() const 361 361 { 362 362 DragOperation operation = dragOpFromIEOp(m_dropEffect); … … 365 365 } 366 366 367 void Clipboard::setSourceOperation(DragOperation operation)367 void DataTransfer::setSourceOperation(DragOperation operation) 368 368 { 369 369 ASSERT_ARG(operation, operation != DragOperationPrivate); … … 371 371 } 372 372 373 void Clipboard::setDestinationOperation(DragOperation operation)373 void DataTransfer::setDestinationOperation(DragOperation operation) 374 374 { 375 375 ASSERT_ARG(operation, operation == DragOperationCopy || operation == DragOperationNone || operation == DragOperationLink || operation == DragOperationGeneric || operation == DragOperationMove || operation == (DragOperation)(DragOperationGeneric | DragOperationMove)); … … 377 377 } 378 378 379 String Clipboard::dropEffect() const379 String DataTransfer::dropEffect() const 380 380 { 381 381 return m_dropEffect == "uninitialized" ? ASCIILiteral("none") : m_dropEffect; 382 382 } 383 383 384 void Clipboard::setDropEffect(const String& effect)384 void DataTransfer::setDropEffect(const String& effect) 385 385 { 386 386 if (!m_forDrag) … … 398 398 } 399 399 400 String Clipboard::effectAllowed() const400 String DataTransfer::effectAllowed() const 401 401 { 402 402 return m_effectAllowed; 403 403 } 404 404 405 void Clipboard::setEffectAllowed(const String& effect)405 void DataTransfer::setEffectAllowed(const String& effect) 406 406 { 407 407 if (!m_forDrag) -
trunk/Source/WebCore/dom/DataTransfer.h
r166873 r166965 22 22 */ 23 23 24 #ifndef Clipboard_h25 #define Clipboard_h24 #ifndef DataTransfer_h 25 #define DataTransfer_h 26 26 27 27 #include "CachedResourceHandle.h" 28 #include " ClipboardAccessPolicy.h"28 #include "DataTransferAccessPolicy.h" 29 29 #include "DragActions.h" 30 30 #include "DragImage.h" … … 43 43 class Pasteboard; 44 44 45 class Clipboard : public RefCounted<Clipboard> {45 class DataTransfer : public RefCounted<DataTransfer> { 46 46 public: 47 static PassRefPtr< Clipboard> createForCopyAndPaste(ClipboardAccessPolicy);47 static PassRefPtr<DataTransfer> createForCopyAndPaste(DataTransferAccessPolicy); 48 48 49 ~ Clipboard();49 ~DataTransfer(); 50 50 51 51 String dropEffect() const; … … 72 72 #endif 73 73 74 void setAccessPolicy( ClipboardAccessPolicy);74 void setAccessPolicy(DataTransferAccessPolicy); 75 75 bool canReadTypes() const; 76 76 bool canReadData() const; … … 80 80 81 81 #if ENABLE(DRAG_SUPPORT) 82 static PassRefPtr< Clipboard> createForDragAndDrop();83 static PassRefPtr< Clipboard> createForDragAndDrop(ClipboardAccessPolicy, const DragData&);82 static PassRefPtr<DataTransfer> createForDragAndDrop(); 83 static PassRefPtr<DataTransfer> createForDragAndDrop(DataTransferAccessPolicy, const DragData&); 84 84 85 85 bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; } … … 96 96 97 97 private: 98 enum ClipboardType { CopyAndPaste, DragAndDrop };99 Clipboard(ClipboardAccessPolicy, PassOwnPtr<Pasteboard>, ClipboardType = CopyAndPaste, bool forFileDrag = false);98 enum Type { CopyAndPaste, DragAndDrop }; 99 DataTransfer(DataTransferAccessPolicy, PassOwnPtr<Pasteboard>, Type = CopyAndPaste, bool forFileDrag = false); 100 100 101 101 #if ENABLE(DRAG_SUPPORT) … … 103 103 #endif 104 104 105 ClipboardAccessPolicy m_policy;105 DataTransferAccessPolicy m_policy; 106 106 OwnPtr<Pasteboard> m_pasteboard; 107 107 … … 121 121 } // namespace WebCore 122 122 123 #endif // Clipboard_h123 #endif // DataTransfer_h -
trunk/Source/WebCore/dom/DataTransfer.idl
r166873 r166965 29 29 [ 30 30 SkipVTableValidation, 31 ] interface Clipboard{31 ] interface DataTransfer { 32 32 attribute DOMString dropEffect; 33 33 attribute DOMString effectAllowed; -
trunk/Source/WebCore/dom/DataTransferAccessPolicy.h
r166873 r166965 23 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 24 */ 25 26 #ifndef ClipboardAccessPolicy_h27 #define ClipboardAccessPolicy_h25 26 #ifndef DataTransferAccessPolicy_h 27 #define DataTransferAccessPolicy_h 28 28 29 29 namespace WebCore { 30 30 31 enum ClipboardAccessPolicy {32 ClipboardNumb, ClipboardImageWritable, ClipboardWritable, ClipboardTypesReadable, ClipboardReadable31 enum class DataTransferAccessPolicy { 32 Numb, ImageWritable, Writable, TypesReadable, Readable 33 33 }; 34 34 -
trunk/Source/WebCore/dom/DataTransferItemList.h
r105825 r166965 40 40 namespace WebCore { 41 41 42 class Clipboard;43 42 class File; 44 43 -
trunk/Source/WebCore/dom/DataTransferMac.mm
r166873 r166965 25 25 26 26 #import "config.h" 27 #import " Clipboard.h"27 #import "DataTransfer.h" 28 28 29 29 #import "CachedImage.h" … … 34 34 35 35 // FIXME: Need to refactor and figure out how to handle the flipping in a more sensible way so we can 36 // use the default Clipboard::dragImage from Clipboard.cpp. Note also that this handles cases that37 // Clipboard::dragImage in Clipboard.cpp does not handle correctly, so must resolve that as well.38 DragImageRef Clipboard::createDragImage(IntPoint& location) const36 // use the default DataTransfer::dragImage from DataTransfer.cpp. Note also that this handles cases that 37 // DataTransfer::dragImage in DataTransfer.cpp does not handle correctly, so must resolve that as well. 38 DragImageRef DataTransfer::createDragImage(IntPoint& location) const 39 39 { 40 40 DragImageRef result = nil; -
trunk/Source/WebCore/dom/Event.h
r164184 r166965 35 35 namespace WebCore { 36 36 37 class Clipboard;37 class DataTransfer; 38 38 class EventTarget; 39 39 class HTMLIFrameElement; … … 126 126 void setLegacyReturnValue(bool returnValue) { setDefaultPrevented(!returnValue); } 127 127 128 Clipboard* clipboardData() const { return isClipboardEvent() ? clipboard() : 0; }128 DataTransfer* clipboardData() const { return isClipboardEvent() ? internalDataTransfer() : 0; } 129 129 130 130 virtual EventInterface eventInterface() const; … … 170 170 void setUnderlyingEvent(PassRefPtr<Event>); 171 171 172 virtual Clipboard* clipboard() const { return 0; }172 virtual DataTransfer* internalDataTransfer() const { return 0; } 173 173 174 174 bool isBeingDispatched() const { return eventPhase(); } -
trunk/Source/WebCore/dom/Event.idl
r163389 r166965 77 77 78 78 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT 79 [Custom] readonly attribute ClipboardclipboardData;79 [Custom] readonly attribute DataTransfer clipboardData; 80 80 #endif 81 81 -
trunk/Source/WebCore/dom/MouseEvent.cpp
r164184 r166965 24 24 #include "MouseEvent.h" 25 25 26 #include " Clipboard.h"26 #include "DataTransfer.h" 27 27 #include "EventNames.h" 28 28 #include "Frame.h" … … 93 93 #endif 94 94 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, 95 PassRefPtr<EventTarget> relatedTarget, PassRefPtr< Clipboard> clipboard, bool isSimulated)95 PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer> dataTransfer, bool isSimulated) 96 96 { 97 97 return adoptRef(new MouseEvent(type, canBubble, cancelable, timestamp, view, … … 100 100 movementX, movementY, 101 101 #endif 102 ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, clipboard, isSimulated));102 ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated)); 103 103 } 104 104 … … 116 116 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, 117 117 unsigned short button, PassRefPtr<EventTarget> relatedTarget, 118 PassRefPtr< Clipboard> clipboard, bool isSimulated)118 PassRefPtr<DataTransfer> dataTransfer, bool isSimulated) 119 119 : MouseRelatedEvent(eventType, canBubble, cancelable, timestamp, view, detail, IntPoint(screenX, screenY), 120 120 IntPoint(pageX, pageY), … … 126 126 , m_buttonDown(button != (unsigned short)-1) 127 127 , m_relatedTarget(relatedTarget) 128 , m_ clipboard(clipboard)128 , m_dataTransfer(dataTransfer) 129 129 { 130 130 } … … 140 140 , m_buttonDown(initializer.button != (unsigned short)-1) 141 141 , m_relatedTarget(initializer.relatedTarget) 142 , m_ clipboard(0 /* clipboard*/)142 , m_dataTransfer(0 /* dataTransfer */) 143 143 { 144 144 initCoordinates(IntPoint(initializer.clientX, initializer.clientY)); … … 171 171 172 172 // FIXME: m_isSimulated is not set to false here. 173 // FIXME: m_ clipboardis not set to 0 here.173 // FIXME: m_dataTransfer is not set to 0 here. 174 174 } 175 175 -
trunk/Source/WebCore/dom/MouseEvent.h
r164184 r166965 29 29 namespace WebCore { 30 30 31 class Clipboard;31 class DataTransfer; 32 32 class PlatformMouseEvent; 33 33 … … 68 68 #endif 69 69 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, 70 PassRefPtr<EventTarget> relatedTarget, PassRefPtr< Clipboard>, bool isSimulated = false);70 PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated = false); 71 71 72 72 static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget); … … 88 88 void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; } 89 89 90 Clipboard* clipboard() const override { return m_clipboard.get(); }91 90 92 91 Node* toElement() const; 93 92 Node* fromElement() const; 94 93 95 Clipboard* dataTransfer() const { return isDragEvent() ? m_clipboard.get() : 0; } 94 // FIXME: These functions can be merged if m_dataTransfer is only initialized for drag events. 95 DataTransfer* dataTransfer() const { return isDragEvent() ? m_dataTransfer.get() : 0; } 96 virtual DataTransfer* internalDataTransfer() const override { return m_dataTransfer.get(); } 96 97 97 98 virtual EventInterface eventInterface() const override; … … 110 111 #endif 111 112 bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, 112 PassRefPtr<EventTarget> relatedTarget, PassRefPtr< Clipboard>, bool isSimulated);113 PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated); 113 114 114 115 MouseEvent(const AtomicString& type, const MouseEventInit&); … … 120 121 bool m_buttonDown; 121 122 RefPtr<EventTarget> m_relatedTarget; 122 RefPtr< Clipboard> m_clipboard;123 RefPtr<DataTransfer> m_dataTransfer; 123 124 }; 124 125 -
trunk/Source/WebCore/dom/MouseEvent.idl
r159061 r166965 60 60 61 61 #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT 62 readonly attribute ClipboarddataTransfer;62 readonly attribute DataTransfer dataTransfer; 63 63 #endif 64 64 }; -
trunk/Source/WebCore/dom/WheelEvent.cpp
r164551 r166965 25 25 #include "WheelEvent.h" 26 26 27 #include " Clipboard.h"27 #include "DataTransfer.h" 28 28 #include "EventNames.h" 29 29 #include <wtf/MathExtras.h> -
trunk/Source/WebCore/editing/Editor.cpp
r166818 r166965 34 34 #include "CSSPropertyNames.h" 35 35 #include "CachedResourceLoader.h" 36 #include "Clipboard.h"37 36 #include "ClipboardEvent.h" 38 37 #include "CompositionEvent.h" 39 38 #include "CreateLinkCommand.h" 39 #include "DataTransfer.h" 40 40 #include "DeleteSelectionCommand.h" 41 41 #include "DictationAlternative.h" … … 303 303 bool Editor::canDHTMLCut() 304 304 { 305 return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, ClipboardNumb);305 return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, DataTransferAccessPolicy::Numb); 306 306 } 307 307 308 308 bool Editor::canDHTMLCopy() 309 309 { 310 return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, ClipboardNumb);310 return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, DataTransferAccessPolicy::Numb); 311 311 } 312 312 313 313 bool Editor::canDHTMLPaste() 314 314 { 315 return !dispatchCPPEvent(eventNames().beforepasteEvent, ClipboardNumb);315 return !dispatchCPPEvent(eventNames().beforepasteEvent, DataTransferAccessPolicy::Numb); 316 316 } 317 317 … … 735 735 return false; 736 736 737 return !dispatchCPPEvent(eventNames().copyEvent, ClipboardWritable);737 return !dispatchCPPEvent(eventNames().copyEvent, DataTransferAccessPolicy::Writable); 738 738 } 739 739 … … 743 743 return false; 744 744 745 return !dispatchCPPEvent(eventNames().cutEvent, ClipboardWritable);745 return !dispatchCPPEvent(eventNames().cutEvent, DataTransferAccessPolicy::Writable); 746 746 } 747 747 748 748 bool Editor::tryDHTMLPaste() 749 749 { 750 return !dispatchCPPEvent(eventNames().pasteEvent, ClipboardReadable);750 return !dispatchCPPEvent(eventNames().pasteEvent, DataTransferAccessPolicy::Readable); 751 751 } 752 752 … … 916 916 // Returns whether caller should continue with "the default processing", which is the same as 917 917 // the event handler NOT setting the return value to false 918 bool Editor::dispatchCPPEvent(const AtomicString& eventType, ClipboardAccessPolicy policy)918 bool Editor::dispatchCPPEvent(const AtomicString& eventType, DataTransferAccessPolicy policy) 919 919 { 920 920 Node* target = findEventTargetFromSelection(); … … 922 922 return true; 923 923 924 RefPtr< Clipboard> clipboard = Clipboard::createForCopyAndPaste(policy);925 926 RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, clipboard);924 RefPtr<DataTransfer> dataTransfer = DataTransfer::createForCopyAndPaste(policy); 925 926 RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, dataTransfer); 927 927 target->dispatchEvent(event, IGNORE_EXCEPTION); 928 928 bool noDefaultProcessing = event->defaultPrevented(); 929 if (noDefaultProcessing && policy == ClipboardWritable) {929 if (noDefaultProcessing && policy == DataTransferAccessPolicy::Writable) { 930 930 OwnPtr<Pasteboard> pasteboard = Pasteboard::createForCopyAndPaste(); 931 931 pasteboard->clear(); 932 pasteboard->writePasteboard( clipboard->pasteboard());933 } 934 935 // invalidate clipboardhere for security936 clipboard->setAccessPolicy(ClipboardNumb);932 pasteboard->writePasteboard(dataTransfer->pasteboard()); 933 } 934 935 // invalidate dataTransfer here for security 936 dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); 937 937 938 938 return !noDefaultProcessing; … … 1314 1314 1315 1315 if (enclosingTextFormControl(m_frame.selection().selection().start())) 1316 Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextFor Clipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);1316 Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForDataTransfer(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace); 1317 1317 else { 1318 1318 HTMLImageElement* imageElement = nullptr; … … 1331 1331 #else 1332 1332 // FIXME: Convert all other platforms to match Mac and delete this. 1333 Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextFor Clipboard);1333 Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForDataTransfer); 1334 1334 #endif 1335 1335 } … … 2958 2958 } 2959 2959 2960 String Editor::selectedTextFor Clipboard() const2960 String Editor::selectedTextForDataTransfer() const 2961 2961 { 2962 2962 if (m_frame.settings().selectionIncludesAltImageText()) -
trunk/Source/WebCore/editing/Editor.h
r166818 r166965 27 27 #define Editor_h 28 28 29 #include "ClipboardAccessPolicy.h"30 29 #include "Color.h" 30 #include "DataTransferAccessPolicy.h" 31 31 #include "DictationAlternative.h" 32 32 #include "DocumentMarker.h" … … 52 52 class AlternativeTextController; 53 53 class ArchiveResource; 54 class Clipboard;54 class DataTransfer; 55 55 class CompositeEditCommand; 56 56 class DeleteButtonController; … … 176 176 #endif 177 177 178 bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);178 bool dispatchCPPEvent(const AtomicString&, DataTransferAccessPolicy); 179 179 180 180 void applyStyle(StyleProperties*, EditAction = EditActionUnspecified); … … 348 348 349 349 String selectedText() const; 350 String selectedTextFor Clipboard() const;350 String selectedTextForDataTransfer() const; 351 351 bool findString(const String&, FindOptions); 352 352 -
trunk/Source/WebCore/editing/ios/EditorIOS.mm
r166168 r166965 28 28 29 29 #include "CachedImage.h" 30 #include "Clipboard.h"31 30 #include "CSSComputedStyleDeclaration.h" 32 31 #include "CSSPrimitiveValueMappings.h" 33 32 #include "DOMRangeInternal.h" 33 #include "DataTransfer.h" 34 34 #include "DocumentFragment.h" 35 35 #include "DocumentLoader.h" … … 312 312 String Editor::stringSelectionForPasteboardWithImageAltText() 313 313 { 314 String text = selectedTextFor Clipboard();314 String text = selectedTextForDataTransfer(); 315 315 text.replace(noBreakSpace, ' '); 316 316 return text; -
trunk/Source/WebCore/editing/mac/EditorMac.mm
r166145 r166965 28 28 29 29 #import "CachedResourceLoader.h" 30 #import "Clipboard.h"31 30 #import "ColorMac.h" 32 31 #import "DOMRangeInternal.h" 32 #import "DataTransfer.h" 33 33 #import "DocumentFragment.h" 34 34 #import "DocumentLoader.h" … … 254 254 types.append(String(NSStringPboardType)); 255 255 platformStrategies()->pasteboardStrategy()->setTypes(types, NSFindPboard); 256 platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextFor Clipboard()), NSStringPboardType, NSFindPboard);256 platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForDataTransfer()), NSStringPboardType, NSFindPboard); 257 257 } 258 258 … … 266 266 } 267 267 268 // FIXME: Makes no sense that selectedTextFor Clipboardalways includes alt text, but stringSelectionForPasteboard does not.269 // This was left in a bad state when selectedTextFor Clipboardwas added. Need to look over clients and fix this.268 // FIXME: Makes no sense that selectedTextForDataTransfer always includes alt text, but stringSelectionForPasteboard does not. 269 // This was left in a bad state when selectedTextForDataTransfer was added. Need to look over clients and fix this. 270 270 String Editor::stringSelectionForPasteboard() 271 271 { … … 281 281 if (!canCopy()) 282 282 return ""; 283 String text = selectedTextFor Clipboard();283 String text = selectedTextForDataTransfer(); 284 284 text.replace(noBreakSpace, ' '); 285 285 return text; -
trunk/Source/WebCore/loader/EmptyClients.h
r166384 r166965 573 573 virtual ~EmptyDragClient() {} 574 574 virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) override { } 575 virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) override { }575 virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) override { } 576 576 virtual DragDestinationAction actionMaskForDrag(DragData&) override { return DragDestinationActionNone; } 577 577 virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint&) override { return DragSourceActionNone; } 578 virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool) override { }578 virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool) override { } 579 579 virtual void dragControllerDestroyed() override { } 580 580 }; -
trunk/Source/WebCore/page/DragClient.h
r165676 r166965 34 34 namespace WebCore { 35 35 36 class Clipboard;36 class DataTransfer; 37 37 class DragData; 38 38 class Element; … … 45 45 46 46 virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) = 0; 47 virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) = 0;47 virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) = 0; 48 48 virtual DragDestinationAction actionMaskForDrag(DragData&) = 0; 49 49 virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint& rootViewPoint) = 0; 50 50 51 virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard&, Frame&, bool linkDrag = false) = 0;51 virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, DataTransfer&, Frame&, bool linkDrag = false) = 0; 52 52 virtual void dragEnded() { } 53 53 -
trunk/Source/WebCore/page/DragController.cpp
r165676 r166965 30 30 31 31 #include "CachedImage.h" 32 #include "Clipboard.h"33 #include "ClipboardAccessPolicy.h"34 32 #include "CachedResourceLoader.h" 33 #include "DataTransfer.h" 35 34 #include "Document.h" 36 35 #include "DocumentFragment.h" … … 186 185 { 187 186 if (RefPtr<FrameView> v = m_page.mainFrame().view()) { 188 ClipboardAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable;189 RefPtr< Clipboard> clipboard = Clipboard::createForDragAndDrop(policy, dragData);190 clipboard->setSourceOperation(dragData.draggingSourceOperationMask());191 m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), clipboard.get());192 clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security187 DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable; 188 RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData); 189 dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask()); 190 m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer.get()); 191 dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security. 193 192 } 194 193 mouseMovedIntoDocument(0); … … 212 211 if (mainFrame->view()) { 213 212 // Sending an event can result in the destruction of the view and part. 214 RefPtr< Clipboard> clipboard = Clipboard::createForDragAndDrop(ClipboardReadable, dragData);215 clipboard->setSourceOperation(dragData.draggingSourceOperationMask());216 preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), clipboard.get());217 clipboard->setAccessPolicy(ClipboardNumb); // Invalidate clipboard here for security213 RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(DataTransferAccessPolicy::Readable, dragData); 214 dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask()); 215 preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer.get()); 216 dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security. 218 217 } 219 218 if (preventedDefault) { … … 593 592 return false; 594 593 595 ClipboardAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;596 RefPtr< Clipboard> clipboard = Clipboard::createForDragAndDrop(policy, dragData);594 DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable; 595 RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData); 597 596 DragOperation srcOpMask = dragData.draggingSourceOperationMask(); 598 clipboard->setSourceOperation(srcOpMask);597 dataTransfer->setSourceOperation(srcOpMask); 599 598 600 599 PlatformMouseEvent event = createMouseEvent(dragData); 601 if (!mainFrame->eventHandler().updateDragAndDrop(event, clipboard.get())) {602 clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security603 return false; 604 } 605 606 operation = clipboard->destinationOperation();607 if ( clipboard->dropEffectIsUninitialized())600 if (!mainFrame->eventHandler().updateDragAndDrop(event, dataTransfer.get())) { 601 dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security. 602 return false; 603 } 604 605 operation = dataTransfer->destinationOperation(); 606 if (dataTransfer->dropEffectIsUninitialized()) 608 607 operation = defaultOperationForDrag(srcOpMask); 609 608 else if (!(srcOpMask & operation)) { … … 612 611 } 613 612 614 clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security613 dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security. 615 614 return true; 616 615 } … … 734 733 IntPoint dragImageOffset(0, 0); 735 734 736 ASSERT(state. clipboard);737 738 Clipboard& clipboard = *state.clipboard;735 ASSERT(state.dataTransfer); 736 737 DataTransfer& dataTransfer = *state.dataTransfer; 739 738 if (state.type == DragSourceActionDHTML) 740 dragImage = clipboard.createDragImage(dragImageOffset);739 dragImage = dataTransfer.createDragImage(dragImageOffset); 741 740 if (state.type == DragSourceActionSelection || !imageURL.isEmpty() || !linkURL.isEmpty()) 742 741 // Selection, image, and link drags receive a default set of allowed drag operations that … … 759 758 Image* image = getImage(element); 760 759 if (state.type == DragSourceActionSelection) { 761 if (! clipboard.pasteboard().hasData()) {760 if (!dataTransfer.pasteboard().hasData()) { 762 761 // FIXME: This entire block is almost identical to the code in Editor::copy, and the code should be shared. 763 762 … … 768 767 769 768 if (enclosingTextFormControl(src.selection().selection().start())) 770 clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);769 dataTransfer.pasteboard().writePlainText(src.editor().selectedTextForDataTransfer(), Pasteboard::CannotSmartReplace); 771 770 else { 772 771 #if PLATFORM(COCOA) || PLATFORM(EFL) 773 src.editor().writeSelectionToPasteboard( clipboard.pasteboard());772 src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard()); 774 773 #else 775 774 // FIXME: Convert all other platforms to match Mac and delete this. 776 clipboard.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForClipboard);775 dataTransfer.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForDataTransfer); 777 776 #endif 778 777 } … … 780 779 src.editor().didWriteSelectionToPasteboard(); 781 780 } 782 m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard);781 m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, dataTransfer); 783 782 if (!dragImage) { 784 783 dragImage = dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha); … … 786 785 m_dragOffset = IntPoint(dragOrigin.x() - dragLoc.x(), dragOrigin.y() - dragLoc.y()); 787 786 } 788 doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);787 doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false); 789 788 } else if (!imageURL.isEmpty() && image && !image->isNull() && (m_dragSourceAction & DragSourceActionImage)) { 790 789 // We shouldn't be starting a drag for an image that can't provide an extension. 791 790 // This is an early detection for problems encountered later upon drop. 792 791 ASSERT(!image->filenameExtension().isEmpty()); 793 if (! clipboard.pasteboard().hasData()) {792 if (!dataTransfer.pasteboard().hasData()) { 794 793 m_draggingImageURL = imageURL; 795 794 if (element.isContentRichlyEditable()) 796 795 selectElement(element); 797 declareAndWriteDragImage( clipboard, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString());798 } 799 800 m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, clipboard);796 declareAndWriteDragImage(dataTransfer, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString()); 797 } 798 799 m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, dataTransfer); 801 800 802 801 if (!dragImage) { 803 802 IntRect imageRect = hitTestResult.imageRect(); 804 803 imageRect.setLocation(m_page.mainFrame().view()->rootViewToContents(src.view()->contentsToRootView(imageRect.location()))); 805 doImageDrag(element, dragOrigin, hitTestResult.imageRect(), clipboard, src, m_dragOffset);804 doImageDrag(element, dragOrigin, hitTestResult.imageRect(), dataTransfer, src, m_dragOffset); 806 805 } else { 807 806 // DHTML defined drag image 808 doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);807 doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false); 809 808 } 810 809 } else if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) { 811 if (! clipboard.pasteboard().hasData())812 // Simplify whitespace so the title put on the clipboardresembles what the user sees810 if (!dataTransfer.pasteboard().hasData()) { 811 // Simplify whitespace so the title put on the dataTransfer resembles what the user sees 813 812 // on the web page. This includes replacing newlines with spaces. 814 src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), clipboard.pasteboard()); 813 src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), dataTransfer.pasteboard()); 814 } 815 815 816 816 const VisibleSelection& sourceSelection = src.selection().selection(); … … 825 825 } 826 826 827 m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);827 m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, dataTransfer); 828 828 if (!dragImage) { 829 829 dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src.settings().fontRenderingMode()); … … 834 834 dragImage = scaleDragImage(dragImage, FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor())); 835 835 } 836 doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, clipboard, src, true);836 doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, dataTransfer, src, true); 837 837 } else if (state.type == DragSourceActionDHTML) { 838 838 if (dragImage) { 839 839 ASSERT(m_dragSourceAction & DragSourceActionDHTML); 840 m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, clipboard);841 doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);840 m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer); 841 doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false); 842 842 } else 843 843 startedDrag = false; … … 853 853 } 854 854 855 void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, Clipboard& clipboard, Frame& frame, IntPoint& dragImageOffset)855 void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, DataTransfer& dataTransfer, Frame& frame, IntPoint& dragImageOffset) 856 856 { 857 857 IntPoint mouseDownPoint = dragOrigin; … … 896 896 897 897 dragImageOffset = mouseDownPoint + scaledOrigin; 898 doSystemDrag(dragImage, dragImageOffset, dragOrigin, clipboard, frame, false);898 doSystemDrag(dragImage, dragImageOffset, dragOrigin, dataTransfer, frame, false); 899 899 900 900 deleteDragImage(dragImage); 901 901 } 902 902 903 void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool forLink)903 void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool forLink) 904 904 { 905 905 m_didInitiateDrag = true; … … 909 909 RefPtr<FrameView> viewProtector = frameProtector->view(); 910 910 m_client.startDrag(image, viewProtector->rootViewToContents(frame.view()->contentsToRootView(dragLoc)), 911 viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), clipboard, frameProtector.get(), forLink);911 viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), dataTransfer, frameProtector.get(), forLink); 912 912 // DragClient::startDrag can cause our Page to dispear, deallocating |this|. 913 913 if (!frameProtector->page()) -
trunk/Source/WebCore/page/DragController.h
r165676 r166965 34 34 namespace WebCore { 35 35 36 class Clipboard;36 class DataTransfer; 37 37 class Document; 38 38 class DragClient; … … 107 107 void mouseMovedIntoDocument(Document*); 108 108 109 void doImageDrag(Element&, const IntPoint&, const IntRect&, Clipboard&, Frame&, IntPoint&);110 void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool forLink);109 void doImageDrag(Element&, const IntPoint&, const IntRect&, DataTransfer&, Frame&, IntPoint&); 110 void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool forLink); 111 111 void cleanupAfterSystemDrag(); 112 void declareAndWriteDragImage( Clipboard&, Element&, const URL&, const String& label);112 void declareAndWriteDragImage(DataTransfer&, Element&, const URL&, const String& label); 113 113 114 114 Page& m_page; -
trunk/Source/WebCore/page/DragState.h
r165676 r166965 28 28 #define DragState_h 29 29 30 #include " Clipboard.h"30 #include "DataTransfer.h" 31 31 #include "DragActions.h" 32 32 #include "Element.h" … … 38 38 bool shouldDispatchEvents; 39 39 DragSourceAction type; 40 RefPtr< Clipboard> clipboard; // Used on only the source side of dragging.40 RefPtr<DataTransfer> dataTransfer; // Used on only the source side of dragging. 41 41 }; 42 42 -
trunk/Source/WebCore/page/EventHandler.cpp
r166582 r166965 2013 2013 #if ENABLE(DRAG_SUPPORT) 2014 2014 2015 bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, Clipboard* clipboard)2015 bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, DataTransfer* dataTransfer) 2016 2016 { 2017 2017 FrameView* view = m_frame.view(); … … 2029 2029 #endif 2030 2030 event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), 2031 0, 0, clipboard);2031 0, 0, dataTransfer); 2032 2032 2033 2033 dragTarget.dispatchEvent(me.get(), IGNORE_EXCEPTION); … … 2073 2073 } 2074 2074 2075 static inline bool hasFileOfType( Clipboard& clipboard, const String& type)2076 { 2077 RefPtr<FileList> fileList = clipboard.files();2075 static inline bool hasFileOfType(DataTransfer& dataTransfer, const String& type) 2076 { 2077 RefPtr<FileList> fileList = dataTransfer.files(); 2078 2078 for (unsigned i = 0; i < fileList->length(); i++) { 2079 2079 if (equalIgnoringCase(fileList->item(i)->type(), type)) … … 2083 2083 } 2084 2084 2085 static inline bool hasStringOfType( Clipboard& clipboard, const String& type)2086 { 2087 return !type.isNull() && clipboard.types().contains(type);2088 } 2089 2090 static bool hasDropZoneType( Clipboard& clipboard, const String& keyword)2085 static inline bool hasStringOfType(DataTransfer& dataTransfer, const String& type) 2086 { 2087 return !type.isNull() && dataTransfer.types().contains(type); 2088 } 2089 2090 static bool hasDropZoneType(DataTransfer& dataTransfer, const String& keyword) 2091 2091 { 2092 2092 if (keyword.startsWith("file:")) 2093 return hasFileOfType( clipboard, keyword.substring(5));2093 return hasFileOfType(dataTransfer, keyword.substring(5)); 2094 2094 2095 2095 if (keyword.startsWith("string:")) 2096 return hasStringOfType( clipboard, keyword.substring(7));2096 return hasStringOfType(dataTransfer, keyword.substring(7)); 2097 2097 2098 2098 return false; 2099 2099 } 2100 2100 2101 static bool findDropZone(Node* target, Clipboard* clipboard)2101 static bool findDropZone(Node* target, DataTransfer* dataTransfer) 2102 2102 { 2103 2103 Element* element = target->isElementNode() ? toElement(target) : target->parentElement(); … … 2122 2122 dragOperation = op; 2123 2123 } else 2124 matched = matched || hasDropZoneType(* clipboard, keywords[i].string());2124 matched = matched || hasDropZoneType(*dataTransfer, keywords[i].string()); 2125 2125 2126 2126 if (matched && dragOperation != DragOperationNone) … … 2128 2128 } 2129 2129 if (matched) { 2130 clipboard->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation));2130 dataTransfer->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation)); 2131 2131 return true; 2132 2132 } … … 2135 2135 } 2136 2136 2137 bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)2137 bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer) 2138 2138 { 2139 2139 bool accept = false; … … 2165 2165 if (targetIsFrame(newTarget.get(), targetFrame)) { 2166 2166 if (targetFrame) 2167 accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);2167 accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer); 2168 2168 } else if (newTarget) { 2169 2169 // As per section 7.9.4 of the HTML 5 spec., we must always fire a drag event before firing a dragenter, dragleave, or dragover event. … … 2172 2172 dispatchDragSrcEvent(eventNames().dragEvent, event); 2173 2173 } 2174 accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, clipboard);2174 accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, dataTransfer); 2175 2175 if (!accept) 2176 accept = findDropZone(newTarget.get(), clipboard);2176 accept = findDropZone(newTarget.get(), dataTransfer); 2177 2177 } 2178 2178 2179 2179 if (targetIsFrame(m_dragTarget.get(), targetFrame)) { 2180 2180 if (targetFrame) 2181 accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);2181 accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer); 2182 2182 } else if (m_dragTarget) 2183 dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);2183 dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer); 2184 2184 2185 2185 if (newTarget) { … … 2192 2192 if (targetIsFrame(newTarget.get(), targetFrame)) { 2193 2193 if (targetFrame) 2194 accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);2194 accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer); 2195 2195 } else if (newTarget) { 2196 2196 // Note, when dealing with sub-frames, we may need to fire only a dragover event as a drag event may have been fired earlier. … … 2199 2199 dispatchDragSrcEvent(eventNames().dragEvent, event); 2200 2200 } 2201 accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, clipboard);2201 accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, dataTransfer); 2202 2202 if (!accept) 2203 accept = findDropZone(newTarget.get(), clipboard);2203 accept = findDropZone(newTarget.get(), dataTransfer); 2204 2204 m_shouldOnlyFireDragOverEvent = false; 2205 2205 } … … 2209 2209 } 2210 2210 2211 void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)2211 void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer) 2212 2212 { 2213 2213 Frame* targetFrame; 2214 2214 if (targetIsFrame(m_dragTarget.get(), targetFrame)) { 2215 2215 if (targetFrame) 2216 targetFrame->eventHandler().cancelDragAndDrop(event, clipboard);2216 targetFrame->eventHandler().cancelDragAndDrop(event, dataTransfer); 2217 2217 } else if (m_dragTarget) { 2218 2218 if (dragState().source && dragState().shouldDispatchEvents) 2219 2219 dispatchDragSrcEvent(eventNames().dragEvent, event); 2220 dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);2220 dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer); 2221 2221 } 2222 2222 clearDragState(); 2223 2223 } 2224 2224 2225 bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)2225 bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer) 2226 2226 { 2227 2227 Frame* targetFrame; … … 2229 2229 if (targetIsFrame(m_dragTarget.get(), targetFrame)) { 2230 2230 if (targetFrame) 2231 preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, clipboard);2231 preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, dataTransfer); 2232 2232 } else if (m_dragTarget) 2233 preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, clipboard);2233 preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, dataTransfer); 2234 2234 clearDragState(); 2235 2235 return preventedDefault; … … 3166 3166 } 3167 3167 3168 void EventHandler::free Clipboard()3169 { 3170 if (!dragState(). clipboard)3171 return; 3172 dragState(). clipboard->setAccessPolicy(ClipboardNumb);3173 dragState(). clipboard= 0;3168 void EventHandler::freeDataTransfer() 3169 { 3170 if (!dragState().dataTransfer) 3171 return; 3172 dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); 3173 dragState().dataTransfer = 0; 3174 3174 } 3175 3175 … … 3181 3181 3182 3182 if (dragState().source && dragState().shouldDispatchEvents) { 3183 dragState(). clipboard->setDestinationOperation(operation);3183 dragState().dataTransfer->setDestinationOperation(operation); 3184 3184 // For now we don't care if event handler cancels default behavior, since there is no default behavior. 3185 3185 dispatchDragSrcEvent(eventNames().dragendEvent, event); 3186 3186 } 3187 free Clipboard();3187 freeDataTransfer(); 3188 3188 dragState().source = 0; 3189 3189 // In case the drag was ended due to an escape key press we need to ensure … … 3202 3202 bool EventHandler::dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent& event) 3203 3203 { 3204 return !dispatchDragEvent(eventType, *dragState().source, event, dragState(). clipboard.get());3204 return !dispatchDragEvent(eventType, *dragState().source, event, dragState().dataTransfer.get()); 3205 3205 } 3206 3206 … … 3291 3291 DragOperation srcOp = DragOperationNone; 3292 3292 3293 // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old clipboardgets numbed.3294 free Clipboard();3295 3296 dragState(). clipboard = createDraggingClipboard();3293 // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old dataTransfer gets numbed. 3294 freeDataTransfer(); 3295 3296 dragState().dataTransfer = createDraggingDataTransfer(); 3297 3297 3298 3298 if (dragState().shouldDispatchEvents) { … … 3303 3303 FloatPoint absPos = renderer->localToAbsolute(); 3304 3304 IntSize delta = m_mouseDownPos - roundedIntPoint(absPos); 3305 dragState(). clipboard->setDragImage(dragState().source.get(), delta.width(), delta.height());3305 dragState().dataTransfer->setDragImage(dragState().source.get(), delta.width(), delta.height()); 3306 3306 } else { 3307 3307 // The renderer has disappeared, this can happen if the onStartDrag handler has hidden … … 3315 3315 && !m_frame.selection().selection().isInPasswordField(); 3316 3316 3317 // Invalidate clipboard here against anymore pasteboard writing for security.The drag3317 // Invalidate dataTransfer here against anymore pasteboard writing for security. The drag 3318 3318 // image can still be changed as we drag, but not the pasteboard data. 3319 dragState(). clipboard->setAccessPolicy(ClipboardImageWritable);3319 dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::ImageWritable); 3320 3320 3321 3321 if (m_mouseDownMayStartDrag) { 3322 3322 // Gather values from DHTML element, if it set any. 3323 srcOp = dragState(). clipboard->sourceOperation();3323 srcOp = dragState().dataTransfer->sourceOperation(); 3324 3324 3325 3325 // Yuck, a draggedImage:moveTo: message can be fired as a result of kicking off the 3326 3326 // drag with dragImage! Because of that dumb reentrancy, we may think we've not 3327 3327 // started the drag when that happens. So we have to assume it's started before we kick it off. 3328 dragState(). clipboard->setDragHasStarted();3328 dragState().dataTransfer->setDragHasStarted(); 3329 3329 } 3330 3330 } … … 3349 3349 if (!m_mouseDownMayStartDrag) { 3350 3350 // Something failed to start the drag, clean up. 3351 free Clipboard();3351 freeDataTransfer(); 3352 3352 dragState().source = 0; 3353 3353 } -
trunk/Source/WebCore/page/EventHandler.h
r165676 r166965 69 69 70 70 class AutoscrollController; 71 class Clipboard;72 71 class ContainerNode; 72 class DataTransfer; 73 73 class Document; 74 74 class Element; … … 160 160 161 161 #if ENABLE(DRAG_SUPPORT) 162 bool updateDragAndDrop(const PlatformMouseEvent&, Clipboard*);163 void cancelDragAndDrop(const PlatformMouseEvent&, Clipboard*);164 bool performDragAndDrop(const PlatformMouseEvent&, Clipboard*);162 bool updateDragAndDrop(const PlatformMouseEvent&, DataTransfer*); 163 void cancelDragAndDrop(const PlatformMouseEvent&, DataTransfer*); 164 bool performDragAndDrop(const PlatformMouseEvent&, DataTransfer*); 165 165 void updateDragStateAfterEditDragIfNeeded(Element* rootEditableElement); 166 166 #endif … … 306 306 static const double TextDragDelay; 307 307 308 PassRefPtr< Clipboard> createDraggingClipboard() const;308 PassRefPtr<DataTransfer> createDraggingDataTransfer() const; 309 309 #endif // ENABLE(DRAG_SUPPORT) 310 310 … … 366 366 bool dispatchMouseEvent(const AtomicString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder); 367 367 #if ENABLE(DRAG_SUPPORT) 368 bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, Clipboard*);369 370 void free Clipboard();368 bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer*); 369 370 void freeDataTransfer(); 371 371 372 372 bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis); -
trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp
r165676 r166965 30 30 #include "EventHandler.h" 31 31 32 #include " Clipboard.h"32 #include "DataTransfer.h" 33 33 #include "EventNames.h" 34 34 #include "FloatPoint.h" … … 98 98 99 99 #if ENABLE(DRAG_SUPPORT) 100 PassRefPtr< Clipboard> EventHandler::createDraggingClipboard() const100 PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const 101 101 { 102 return Clipboard::createForDragAndDrop();102 return DataTransfer::createForDragAndDrop(); 103 103 } 104 104 #endif -
trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp
r165676 r166965 27 27 #include "DragController.h" 28 28 29 #include " Clipboard.h"29 #include "DataTransfer.h" 30 30 #include "DragData.h" 31 31 #include "Element.h" … … 70 70 } 71 71 72 void DragController::declareAndWriteDragImage( Clipboard& clipboard, Element& element, const URL& url, const String& label)72 void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label) 73 73 { 74 clipboard.pasteboard().writeImage(element, url, label);74 dataTransfer.pasteboard().writeImage(element, url, label); 75 75 } 76 76 -
trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp
r165688 r166965 27 27 #include "EventHandler.h" 28 28 29 #include " Clipboard.h"29 #include "DataTransfer.h" 30 30 #include "FloatPoint.h" 31 31 #include "FocusController.h" … … 98 98 99 99 #if ENABLE(DRAG_SUPPORT) 100 PassRefPtr< Clipboard> EventHandler::createDraggingClipboard() const100 PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const 101 101 { 102 return Clipboard::createForDragAndDrop();102 return DataTransfer::createForDragAndDrop(); 103 103 } 104 104 #endif -
trunk/Source/WebCore/page/mac/DragControllerMac.mm
r165676 r166965 29 29 #if ENABLE(DRAG_SUPPORT) 30 30 31 #import " Clipboard.h"31 #import "DataTransfer.h" 32 32 #import "DragClient.h" 33 33 #import "DragData.h" … … 83 83 } 84 84 85 void DragController::declareAndWriteDragImage( Clipboard& clipboard, Element& element, const URL& url, const String& label)85 void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label) 86 86 { 87 m_client.declareAndWriteDragImage( clipboard.pasteboard().name(), element, url, label, element.document().frame());87 m_client.declareAndWriteDragImage(dataTransfer.pasteboard().name(), element, url, label, element.document().frame()); 88 88 } 89 89 -
trunk/Source/WebCore/page/mac/EventHandlerMac.mm
r165676 r166965 31 31 #include "Chrome.h" 32 32 #include "ChromeClient.h" 33 #include " Clipboard.h"33 #include "DataTransfer.h" 34 34 #include "DragController.h" 35 35 #include "EventNames.h" … … 681 681 #if ENABLE(DRAG_SUPPORT) 682 682 683 PassRefPtr< Clipboard> EventHandler::createDraggingClipboard() const683 PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const 684 684 { 685 685 // Must be done before ondragstart adds types and data to the pboard, … … 687 687 OwnPtr<Pasteboard> pasteboard = Pasteboard::create(NSDragPboard); 688 688 pasteboard->clear(); 689 return Clipboard::createForDragAndDrop();689 return DataTransfer::createForDragAndDrop(); 690 690 } 691 691 -
trunk/Source/WebCore/page/win/DragControllerWin.cpp
r165676 r166965 27 27 #include "DragController.h" 28 28 29 #include " Clipboard.h"29 #include "DataTransfer.h" 30 30 #include "DragData.h" 31 31 #include "Element.h" … … 70 70 } 71 71 72 void DragController::declareAndWriteDragImage( Clipboard& clipboard, Element& element, const URL& url, const String& label)72 void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label) 73 73 { 74 Pasteboard& pasteboard = clipboard.pasteboard();74 Pasteboard& pasteboard = dataTransfer.pasteboard(); 75 75 76 76 // FIXME: Do we really need this check? -
trunk/Source/WebCore/page/win/EventHandlerWin.cpp
r165676 r166965 29 29 30 30 #include "COMPtr.h" 31 #include "Clipboard.h"32 31 #include "Cursor.h" 32 #include "DataTransfer.h" 33 33 #include "FloatPoint.h" 34 34 #include "FocusController.h" … … 93 93 94 94 #if ENABLE(DRAG_SUPPORT) 95 PassRefPtr< Clipboard> EventHandler::createDraggingClipboard() const95 PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const 96 96 { 97 97 #if OS(WINCE) 98 98 return 0; 99 99 #else 100 return Clipboard::createForDragAndDrop();100 return DataTransfer::createForDragAndDrop(); 101 101 #endif 102 102 } -
trunk/Source/WebCore/platform/Pasteboard.h
r165676 r166965 63 63 class SharedBuffer; 64 64 65 enum ShouldSerializeSelectedTextFor Clipboard { DefaultSelectedTextType, IncludeImageAltTextForClipboard};65 enum ShouldSerializeSelectedTextForDataTransfer { DefaultSelectedTextType, IncludeImageAltTextForDataTransfer }; 66 66 67 67 // For writing to the pasteboard. Generally sorted with the richest formats on top. … … 166 166 PassRefPtr<DocumentFragment> documentFragment(Frame&, Range&, bool allowPlainText, bool& chosePlainText); // FIXME: Layering violation. 167 167 void writeImage(Element&, const URL&, const String& title); // FIXME: Layering violation. 168 void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextFor Clipboard= DefaultSelectedTextType); // FIXME: Layering violation.168 void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextForDataTransfer = DefaultSelectedTextType); // FIXME: Layering violation. 169 169 #endif 170 170 -
trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp
r165699 r166965 159 159 } 160 160 161 void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextFor Clipboard shouldSerializeSelectedTextForClipboard)161 void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer) 162 162 { 163 163 m_dataObject->clearAll(); 164 m_dataObject->setText(shouldSerializeSelectedTextFor Clipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText());164 m_dataObject->setText(shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText()); 165 165 m_dataObject->setMarkup(createMarkup(selectedRange, 0, AnnotateForInterchange, false, ResolveNonLocalURLs)); 166 166 -
trunk/Source/WebCore/platform/mac/PasteboardMac.mm
r166145 r166965 28 28 29 29 #import "CachedImage.h" 30 #import "Clipboard.h"31 30 #import "DOMRangeInternal.h" 32 31 #import "Document.h" -
trunk/Source/WebCore/platform/win/PasteboardWin.cpp
r166582 r166965 439 439 ::GlobalFree(medium.hGlobal); 440 440 441 String str = frame.editor().selectedTextFor Clipboard();441 String str = frame.editor().selectedTextForDataTransfer(); 442 442 replaceNewlinesWithWindowsStyleNewlines(str); 443 443 replaceNBSPWithSpace(str); … … 451 451 } 452 452 453 void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextFor Clipboard shouldSerializeSelectedTextForClipboard)453 void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer) 454 454 { 455 455 clear(); … … 467 467 468 468 // Put plain string on the pasteboard. CF_UNICODETEXT covers CF_TEXT as well 469 String str = shouldSerializeSelectedTextFor Clipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText();469 String str = shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText(); 470 470 replaceNewlinesWithWindowsStyleNewlines(str); 471 471 replaceNBSPWithSpace(str); -
trunk/Source/WebKit/ios/ChangeLog
r166691 r166965 1 2014-04-08 Alexey Proskuryakov <ap@apple.com> 2 3 Rename Clipboard to DataTransfer 4 https://bugs.webkit.org/show_bug.cgi?id=131371 5 6 Reviewed by Anders Carlsson. 7 8 * WebView/WebPDFViewPlaceholder.mm: 9 1 10 2014-04-02 Benjamin Poulain <bpoulain@apple.com> 2 11 -
trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm
r166688 r166965 34 34 #import <JavaScriptCore/JSStringRefCF.h> 35 35 #import <UIKit/UIKit.h> 36 #import <WebCore/ Clipboard.h>36 #import <WebCore/DataTransfer.h> 37 37 #import <WebCore/EventHandler.h> 38 38 #import <WebCore/EventNames.h> -
trunk/Source/WebKit/mac/ChangeLog
r166933 r166965 1 2014-04-08 Alexey Proskuryakov <ap@apple.com> 2 3 Rename Clipboard to DataTransfer 4 https://bugs.webkit.org/show_bug.cgi?id=131371 5 6 Reviewed by Anders Carlsson. 7 8 * WebCoreSupport/WebDragClient.h: 9 * WebCoreSupport/WebDragClient.mm: 10 (WebDragClient::willPerformDragSourceAction): 11 (WebDragClient::startDrag): 12 * WebView/WebPDFView.mm: 13 1 14 2014-04-08 Dan Bernstein <mitz@apple.com> 2 15 -
trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h
r165676 r166965 34 34 WebDragClient(WebView*); 35 35 virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override; 36 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore:: Clipboard&) override;36 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override; 37 37 virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override; 38 38 virtual void dragControllerDestroyed() override; 39 39 virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override; 40 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore:: Clipboard&, WebCore::Frame&, bool linkDrag) override;40 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag) override; 41 41 virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override; 42 42 private: -
trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm
r165676 r166965 43 43 #import "WebUIDelegatePrivate.h" 44 44 #import "WebViewInternal.h" 45 #import <WebCore/ Clipboard.h>45 #import <WebCore/DataTransfer.h> 46 46 #import <WebCore/DragData.h> 47 47 #import <WebCore/Editor.h> … … 85 85 } 86 86 87 void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore:: Clipboard& clipboard)87 void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore::DataTransfer& dataTransfer) 88 88 { 89 [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName: clipboard.pasteboard().name()]];89 [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()]]; 90 90 } 91 91 92 void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool linkDrag)92 void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool linkDrag) 93 93 { 94 94 RetainPtr<WebHTMLView> htmlView = (WebHTMLView*)[[kit(&frame) frameView] documentView]; … … 101 101 102 102 [topHTMLView _stopAutoscrollTimer]; 103 NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: clipboard.pasteboard().name()];103 NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()]; 104 104 105 105 NSImage *dragNSImage = dragImage.get(); -
trunk/Source/WebKit/mac/WebView/WebPDFView.mm
r166684 r166965 51 51 #import "WebViewInternal.h" 52 52 #import <PDFKit/PDFKit.h> 53 #import <WebCore/ Clipboard.h>53 #import <WebCore/DataTransfer.h> 54 54 #import <WebCore/EventNames.h> 55 55 #import <WebCore/FormState.h> -
trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
r165676 r166965 30 30 #include "WebKitGraphics.h" 31 31 #include "WebView.h" 32 #include <WebCore/ Clipboard.h>32 #include <WebCore/DataTransfer.h> 33 33 #include <WebCore/DragController.h> 34 34 #include <WebCore/DragData.h> … … 97 97 } 98 98 99 void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, Clipboard& clipboard)99 void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, DataTransfer& dataTransfer) 100 100 { 101 101 COMPtr<IWebUIDelegate> uiDelegate; … … 104 104 105 105 POINT point = intPoint; 106 COMPtr<IDataObject> dataObject = clipboard.pasteboard().dataObject();106 COMPtr<IDataObject> dataObject = dataTransfer.pasteboard().dataObject(); 107 107 108 108 COMPtr<IDataObject> newDataObject; 109 109 HRESULT result = uiDelegate->willPerformDragSourceAction(m_webView, static_cast<WebDragSourceAction>(action), &point, dataObject.get(), &newDataObject); 110 110 if (result == S_OK && newDataObject != dataObject) 111 const_cast<Pasteboard&>( clipboard.pasteboard()).setExternalDataObject(newDataObject.get());111 const_cast<Pasteboard&>(dataTransfer.pasteboard()).setExternalDataObject(newDataObject.get()); 112 112 } 113 113 114 void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, Clipboard& clipboard, Frame& frame, bool isLink)114 void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, DataTransfer& dataTransfer, Frame& frame, bool isLink) 115 115 { 116 116 //FIXME: Allow UIDelegate to override behaviour <rdar://problem/5015953> … … 125 125 return; 126 126 127 dataObject = clipboard.pasteboard().dataObject();127 dataObject = dataTransfer.pasteboard().dataObject(); 128 128 if (source && (image || dataObject)) { 129 129 if (image) { -
trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.h
r165676 r166965 39 39 virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&); 40 40 virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&); 41 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore:: Clipboard&);42 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint&, const WebCore::IntPoint&, WebCore:: Clipboard&, WebCore::Frame&, bool);41 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&); 42 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint&, const WebCore::IntPoint&, WebCore::DataTransfer&, WebCore::Frame&, bool); 43 43 44 44 private: -
trunk/Source/WebKit2/ChangeLog
r166963 r166965 45 45 tile controller visible rect updates always happens via compositing flush (we assert 46 46 for this in TileController::setVisibleRect). 47 48 2014-04-08 Alexey Proskuryakov <ap@apple.com> 49 50 Rename Clipboard to DataTransfer 51 https://bugs.webkit.org/show_bug.cgi?id=131371 52 53 Reviewed by Anders Carlsson. 54 55 * WebProcess/WebCoreSupport/WebDragClient.cpp: 56 (WebKit::WebDragClient::willPerformDragSourceAction): 57 (WebKit::WebDragClient::startDrag): 58 * WebProcess/WebCoreSupport/WebDragClient.h: 59 * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm: 60 (WebKit::WebDragClient::startDrag): 47 61 48 62 2014-04-08 Alexey Proskuryakov <ap@apple.com> -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp
r164192 r166965 43 43 } 44 44 45 void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&)45 void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) 46 46 { 47 47 } … … 58 58 59 59 #if !PLATFORM(COCOA) && !PLATFORM(GTK) 60 void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)60 void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool) 61 61 { 62 62 } -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h
r164192 r166965 44 44 private: 45 45 virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override; 46 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore:: Clipboard&) override;46 virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override; 47 47 virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override; 48 48 virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override; 49 49 50 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore:: Clipboard&, WebCore::Frame&, bool linkDrag = false) override;50 virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag = false) override; 51 51 52 52 #if PLATFORM(COCOA) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm
r165218 r166965 73 73 } 74 74 75 void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, Clipboard&, Frame& frame, bool linkDrag)75 void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, DataTransfer&, Frame& frame, bool linkDrag) 76 76 { 77 77 IntSize bitmapSize([image size]);
Note:
See TracChangeset
for help on using the changeset viewer.
