+2014-04-08 Alexey Proskuryakov <ap@apple.com>
+
+ Rename Clipboard to DataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=131371
+
+ Reviewed by Anders Carlsson.
+
+ * fast/dom/dom-constructors-expected.txt:
+ * fast/dom/dom-constructors.html:
+ * js/dom/global-constructors-attributes-expected.txt:
+ * platform/efl/js/dom/global-constructors-attributes-expected.txt:
+ * platform/gtk-wk1/js/dom/global-constructors-attributes-expected.txt:
+ * platform/gtk-wk2/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+ * platform/win/js/dom/global-constructors-attributes-expected.txt:
+
2014-04-08 Brent Fulgham <bfulgham@apple.com>
[Mac] Unreviewed test gardening.
PASS TryAllocate('HTMLUListElement') is 'exception'
PASS TryAllocate('HTMLElement') is 'exception'
PASS TryAllocate('CanvasRenderingContext2D') is 'exception'
-PASS TryAllocate('Clipboard') is 'exception'
PASS TryAllocate('Counter') is 'exception'
PASS TryAllocate('CSSCharsetRule') is 'exception'
PASS TryAllocate('CSSFontFaceRule') is 'exception'
PASS TryAllocate('CSSStyleSheet') is 'exception'
PASS TryAllocate('CSSValue') is 'exception'
PASS TryAllocate('CSSValueList') is 'exception'
+PASS TryAllocate('DataTransfer') is 'exception'
PASS TryAllocate('DOMImplementation') is 'exception'
PASS TryAllocate('HTMLCollection') is 'exception'
PASS TryAllocate('MediaList') is 'exception'
'HTMLUListElement',
'HTMLElement',
'CanvasRenderingContext2D',
- 'Clipboard',
'Counter',
'CSSCharsetRule',
'CSSFontFaceRule',
'CSSStyleSheet',
'CSSValue',
'CSSValueList',
+ 'DataTransfer',
'DOMImplementation',
'HTMLCollection',
'MediaList',
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').value is Clipboard
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'Clipboard').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').value is DataTransfer
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'DataTransfer').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'Document').value is Document
PASS Object.getOwnPropertyDescriptor(global, 'Document').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'Document').hasOwnProperty('set') is false
dom/ChildNode.idl
dom/ClientRect.idl
dom/ClientRectList.idl
- dom/Clipboard.idl
dom/Comment.idl
dom/CompositionEvent.idl
dom/CustomEvent.idl
dom/DOMNamedFlowCollection.idl
dom/DOMStringList.idl
dom/DOMStringMap.idl
+ dom/DataTransfer.idl
dom/DataTransferItem.idl
dom/DataTransferItemList.idl
dom/DeviceMotionEvent.idl
dom/ClassNodeList.cpp
dom/ClientRect.cpp
dom/ClientRectList.cpp
- dom/Clipboard.cpp
dom/ClipboardEvent.cpp
dom/CollectionIndexCache.cpp
dom/Comment.cpp
dom/DOMImplementation.cpp
dom/DOMNamedFlowCollection.cpp
dom/DOMStringList.cpp
+ dom/DataTransfer.cpp
dom/DataTransferItem.cpp
dom/DatasetDOMStringMap.cpp
dom/DecodedDataDocumentParser.cpp
+2014-04-08 Alexey Proskuryakov <ap@apple.com>
+
+ Rename Clipboard to DataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=131371
+
+ Reviewed by Anders Carlsson.
+
+ This is the name used in HTML5, and it's much better than the confusing Clipboard one.
+
+ Renamed related enums too, and made DataTransferAccessPolicy an enum class.
+
+ * CMakeLists.txt:
+ * Configurations/WebCore.xcconfig:
+ * DerivedSources.cpp:
+ * DerivedSources.make:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * bindings/js/JSClipboardCustom.cpp: Removed.
+ * bindings/js/JSDataTransferCustom.cpp: Copied from Source/WebCore/bindings/js/JSClipboardCustom.cpp.
+ (WebCore::JSDataTransfer::types):
+ (WebCore::JSClipboard::types): Deleted.
+ * bindings/js/JSEventCustom.cpp:
+ * dom/Clipboard.cpp: Removed.
+ * dom/Clipboard.h: Removed.
+ * dom/Clipboard.idl: Removed.
+ * dom/ClipboardAccessPolicy.h: Removed.
+ * dom/ClipboardEvent.cpp:
+ (WebCore::ClipboardEvent::ClipboardEvent):
+ * dom/ClipboardEvent.h:
+ (WebCore::ClipboardEvent::create):
+ (WebCore::ClipboardEvent::clipboard): Deleted.
+ * dom/ClipboardMac.mm: Removed.
+ * dom/DOMAllInOne.cpp:
+ * dom/DataTransfer.cpp: Copied from Source/WebCore/dom/Clipboard.cpp.
+ (WebCore::DataTransfer::DataTransfer):
+ (WebCore::DataTransfer::createForCopyAndPaste):
+ (WebCore::DataTransfer::~DataTransfer):
+ (WebCore::DataTransfer::setAccessPolicy):
+ (WebCore::DataTransfer::canReadTypes):
+ (WebCore::DataTransfer::canReadData):
+ (WebCore::DataTransfer::canWriteData):
+ (WebCore::DataTransfer::clearData):
+ (WebCore::DataTransfer::getData):
+ (WebCore::DataTransfer::setData):
+ (WebCore::DataTransfer::types):
+ (WebCore::DataTransfer::files):
+ (WebCore::DataTransfer::dropEffect):
+ (WebCore::DataTransfer::setDropEffect):
+ (WebCore::DataTransfer::effectAllowed):
+ (WebCore::DataTransfer::setEffectAllowed):
+ (WebCore::DataTransfer::setDragImage):
+ (WebCore::DataTransfer::createForDragAndDrop):
+ (WebCore::DataTransfer::canSetDragImage):
+ (WebCore::DataTransfer::updateDragImage):
+ (WebCore::DataTransfer::createDragImage):
+ (WebCore::DragImageLoader::DragImageLoader):
+ (WebCore::DragImageLoader::imageChanged):
+ (WebCore::DataTransfer::sourceOperation):
+ (WebCore::DataTransfer::destinationOperation):
+ (WebCore::DataTransfer::setSourceOperation):
+ (WebCore::DataTransfer::setDestinationOperation):
+ (WebCore::Clipboard::Clipboard): Deleted.
+ (WebCore::Clipboard::createForCopyAndPaste): Deleted.
+ (WebCore::Clipboard::~Clipboard): Deleted.
+ (WebCore::Clipboard::setAccessPolicy): Deleted.
+ (WebCore::Clipboard::canReadTypes): Deleted.
+ (WebCore::Clipboard::canReadData): Deleted.
+ (WebCore::Clipboard::canWriteData): Deleted.
+ (WebCore::Clipboard::clearData): Deleted.
+ (WebCore::Clipboard::getData): Deleted.
+ (WebCore::Clipboard::setData): Deleted.
+ (WebCore::Clipboard::types): Deleted.
+ (WebCore::Clipboard::files): Deleted.
+ (WebCore::Clipboard::dropEffect): Deleted.
+ (WebCore::Clipboard::setDropEffect): Deleted.
+ (WebCore::Clipboard::effectAllowed): Deleted.
+ (WebCore::Clipboard::setEffectAllowed): Deleted.
+ (WebCore::Clipboard::setDragImage): Deleted.
+ (WebCore::Clipboard::createForDragAndDrop): Deleted.
+ (WebCore::Clipboard::canSetDragImage): Deleted.
+ (WebCore::Clipboard::updateDragImage): Deleted.
+ (WebCore::Clipboard::createDragImage): Deleted.
+ (WebCore::Clipboard::sourceOperation): Deleted.
+ (WebCore::Clipboard::destinationOperation): Deleted.
+ (WebCore::Clipboard::setSourceOperation): Deleted.
+ (WebCore::Clipboard::setDestinationOperation): Deleted.
+ * dom/DataTransfer.h: Copied from Source/WebCore/dom/Clipboard.h.
+ * dom/DataTransfer.idl: Copied from Source/WebCore/dom/Clipboard.idl.
+ * dom/DataTransferAccessPolicy.h: Copied from Source/WebCore/dom/ClipboardAccessPolicy.h.
+ * dom/DataTransferItemList.h:
+ * dom/DataTransferMac.mm: Copied from Source/WebCore/dom/ClipboardMac.mm.
+ (WebCore::DataTransfer::createDragImage):
+ (WebCore::Clipboard::createDragImage): Deleted.
+ * dom/Event.h:
+ (WebCore::Event::clipboardData):
+ (WebCore::Event::internalDataTransfer):
+ (WebCore::Event::clipboard): Deleted.
+ * dom/Event.idl:
+ * dom/MouseEvent.cpp:
+ (WebCore::MouseEvent::create):
+ (WebCore::MouseEvent::MouseEvent):
+ (WebCore::MouseEvent::initMouseEvent):
+ * dom/MouseEvent.h:
+ (WebCore::MouseEvent::dataTransfer):
+ * dom/MouseEvent.idl:
+ * dom/WheelEvent.cpp:
+ * editing/Editor.cpp:
+ (WebCore::Editor::canDHTMLCut):
+ (WebCore::Editor::canDHTMLCopy):
+ (WebCore::Editor::canDHTMLPaste):
+ (WebCore::Editor::tryDHTMLCopy):
+ (WebCore::Editor::tryDHTMLCut):
+ (WebCore::Editor::tryDHTMLPaste):
+ (WebCore::Editor::dispatchCPPEvent):
+ (WebCore::Editor::performCutOrCopy):
+ (WebCore::Editor::selectedTextForDataTransfer):
+ (WebCore::Editor::selectedTextForClipboard): Deleted.
+ * editing/Editor.h:
+ * editing/ios/EditorIOS.mm:
+ (WebCore::Editor::stringSelectionForPasteboardWithImageAltText):
+ * editing/mac/EditorMac.mm:
+ (WebCore::Editor::takeFindStringFromSelection):
+ (WebCore::Editor::stringSelectionForPasteboardWithImageAltText):
+ * loader/EmptyClients.h:
+ * page/DragClient.h:
+ * page/DragController.cpp:
+ (WebCore::DragController::dragExited):
+ (WebCore::DragController::performDrag):
+ (WebCore::DragController::tryDHTMLDrag):
+ (WebCore::DragController::startDrag):
+ (WebCore::DragController::doImageDrag):
+ (WebCore::DragController::doSystemDrag):
+ * page/DragController.h:
+ * page/DragState.h:
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::dispatchDragEvent):
+ (WebCore::hasFileOfType):
+ (WebCore::hasStringOfType):
+ (WebCore::hasDropZoneType):
+ (WebCore::findDropZone):
+ (WebCore::EventHandler::updateDragAndDrop):
+ (WebCore::EventHandler::cancelDragAndDrop):
+ (WebCore::EventHandler::performDragAndDrop):
+ (WebCore::EventHandler::freeDataTransfer):
+ (WebCore::EventHandler::dragSourceEndedAt):
+ (WebCore::EventHandler::dispatchDragSrcEvent):
+ (WebCore::EventHandler::handleDrag):
+ (WebCore::EventHandler::freeClipboard): Deleted.
+ * page/EventHandler.h:
+ * page/efl/EventHandlerEfl.cpp:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ (WebCore::EventHandler::createDraggingClipboard): Deleted.
+ * page/gtk/DragControllerGtk.cpp:
+ (WebCore::DragController::declareAndWriteDragImage):
+ * page/gtk/EventHandlerGtk.cpp:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ (WebCore::EventHandler::createDraggingClipboard): Deleted.
+ * page/mac/DragControllerMac.mm:
+ (WebCore::DragController::declareAndWriteDragImage):
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::createDraggingDataTransfer):
+ (WebCore::EventHandler::createDraggingClipboard): Deleted.
+ * page/win/DragControllerWin.cpp:
+ (WebCore::DragController::declareAndWriteDragImage):
+ * page/win/EventHandlerWin.cpp:
+ (WebCore::EventHandler::createDraggingataTransfer):
+ (WebCore::EventHandler::createDraggingClipboard): Deleted.
+ * platform/Pasteboard.h:
+ * platform/gtk/PasteboardGtk.cpp:
+ (WebCore::Pasteboard::writeSelection):
+ * platform/mac/PasteboardMac.mm:
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::writeRangeToDataObject):
+ (WebCore::Pasteboard::writeSelection):
+
2014-04-08 Jer Noble <jer.noble@apple.com>
Unreviewed iOS build fix. Pass 0 instead of nil to the options parameter of addObserver:forKeyPath:options:context.
JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ClipboardMac.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;
+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;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
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;
#include "JSCharacterData.cpp"
#include "JSClientRect.cpp"
#include "JSClientRectList.cpp"
-#include "JSClipboard.cpp"
#include "JSCloseEvent.cpp"
#include "JSCommandLineAPIHost.cpp"
#include "JSComment.cpp"
#include "JSDatabase.cpp"
#include "JSDatabaseCallback.cpp"
#include "JSDatabaseSync.cpp"
+#include "JSDataTransfer.cpp"
#include "JSDataTransferItem.cpp"
#include "JSDataTransferItemList.cpp"
#include "JSDedicatedWorkerGlobalScope.cpp"
$(WebCore)/dom/ChildNode.idl \
$(WebCore)/dom/ClientRect.idl \
$(WebCore)/dom/ClientRectList.idl \
- $(WebCore)/dom/Clipboard.idl \
$(WebCore)/dom/Comment.idl \
$(WebCore)/dom/CompositionEvent.idl \
$(WebCore)/dom/CustomEvent.idl \
$(WebCore)/dom/DOMImplementation.idl \
$(WebCore)/dom/DOMStringList.idl \
$(WebCore)/dom/DOMStringMap.idl \
+ $(WebCore)/dom/DataTransfer.idl \
$(WebCore)/dom/DataTransferItem.idl \
$(WebCore)/dom/DataTransferItemList.idl \
$(WebCore)/dom/DeviceMotionEvent.idl \
__ZN7WebCore10JSDocument6s_infoE
__ZN7WebCore10LayoutRectC1ERKNS_9FloatRectE
__ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringENS1_10PassRefPtrINS_9DOMWindowEEERKNS_18PlatformMouseEventEiNS5_INS_4NodeEEE
-__ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_9ClipboardEEEb
+__ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_12DataTransferEEEb
__ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOptionE
__ZN7WebCore10Pasteboard21createForCopyAndPasteEv
__ZN7WebCore10RenderView10compositorEv
__ZN7WebCore11startOfLineERKNS_15VisiblePositionE
__ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
__ZN7WebCore11writeToFileEiPKci
+__ZN7WebCore12DataTransferD1Ev
__ZN7WebCore12EditingStyleD1Ev
__ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
__ZN7WebCore12EventHandler14scrollOverflowENS_15ScrollDirectionENS_17ScrollGranularityEPNS_4NodeE
__ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELm0ENS0_15CrashOnOverflowEEE
__ZN7WebCore8toUInt16EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
__ZN7WebCore8toUInt64EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
-__ZN7WebCore9ClipboardD1Ev
__ZN7WebCore9DOMWindow30dispatchAllPendingUnloadEventsEv
__ZN7WebCore9DOMWindow36dispatchAllPendingBeforeUnloadEventsEv
__ZN7WebCore9FloatRect5scaleEff
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\Clipboard.cpp">
+ <ClCompile Include="..\dom\ClipboardEvent.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\ClipboardEvent.cpp">
+ <ClCompile Include="..\dom\CollectionIndexCache.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\CollectionIndexCache.cpp">
+ <ClCompile Include="..\dom\Comment.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\Comment.cpp">
+ <ClCompile Include="..\dom\CompositionEvent.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\CompositionEvent.cpp">
+ <ClCompile Include="..\dom\ContainerNode.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\ContainerNode.cpp">
+ <ClCompile Include="..\dom\ContextDestructionObserver.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\ContextDestructionObserver.cpp">
+ <ClCompile Include="..\dom\CustomEvent.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\CustomEvent.cpp">
+ <ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
+ <ClCompile Include="..\dom\DataTransfer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCSSRuleCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCSSRuleCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCSSRuleListCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCSSRuleListCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCSSStyleDeclarationCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCSSStyleDeclarationCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCSSValueCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCSSValueCustom.cpp">
+ <ClCompile Include="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp">
+ <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
+ <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCharacterData.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRect.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.h" />
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSComment.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCompositionEvent.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCustomEvent.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItemList.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.h" />
<ClInclude Include="..\dom\ClassNodeList.h" />
<ClInclude Include="..\dom\ClientRect.h" />
<ClInclude Include="..\dom\ClientRectList.h" />
- <ClInclude Include="..\dom\Clipboard.h" />
- <ClInclude Include="..\dom\ClipboardAccessPolicy.h" />
<ClInclude Include="..\dom\ClipboardEvent.h" />
<ClInclude Include="..\dom\CollectionIndexCache.h" />
<ClInclude Include="..\dom\Comment.h" />
<ClInclude Include="..\dom\CrossThreadTask.h" />
<ClInclude Include="..\dom\CustomEvent.h" />
<ClInclude Include="..\dom\DatasetDOMStringMap.h" />
+ <ClInclude Include="..\dom\DataTransfer.h" />
+ <ClInclude Include="..\dom\DataTransferAccessPolicy.h" />
<ClInclude Include="..\dom\DataTransferItem.h" />
<ClInclude Include="..\dom\DataTransferItemList.h" />
<ClInclude Include="..\dom\DecodedDataDocumentParser.h" />
<ClCompile Include="..\dom\ClientRectList.cpp">
<Filter>dom</Filter>
</ClCompile>
- <ClCompile Include="..\dom\Clipboard.cpp">
- <Filter>dom</Filter>
- </ClCompile>
<ClCompile Include="..\dom\ClipboardEvent.cpp">
<Filter>dom</Filter>
</ClCompile>
<ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
<Filter>dom</Filter>
</ClCompile>
+ <ClCompile Include="..\dom\DataTransfer.cpp">
+ <Filter>dom</Filter>
+ </ClCompile>
<ClCompile Include="..\dom\DataTransferItem.cpp">
<Filter>dom</Filter>
</ClCompile>
<ClCompile Include="..\bindings\js\JSCDATASectionCustom.cpp">
<Filter>bindings\js</Filter>
</ClCompile>
- <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
<ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
<Filter>bindings\js</Filter>
</ClCompile>
<ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
<Filter>bindings\js</Filter>
</ClCompile>
+ <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp">
+ <Filter>bindings\js</Filter>
+ </ClCompile>
<ClCompile Include="..\bindings\js\JSDedicatedWorkerGlobalScopeCustom.cpp">
<Filter>bindings\js</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClInclude Include="..\dom\ClientRectList.h">
<Filter>dom</Filter>
</ClInclude>
- <ClInclude Include="..\dom\Clipboard.h">
- <Filter>dom</Filter>
- </ClInclude>
- <ClInclude Include="..\dom\ClipboardAccessPolicy.h">
- <Filter>dom</Filter>
- </ClInclude>
<ClInclude Include="..\dom\ClipboardEvent.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="..\dom\DatasetDOMStringMap.h">
<Filter>dom</Filter>
</ClInclude>
+ <ClInclude Include="..\dom\DataTransfer.h">
+ <Filter>dom</Filter>
+ </ClInclude>
+ <ClInclude Include="..\dom\DataTransferAccessPolicy.h">
+ <Filter>dom</Filter>
+ </ClInclude>
<ClInclude Include="..\dom\DataTransferItem.h">
<Filter>dom</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.h">
<Filter>DerivedSources</Filter>
</ClInclude>
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h">
<Filter>DerivedSources</Filter>
</ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h">
<Filter>DerivedSources</Filter>
</ClInclude>
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h">
<Filter>DerivedSources</Filter>
</ClInclude>
4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; };
4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; };
4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */; };
- 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */; };
4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */; };
84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 84D0C4051115F1EA0018AA34 /* AffineTransform.h */; settings = {ATTRIBUTES = (Private, ); }; };
85031B3C0A44EFC700F992E0 /* BeforeUnloadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */; };
85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */; };
- 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* Clipboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* DataTransfer.h */; settings = {ATTRIBUTES = (Private, ); }; };
85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */; };
85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */; };
85031B410A44EFC700F992E0 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B2B0A44EFC700F992E0 /* Event.cpp */; };
93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.cpp */; };
93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; };
93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; };
- 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };
+ 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* DataTransferMac.mm */; };
93F19B0308245E59001E9ABC /* XSLStyleSheetLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24906D18A7E004A6FA3 /* XSLStyleSheetLibxslt.cpp */; };
93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; };
93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24D06D18A7E004A6FA3 /* XSLTProcessorLibxslt.cpp */; };
A77E1FEF14AACB6E005B7CB6 /* TreeScopeAdopter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A77E1FED14AACB6E005B7CB6 /* TreeScopeAdopter.cpp */; };
A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */; };
A781C6A713828B5D0012A62A /* DocumentMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A781C6A613828B5D0012A62A /* DocumentMarker.cpp */; };
- A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* Clipboard.cpp */; };
+ A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* DataTransfer.cpp */; };
A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */; };
A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */; };
A78FE13B12366B1000ACE8D0 /* SpellChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */; };
BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA257141293C010007A263D /* VerticalPositionCache.h */; };
BCA2B061105047600043BD1C /* UserScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B0601050475F0043BD1C /* UserScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCA2B08B10505BCD0043BD1C /* UserScriptTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B08A10505BCD0043BD1C /* UserScriptTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BCA83E4F0D7CE1E9003421A8 /* JSClipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */; };
- BCA83E500D7CE1E9003421A8 /* JSClipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */; };
- BCA83E520D7CE205003421A8 /* JSClipboardCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */; };
+ BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */; };
+ BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */; };
+ BCA83E520D7CE205003421A8 /* JSDataTransferCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */; };
BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA846D40DC67A350026C309 /* RenderReplica.cpp */; };
BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA846D50DC67A350026C309 /* RenderReplica.h */; };
BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C81C11E3D36900812FB7 /* BackForwardController.h */; settings = {ATTRIBUTES = (Private, ); }; };
2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCrossfadeValue.h; sourceTree = "<group>"; };
2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
- 2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ 2D90660C0665D937006B6F1A /* DataTransferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataTransferMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSecurityPolicy.cpp; sourceTree = "<group>"; };
2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSecurityPolicy.h; sourceTree = "<group>"; };
2D9A247015B9C29500D34527 /* DOMDOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMSecurityPolicy.h; sourceTree = "<group>"; };
4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSourceCG.h; sourceTree = "<group>"; };
4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; };
4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplaceCF.cpp; sourceTree = "<group>"; };
- 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };
+ 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransferAccessPolicy.h; sourceTree = "<group>"; };
4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorDeleteAction.h; sourceTree = "<group>"; };
4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaFeatureNames.cpp; sourceTree = "<group>"; };
4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaFeatureNames.h; sourceTree = "<group>"; };
84D0C4051115F1EA0018AA34 /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AffineTransform.h; path = transforms/AffineTransform.h; sourceTree = "<group>"; };
85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BeforeUnloadEvent.cpp; sourceTree = "<group>"; };
85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BeforeUnloadEvent.h; sourceTree = "<group>"; };
- 85031B280A44EFC700F992E0 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };
+ 85031B280A44EFC700F992E0 /* DataTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransfer.h; sourceTree = "<group>"; };
85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ClipboardEvent.cpp; sourceTree = "<group>"; };
85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardEvent.h; sourceTree = "<group>"; };
85031B2B0A44EFC700F992E0 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
A77E1FED14AACB6E005B7CB6 /* TreeScopeAdopter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TreeScopeAdopter.cpp; sourceTree = "<group>"; };
A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeScopeAdopter.h; sourceTree = "<group>"; };
A781C6A613828B5D0012A62A /* DocumentMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarker.cpp; sourceTree = "<group>"; };
- A784941A0B5FE507001E237A /* Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Clipboard.cpp; sourceTree = "<group>"; };
+ A784941A0B5FE507001E237A /* DataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DataTransfer.cpp; sourceTree = "<group>"; };
A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeterShadowElement.cpp; sourceTree = "<group>"; };
A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeterShadowElement.h; sourceTree = "<group>"; };
A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellChecker.cpp; sourceTree = "<group>"; };
BCA2B08A10505BCD0043BD1C /* UserScriptTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserScriptTypes.h; sourceTree = "<group>"; };
BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScheduledAction.cpp; sourceTree = "<group>"; };
BCA378BB0D15F64200B793D6 /* ScheduledAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScheduledAction.h; sourceTree = "<group>"; };
- BCA83E360D7CDC4E003421A8 /* Clipboard.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Clipboard.idl; sourceTree = "<group>"; };
- BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClipboard.cpp; sourceTree = "<group>"; };
- BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClipboard.h; sourceTree = "<group>"; };
- BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClipboardCustom.cpp; sourceTree = "<group>"; };
+ BCA83E360D7CDC4E003421A8 /* DataTransfer.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DataTransfer.idl; sourceTree = "<group>"; };
+ BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataTransfer.cpp; sourceTree = "<group>"; };
+ BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDataTransfer.h; sourceTree = "<group>"; };
+ BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDataTransferCustom.cpp; sourceTree = "<group>"; };
BCA846D40DC67A350026C309 /* RenderReplica.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderReplica.cpp; sourceTree = "<group>"; };
BCA846D50DC67A350026C309 /* RenderReplica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderReplica.h; sourceTree = "<group>"; };
BCA8C81C11E3D36900812FB7 /* BackForwardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardController.h; sourceTree = "<group>"; };
93F9B79F0BA6032600854064 /* JSCDATASection.h */,
65DF31DF09D1CC60000BE325 /* JSCharacterData.cpp */,
65DF31E009D1CC60000BE325 /* JSCharacterData.h */,
- BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */,
- BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */,
93F9B6DE0BA0FB7200854064 /* JSComment.cpp */,
93F9B6DF0BA0FB7200854064 /* JSComment.h */,
FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */,
FE6FD48C0F676E9300092873 /* JSCoordinates.h */,
+ BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */,
+ BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */,
31FB1A63120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp */,
31FB1A64120A5D3F00DC02A0 /* JSDeviceMotionEvent.h */,
59A86005119DAF7F00DEF1EF /* JSDeviceOrientationEvent.cpp */,
49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */,
- BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
E157A8E618184C67009F821D /* JSCryptoKeyCustom.cpp */,
BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
AD726FEA16D9F40B003A4E6D /* JSCSSStyleDeclarationCustom.h */,
BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
+ BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */,
4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */,
31FB1A6B120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp */,
590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,
BCC0657A0F3CE1B700CD2D87 /* ClientRectList.cpp */,
BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */,
BCC0657C0F3CE1B700CD2D87 /* ClientRectList.idl */,
- A784941A0B5FE507001E237A /* Clipboard.cpp */,
- 85031B280A44EFC700F992E0 /* Clipboard.h */,
- BCA83E360D7CDC4E003421A8 /* Clipboard.idl */,
- 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */,
85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */,
85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */,
- 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
E425A49918292B840020CFCF /* CollectionIndexCache.h */,
9BD8A95918BEFC7600987E9A /* CollectionIndexCache.cpp */,
6550B697099DF0270090D781 /* Comment.cpp */,
62CD32561157E57C0063B0A7 /* CustomEvent.cpp */,
62CD32571157E57C0063B0A7 /* CustomEvent.h */,
62CD32581157E57C0063B0A7 /* CustomEvent.idl */,
+ A784941A0B5FE507001E237A /* DataTransfer.cpp */,
+ 85031B280A44EFC700F992E0 /* DataTransfer.h */,
+ BCA83E360D7CDC4E003421A8 /* DataTransfer.idl */,
+ 2D90660C0665D937006B6F1A /* DataTransferMac.mm */,
+ 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */,
BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */,
BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */,
81AC5997131636E60009A7E0 /* DataTransferItem.h */,
BC904B770D10998F00680D32 /* ClassNodeList.h in Headers */,
BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */,
BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */,
- 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */,
- 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
+ 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */,
+ 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */,
85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
65DF31F409D1CC60000BE325 /* JSCharacterData.h in Headers */,
BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */,
BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */,
- BCA83E500D7CE1E9003421A8 /* JSClipboard.h in Headers */,
+ BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */,
51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */,
A584FE3C1864E2D800843B10 /* JSCommandLineAPIHost.h in Headers */,
93F9B6E10BA0FB7200854064 /* JSComment.h in Headers */,
BC904B760D10998F00680D32 /* ClassNodeList.cpp in Sources */,
BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
- A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */,
+ A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */,
85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
- 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
+ 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */,
CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
B27535660B053814002CE64F /* Color.cpp in Sources */,
65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */,
BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */,
BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */,
- BCA83E4F0D7CE1E9003421A8 /* JSClipboard.cpp in Sources */,
- BCA83E520D7CE205003421A8 /* JSClipboardCustom.cpp in Sources */,
+ BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */,
+ BCA83E520D7CE205003421A8 /* JSDataTransferCustom.cpp in Sources */,
51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */,
A584FE3B1864E2D800843B10 /* JSCommandLineAPIHost.cpp in Sources */,
A584FE381864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp in Sources */,
#include "JSCallbackData.cpp"
#include "JSCanvasRenderingContext2DCustom.cpp"
#include "JSCanvasRenderingContextCustom.cpp"
-#include "JSClipboardCustom.cpp"
#include "JSCommandLineAPIHostCustom.cpp"
#include "JSCryptoCustom.cpp"
#include "JSCustomSQLStatementErrorCallback.cpp"
#include "JSDOMWindowCustom.cpp"
#include "JSDOMWindowShell.cpp"
#include "JSDOMWrapper.cpp"
+#include "JSDataTransferCustom.cpp"
#include "JSDedicatedWorkerGlobalScopeCustom.cpp"
#include "JSDeviceOrientationEventCustom.cpp"
#include "JSDictionary.cpp"
*/
#include "config.h"
-#include "JSClipboard.h"
+#include "JSDataTransfer.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
using namespace JSC;
namespace WebCore {
-JSValue JSClipboard::types(ExecState* exec) const
+JSValue JSDataTransfer::types(ExecState* exec) const
{
Vector<String> types = impl().types();
return types.isEmpty() ? jsNull() : jsArray(exec, globalObject(), types);
#include "config.h"
#include "JSEvent.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "Event.h"
#include "EventHeaders.h"
#include "EventInterfaces.h"
#include "EventNames.h"
-#include "JSClipboard.h"
+#include "JSDataTransfer.h"
#include <runtime/JSLock.h>
#include <wtf/HashMap.h>
#include <wtf/text/AtomicString.h>
#include "config.h"
#include "ClipboardEvent.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "EventNames.h"
namespace WebCore {
{
}
-ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<Clipboard> clipboard)
- : Event(eventType, canBubble, cancelable), m_clipboard(clipboard)
+ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<DataTransfer> dataTransfer)
+ : Event(eventType, canBubble, cancelable), m_dataTransfer(dataTransfer)
{
}
namespace WebCore {
- class Clipboard;
+ class DataTransfer;
class ClipboardEvent : public Event {
public:
{
return adoptRef(new ClipboardEvent);
}
- static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<Clipboard> clipboardArg)
+ static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer> clipboardArg)
{
return adoptRef(new ClipboardEvent(type, canBubbleArg, cancelableArg, clipboardArg));
}
- Clipboard* clipboard() const { return m_clipboard.get(); }
+ virtual DataTransfer* internalDataTransfer() const override { return m_dataTransfer.get(); }
private:
ClipboardEvent();
- ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<Clipboard>);
+ ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer>);
virtual EventInterface eventInterface() const override;
virtual bool isClipboardEvent() const override;
- RefPtr<Clipboard> m_clipboard;
+ RefPtr<DataTransfer> m_dataTransfer;
};
} // namespace WebCore
#include "ClassNodeList.cpp"
#include "ClientRect.cpp"
#include "ClientRectList.cpp"
-#include "Clipboard.cpp"
#include "ClipboardEvent.cpp"
#include "CollectionIndexCache.cpp"
#include "Comment.cpp"
#include "DOMImplementation.cpp"
#include "DOMNamedFlowCollection.cpp"
#include "DOMStringList.cpp"
+#include "DataTransfer.cpp"
#include "DatasetDOMStringMap.cpp"
#include "DecodedDataDocumentParser.cpp"
#include "DeviceMotionController.cpp"
*/
#include "config.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "CachedImage.h"
#include "CachedImageClient.h"
class DragImageLoader final : private CachedImageClient {
WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
public:
- explicit DragImageLoader(Clipboard*);
+ explicit DragImageLoader(DataTransfer*);
void startLoading(CachedResourceHandle<CachedImage>&);
void stopLoading(CachedResourceHandle<CachedImage>&);
private:
virtual void imageChanged(CachedImage*, const IntRect*) override;
- Clipboard* m_clipboard;
+ DataTransfer* m_dataTransfer;
};
#endif
-Clipboard::Clipboard(ClipboardAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, ClipboardType type, bool forFileDrag)
+DataTransfer::DataTransfer(DataTransferAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, Type type, bool forFileDrag)
: m_policy(policy)
, m_pasteboard(pasteboard)
#if ENABLE(DRAG_SUPPORT)
#endif
}
-PassRefPtr<Clipboard> Clipboard::createForCopyAndPaste(ClipboardAccessPolicy policy)
+PassRefPtr<DataTransfer> DataTransfer::createForCopyAndPaste(DataTransferAccessPolicy policy)
{
- return adoptRef(new Clipboard(policy, policy == ClipboardWritable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste()));
+ return adoptRef(new DataTransfer(policy, policy == DataTransferAccessPolicy::Writable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste()));
}
-Clipboard::~Clipboard()
+DataTransfer::~DataTransfer()
{
#if ENABLE(DRAG_SUPPORT)
if (m_dragImageLoader && m_dragImage)
#endif
}
-void Clipboard::setAccessPolicy(ClipboardAccessPolicy policy)
+void DataTransfer::setAccessPolicy(DataTransferAccessPolicy policy)
{
- // Once the clipboard goes numb, it can never go back.
- ASSERT(m_policy != ClipboardNumb || policy == ClipboardNumb);
+ // Once the dataTransfer goes numb, it can never go back.
+ ASSERT(m_policy != DataTransferAccessPolicy::Numb || policy == DataTransferAccessPolicy::Numb);
m_policy = policy;
}
-bool Clipboard::canReadTypes() const
+bool DataTransfer::canReadTypes() const
{
- return m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable || m_policy == ClipboardWritable;
+ return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::TypesReadable || m_policy == DataTransferAccessPolicy::Writable;
}
-bool Clipboard::canReadData() const
+bool DataTransfer::canReadData() const
{
- return m_policy == ClipboardReadable || m_policy == ClipboardWritable;
+ return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::Writable;
}
-bool Clipboard::canWriteData() const
+bool DataTransfer::canWriteData() const
{
- return m_policy == ClipboardWritable;
+ return m_policy == DataTransferAccessPolicy::Writable;
}
-void Clipboard::clearData(const String& type)
+void DataTransfer::clearData(const String& type)
{
if (!canWriteData())
return;
m_pasteboard->clear(type);
}
-void Clipboard::clearData()
+void DataTransfer::clearData()
{
if (!canWriteData())
return;
m_pasteboard->clear();
}
-String Clipboard::getData(const String& type) const
+String DataTransfer::getData(const String& type) const
{
if (!canReadData())
return String();
return m_pasteboard->readString(type);
}
-bool Clipboard::setData(const String& type, const String& data)
+bool DataTransfer::setData(const String& type, const String& data)
{
if (!canWriteData())
return false;
return m_pasteboard->writeString(type, data);
}
-Vector<String> Clipboard::types() const
+Vector<String> DataTransfer::types() const
{
if (!canReadTypes())
return Vector<String>();
return m_pasteboard->types();
}
-PassRefPtr<FileList> Clipboard::files() const
+PassRefPtr<FileList> DataTransfer::files() const
{
// FIXME: We could cache the computed file list if it was necessary and helpful.
// Currently, each access gets a new copy, and thus setData() modifications to the
- // clipboard are not reflected in any FileList objects the page has accessed and stored.
+ // dataTransfer are not reflected in any FileList objects the page has accessed and stored.
if (!canReadData())
return FileList::create();
#if !ENABLE(DRAG_SUPPORT)
-String Clipboard::dropEffect() const
+String DataTransfer::dropEffect() const
{
return ASCIILiteral("none");
}
-void Clipboard::setDropEffect(const String&)
+void DataTransfer::setDropEffect(const String&)
{
}
-String Clipboard::effectAllowed() const
+String DataTransfer::effectAllowed() const
{
return ASCIILiteral("uninitialized");
}
-void Clipboard::setEffectAllowed(const String&)
+void DataTransfer::setEffectAllowed(const String&)
{
}
-void Clipboard::setDragImage(Element*, int, int)
+void DataTransfer::setDragImage(Element*, int, int)
{
}
#else
-PassRefPtr<Clipboard> Clipboard::createForDragAndDrop()
+PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop()
{
- return adoptRef(new Clipboard(ClipboardWritable, Pasteboard::createForDragAndDrop(), DragAndDrop));
+ return adoptRef(new DataTransfer(DataTransferAccessPolicy::Writable, Pasteboard::createForDragAndDrop(), DragAndDrop));
}
-PassRefPtr<Clipboard> Clipboard::createForDragAndDrop(ClipboardAccessPolicy policy, const DragData& dragData)
+PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop(DataTransferAccessPolicy policy, const DragData& dragData)
{
- return adoptRef(new Clipboard(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
+ return adoptRef(new DataTransfer(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
}
-bool Clipboard::canSetDragImage() const
+bool DataTransfer::canSetDragImage() const
{
// Note that the spec doesn't actually allow drag image modification outside the dragstart
// event. This capability is maintained for backwards compatiblity for ports that have
// supported this in the past. On many ports, attempting to set a drag image outside the
// dragstart operation is a no-op anyway.
- return m_forDrag && (m_policy == ClipboardImageWritable || m_policy == ClipboardWritable);
+ return m_forDrag && (m_policy == DataTransferAccessPolicy::ImageWritable || m_policy == DataTransferAccessPolicy::Writable);
}
-void Clipboard::setDragImage(Element* element, int x, int y)
+void DataTransfer::setDragImage(Element* element, int x, int y)
{
if (!canSetDragImage())
return;
updateDragImage();
}
-void Clipboard::updateDragImage()
+void DataTransfer::updateDragImage()
{
// Don't allow setting the image if we haven't started dragging yet; we'll rely on the dragging code
// to install this drag image as part of getting the drag kicked off.
#if !PLATFORM(COCOA)
-DragImageRef Clipboard::createDragImage(IntPoint& location) const
+DragImageRef DataTransfer::createDragImage(IntPoint& location) const
{
location = m_dragLocation;
#endif
-DragImageLoader::DragImageLoader(Clipboard* clipboard)
- : m_clipboard(clipboard)
+DragImageLoader::DragImageLoader(DataTransfer* dataTransfer)
+ : m_dataTransfer(dataTransfer)
{
}
void DragImageLoader::imageChanged(CachedImage*, const IntRect*)
{
- m_clipboard->updateDragImage();
+ m_dataTransfer->updateDragImage();
}
static DragOperation dragOpFromIEOp(const String& operation)
return "none";
}
-DragOperation Clipboard::sourceOperation() const
+DragOperation DataTransfer::sourceOperation() const
{
DragOperation operation = dragOpFromIEOp(m_effectAllowed);
ASSERT(operation != DragOperationPrivate);
return operation;
}
-DragOperation Clipboard::destinationOperation() const
+DragOperation DataTransfer::destinationOperation() const
{
DragOperation operation = dragOpFromIEOp(m_dropEffect);
ASSERT(operation == DragOperationCopy || operation == DragOperationNone || operation == DragOperationLink || operation == (DragOperation)(DragOperationGeneric | DragOperationMove) || operation == DragOperationEvery);
return operation;
}
-void Clipboard::setSourceOperation(DragOperation operation)
+void DataTransfer::setSourceOperation(DragOperation operation)
{
ASSERT_ARG(operation, operation != DragOperationPrivate);
m_effectAllowed = IEOpFromDragOp(operation);
}
-void Clipboard::setDestinationOperation(DragOperation operation)
+void DataTransfer::setDestinationOperation(DragOperation operation)
{
ASSERT_ARG(operation, operation == DragOperationCopy || operation == DragOperationNone || operation == DragOperationLink || operation == DragOperationGeneric || operation == DragOperationMove || operation == (DragOperation)(DragOperationGeneric | DragOperationMove));
m_dropEffect = IEOpFromDragOp(operation);
}
-String Clipboard::dropEffect() const
+String DataTransfer::dropEffect() const
{
return m_dropEffect == "uninitialized" ? ASCIILiteral("none") : m_dropEffect;
}
-void Clipboard::setDropEffect(const String& effect)
+void DataTransfer::setDropEffect(const String& effect)
{
if (!m_forDrag)
return;
m_dropEffect = effect;
}
-String Clipboard::effectAllowed() const
+String DataTransfer::effectAllowed() const
{
return m_effectAllowed;
}
-void Clipboard::setEffectAllowed(const String& effect)
+void DataTransfer::setEffectAllowed(const String& effect)
{
if (!m_forDrag)
return;
*
*/
-#ifndef Clipboard_h
-#define Clipboard_h
+#ifndef DataTransfer_h
+#define DataTransfer_h
#include "CachedResourceHandle.h"
-#include "ClipboardAccessPolicy.h"
+#include "DataTransferAccessPolicy.h"
#include "DragActions.h"
#include "DragImage.h"
#include "IntPoint.h"
class FileList;
class Pasteboard;
- class Clipboard : public RefCounted<Clipboard> {
+ class DataTransfer : public RefCounted<DataTransfer> {
public:
- static PassRefPtr<Clipboard> createForCopyAndPaste(ClipboardAccessPolicy);
+ static PassRefPtr<DataTransfer> createForCopyAndPaste(DataTransferAccessPolicy);
- ~Clipboard();
+ ~DataTransfer();
String dropEffect() const;
void setDropEffect(const String&);
PassRefPtr<DataTransferItemList> items() = 0;
#endif
- void setAccessPolicy(ClipboardAccessPolicy);
+ void setAccessPolicy(DataTransferAccessPolicy);
bool canReadTypes() const;
bool canReadData() const;
bool canWriteData() const;
Pasteboard& pasteboard() { return *m_pasteboard; }
#if ENABLE(DRAG_SUPPORT)
- static PassRefPtr<Clipboard> createForDragAndDrop();
- static PassRefPtr<Clipboard> createForDragAndDrop(ClipboardAccessPolicy, const DragData&);
+ static PassRefPtr<DataTransfer> createForDragAndDrop();
+ static PassRefPtr<DataTransfer> createForDragAndDrop(DataTransferAccessPolicy, const DragData&);
bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
#endif
private:
- enum ClipboardType { CopyAndPaste, DragAndDrop };
- Clipboard(ClipboardAccessPolicy, PassOwnPtr<Pasteboard>, ClipboardType = CopyAndPaste, bool forFileDrag = false);
+ enum Type { CopyAndPaste, DragAndDrop };
+ DataTransfer(DataTransferAccessPolicy, PassOwnPtr<Pasteboard>, Type = CopyAndPaste, bool forFileDrag = false);
#if ENABLE(DRAG_SUPPORT)
bool canSetDragImage() const;
#endif
- ClipboardAccessPolicy m_policy;
+ DataTransferAccessPolicy m_policy;
OwnPtr<Pasteboard> m_pasteboard;
#if ENABLE(DRAG_SUPPORT)
} // namespace WebCore
-#endif // Clipboard_h
+#endif // DataTransfer_h
[
SkipVTableValidation,
-] interface Clipboard {
+] interface DataTransfer {
attribute DOMString dropEffect;
attribute DOMString effectAllowed;
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#ifndef ClipboardAccessPolicy_h
-#define ClipboardAccessPolicy_h
+
+#ifndef DataTransferAccessPolicy_h
+#define DataTransferAccessPolicy_h
namespace WebCore {
-enum ClipboardAccessPolicy {
- ClipboardNumb, ClipboardImageWritable, ClipboardWritable, ClipboardTypesReadable, ClipboardReadable
+enum class DataTransferAccessPolicy {
+ Numb, ImageWritable, Writable, TypesReadable, Readable
};
} // namespace
namespace WebCore {
-class Clipboard;
class File;
typedef int ExceptionCode;
*/
#import "config.h"
-#import "Clipboard.h"
+#import "DataTransfer.h"
#import "CachedImage.h"
#import "Element.h"
namespace WebCore {
// FIXME: Need to refactor and figure out how to handle the flipping in a more sensible way so we can
-// use the default Clipboard::dragImage from Clipboard.cpp. Note also that this handles cases that
-// Clipboard::dragImage in Clipboard.cpp does not handle correctly, so must resolve that as well.
-DragImageRef Clipboard::createDragImage(IntPoint& location) const
+// use the default DataTransfer::dragImage from DataTransfer.cpp. Note also that this handles cases that
+// DataTransfer::dragImage in DataTransfer.cpp does not handle correctly, so must resolve that as well.
+DragImageRef DataTransfer::createDragImage(IntPoint& location) const
{
DragImageRef result = nil;
if (m_dragImageElement) {
namespace WebCore {
-class Clipboard;
+class DataTransfer;
class EventTarget;
class HTMLIFrameElement;
bool legacyReturnValue() const { return !defaultPrevented(); }
void setLegacyReturnValue(bool returnValue) { setDefaultPrevented(!returnValue); }
- Clipboard* clipboardData() const { return isClipboardEvent() ? clipboard() : 0; }
+ DataTransfer* clipboardData() const { return isClipboardEvent() ? internalDataTransfer() : 0; }
virtual EventInterface eventInterface() const;
Event* underlyingEvent() const { return m_underlyingEvent.get(); }
void setUnderlyingEvent(PassRefPtr<Event>);
- virtual Clipboard* clipboard() const { return 0; }
+ virtual DataTransfer* internalDataTransfer() const { return 0; }
bool isBeingDispatched() const { return eventPhase(); }
attribute boolean cancelBubble;
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
- [Custom] readonly attribute Clipboard clipboardData;
+ [Custom] readonly attribute DataTransfer clipboardData;
#endif
};
#include "config.h"
#include "MouseEvent.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "EventNames.h"
#include "Frame.h"
#include "FrameView.h"
int movementX, int movementY,
#endif
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard> clipboard, bool isSimulated)
+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
{
return adoptRef(new MouseEvent(type, canBubble, cancelable, timestamp, view,
detail, screenX, screenY, pageX, pageY,
#if ENABLE(POINTER_LOCK)
movementX, movementY,
#endif
- ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, clipboard, isSimulated));
+ ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated));
}
MouseEvent::MouseEvent()
#endif
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
unsigned short button, PassRefPtr<EventTarget> relatedTarget,
- PassRefPtr<Clipboard> clipboard, bool isSimulated)
+ PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
: MouseRelatedEvent(eventType, canBubble, cancelable, timestamp, view, detail, IntPoint(screenX, screenY),
IntPoint(pageX, pageY),
#if ENABLE(POINTER_LOCK)
, m_button(button == (unsigned short)-1 ? 0 : button)
, m_buttonDown(button != (unsigned short)-1)
, m_relatedTarget(relatedTarget)
- , m_clipboard(clipboard)
+ , m_dataTransfer(dataTransfer)
{
}
, m_button(initializer.button == (unsigned short)-1 ? 0 : initializer.button)
, m_buttonDown(initializer.button != (unsigned short)-1)
, m_relatedTarget(initializer.relatedTarget)
- , m_clipboard(0 /* clipboard */)
+ , m_dataTransfer(0 /* dataTransfer */)
{
initCoordinates(IntPoint(initializer.clientX, initializer.clientY));
}
initCoordinates(IntPoint(clientX, clientY));
// FIXME: m_isSimulated is not set to false here.
- // FIXME: m_clipboard is not set to 0 here.
+ // FIXME: m_dataTransfer is not set to 0 here.
}
EventInterface MouseEvent::eventInterface() const
namespace WebCore {
-class Clipboard;
+class DataTransfer;
class PlatformMouseEvent;
struct MouseEventInit : public UIEventInit {
int movementX, int movementY,
#endif
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard>, bool isSimulated = false);
+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated = false);
static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
virtual EventTarget* relatedTarget() const override final { return m_relatedTarget.get(); }
void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; }
- Clipboard* clipboard() const override { return m_clipboard.get(); }
Node* toElement() const;
Node* fromElement() const;
- Clipboard* dataTransfer() const { return isDragEvent() ? m_clipboard.get() : 0; }
+ // FIXME: These functions can be merged if m_dataTransfer is only initialized for drag events.
+ DataTransfer* dataTransfer() const { return isDragEvent() ? m_dataTransfer.get() : 0; }
+ virtual DataTransfer* internalDataTransfer() const override { return m_dataTransfer.get(); }
virtual EventInterface eventInterface() const override;
int movementX, int movementY,
#endif
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard>, bool isSimulated);
+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated);
MouseEvent(const AtomicString& type, const MouseEventInit&);
unsigned short m_button;
bool m_buttonDown;
RefPtr<EventTarget> m_relatedTarget;
- RefPtr<Clipboard> m_clipboard;
+ RefPtr<DataTransfer> m_dataTransfer;
};
class SimulatedMouseEvent : public MouseEvent {
readonly attribute Node toElement;
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
- readonly attribute Clipboard dataTransfer;
+ readonly attribute DataTransfer dataTransfer;
#endif
};
#include "config.h"
#include "WheelEvent.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "EventNames.h"
#include <wtf/MathExtras.h>
#include "CSSComputedStyleDeclaration.h"
#include "CSSPropertyNames.h"
#include "CachedResourceLoader.h"
-#include "Clipboard.h"
#include "ClipboardEvent.h"
#include "CompositionEvent.h"
#include "CreateLinkCommand.h"
+#include "DataTransfer.h"
#include "DeleteSelectionCommand.h"
#include "DictationAlternative.h"
#include "DictationCommand.h"
bool Editor::canDHTMLCut()
{
- return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, ClipboardNumb);
+ return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, DataTransferAccessPolicy::Numb);
}
bool Editor::canDHTMLCopy()
{
- return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, ClipboardNumb);
+ return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, DataTransferAccessPolicy::Numb);
}
bool Editor::canDHTMLPaste()
{
- return !dispatchCPPEvent(eventNames().beforepasteEvent, ClipboardNumb);
+ return !dispatchCPPEvent(eventNames().beforepasteEvent, DataTransferAccessPolicy::Numb);
}
bool Editor::canCut() const
if (m_frame.selection().selection().isInPasswordField())
return false;
- return !dispatchCPPEvent(eventNames().copyEvent, ClipboardWritable);
+ return !dispatchCPPEvent(eventNames().copyEvent, DataTransferAccessPolicy::Writable);
}
bool Editor::tryDHTMLCut()
if (m_frame.selection().selection().isInPasswordField())
return false;
- return !dispatchCPPEvent(eventNames().cutEvent, ClipboardWritable);
+ return !dispatchCPPEvent(eventNames().cutEvent, DataTransferAccessPolicy::Writable);
}
bool Editor::tryDHTMLPaste()
{
- return !dispatchCPPEvent(eventNames().pasteEvent, ClipboardReadable);
+ return !dispatchCPPEvent(eventNames().pasteEvent, DataTransferAccessPolicy::Readable);
}
bool Editor::shouldInsertText(const String& text, Range* range, EditorInsertAction action) const
// Returns whether caller should continue with "the default processing", which is the same as
// the event handler NOT setting the return value to false
-bool Editor::dispatchCPPEvent(const AtomicString& eventType, ClipboardAccessPolicy policy)
+bool Editor::dispatchCPPEvent(const AtomicString& eventType, DataTransferAccessPolicy policy)
{
Node* target = findEventTargetFromSelection();
if (!target)
return true;
- RefPtr<Clipboard> clipboard = Clipboard::createForCopyAndPaste(policy);
+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForCopyAndPaste(policy);
- RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, clipboard);
+ RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, dataTransfer);
target->dispatchEvent(event, IGNORE_EXCEPTION);
bool noDefaultProcessing = event->defaultPrevented();
- if (noDefaultProcessing && policy == ClipboardWritable) {
+ if (noDefaultProcessing && policy == DataTransferAccessPolicy::Writable) {
OwnPtr<Pasteboard> pasteboard = Pasteboard::createForCopyAndPaste();
pasteboard->clear();
- pasteboard->writePasteboard(clipboard->pasteboard());
+ pasteboard->writePasteboard(dataTransfer->pasteboard());
}
- // invalidate clipboard here for security
- clipboard->setAccessPolicy(ClipboardNumb);
+ // invalidate dataTransfer here for security
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb);
return !noDefaultProcessing;
}
}
if (enclosingTextFormControl(m_frame.selection().selection().start()))
- Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
+ Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForDataTransfer(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
else {
HTMLImageElement* imageElement = nullptr;
if (action == CopyAction)
writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
- Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForClipboard);
+ Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForDataTransfer);
#endif
}
}
return selectedText(TextIteratorDefaultBehavior);
}
-String Editor::selectedTextForClipboard() const
+String Editor::selectedTextForDataTransfer() const
{
if (m_frame.settings().selectionIncludesAltImageText())
return selectedText(TextIteratorEmitsImageAltText);
#ifndef Editor_h
#define Editor_h
-#include "ClipboardAccessPolicy.h"
#include "Color.h"
+#include "DataTransferAccessPolicy.h"
#include "DictationAlternative.h"
#include "DocumentMarker.h"
#include "EditAction.h"
class AlternativeTextController;
class ArchiveResource;
-class Clipboard;
+class DataTransfer;
class CompositeEditCommand;
class DeleteButtonController;
class EditCommand;
void removeUnchangeableStyles();
#endif
- bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);
+ bool dispatchCPPEvent(const AtomicString&, DataTransferAccessPolicy);
void applyStyle(StyleProperties*, EditAction = EditActionUnspecified);
void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
Node* findEventTargetFrom(const VisibleSelection& selection) const;
String selectedText() const;
- String selectedTextForClipboard() const;
+ String selectedTextForDataTransfer() const;
bool findString(const String&, FindOptions);
PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);
#include "Editor.h"
#include "CachedImage.h"
-#include "Clipboard.h"
#include "CSSComputedStyleDeclaration.h"
#include "CSSPrimitiveValueMappings.h"
#include "DOMRangeInternal.h"
+#include "DataTransfer.h"
#include "DocumentFragment.h"
#include "DocumentLoader.h"
#include "EditorClient.h"
String Editor::stringSelectionForPasteboardWithImageAltText()
{
- String text = selectedTextForClipboard();
+ String text = selectedTextForDataTransfer();
text.replace(noBreakSpace, ' ');
return text;
}
#import "Editor.h"
#import "CachedResourceLoader.h"
-#import "Clipboard.h"
#import "ColorMac.h"
#import "DOMRangeInternal.h"
+#import "DataTransfer.h"
#import "DocumentFragment.h"
#import "DocumentLoader.h"
#import "Editor.h"
Vector<String> types;
types.append(String(NSStringPboardType));
platformStrategies()->pasteboardStrategy()->setTypes(types, NSFindPboard);
- platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForClipboard()), NSStringPboardType, NSFindPboard);
+ platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForDataTransfer()), NSStringPboardType, NSFindPboard);
}
void Editor::readSelectionFromPasteboard(const String& pasteboardName)
pasteAsPlainTextWithPasteboard(pasteboard);
}
-// FIXME: Makes no sense that selectedTextForClipboard always includes alt text, but stringSelectionForPasteboard does not.
-// This was left in a bad state when selectedTextForClipboard was added. Need to look over clients and fix this.
+// FIXME: Makes no sense that selectedTextForDataTransfer always includes alt text, but stringSelectionForPasteboard does not.
+// This was left in a bad state when selectedTextForDataTransfer was added. Need to look over clients and fix this.
String Editor::stringSelectionForPasteboard()
{
if (!canCopy())
{
if (!canCopy())
return "";
- String text = selectedTextForClipboard();
+ String text = selectedTextForDataTransfer();
text.replace(noBreakSpace, ' ');
return text;
}
EmptyDragClient() { }
virtual ~EmptyDragClient() {}
virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) override { }
- virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) override { }
+ virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) override { }
virtual DragDestinationAction actionMaskForDrag(DragData&) override { return DragDestinationActionNone; }
virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint&) override { return DragSourceActionNone; }
- virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool) override { }
+ virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool) override { }
virtual void dragControllerDestroyed() override { }
};
#endif // ENABLE(DRAG_SUPPORT)
namespace WebCore {
-class Clipboard;
+class DataTransfer;
class DragData;
class Element;
class Frame;
virtual void dragControllerDestroyed() = 0;
virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) = 0;
- virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) = 0;
+ virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) = 0;
virtual DragDestinationAction actionMaskForDrag(DragData&) = 0;
virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint& rootViewPoint) = 0;
- virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard&, Frame&, bool linkDrag = false) = 0;
+ virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, DataTransfer&, Frame&, bool linkDrag = false) = 0;
virtual void dragEnded() { }
#if PLATFORM(COCOA)
#if ENABLE(DRAG_SUPPORT)
#include "CachedImage.h"
-#include "Clipboard.h"
-#include "ClipboardAccessPolicy.h"
#include "CachedResourceLoader.h"
+#include "DataTransfer.h"
#include "Document.h"
#include "DocumentFragment.h"
#include "DragActions.h"
void DragController::dragExited(DragData& dragData)
{
if (RefPtr<FrameView> v = m_page.mainFrame().view()) {
- ClipboardAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable;
- RefPtr<Clipboard> clipboard = Clipboard::createForDragAndDrop(policy, dragData);
- clipboard->setSourceOperation(dragData.draggingSourceOperationMask());
- m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), clipboard.get());
- clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security
+ DataTransferAccessPolicy policy = (!m_documentUnderMouse || m_documentUnderMouse->securityOrigin()->isLocal()) ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
+ dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
+ m_page.mainFrame().eventHandler().cancelDragAndDrop(createMouseEvent(dragData), dataTransfer.get());
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
}
mouseMovedIntoDocument(0);
if (m_fileInputElementUnderMouse)
bool preventedDefault = false;
if (mainFrame->view()) {
// Sending an event can result in the destruction of the view and part.
- RefPtr<Clipboard> clipboard = Clipboard::createForDragAndDrop(ClipboardReadable, dragData);
- clipboard->setSourceOperation(dragData.draggingSourceOperationMask());
- preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), clipboard.get());
- clipboard->setAccessPolicy(ClipboardNumb); // Invalidate clipboard here for security
+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(DataTransferAccessPolicy::Readable, dragData);
+ dataTransfer->setSourceOperation(dragData.draggingSourceOperationMask());
+ preventedDefault = mainFrame->eventHandler().performDragAndDrop(createMouseEvent(dragData), dataTransfer.get());
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
}
if (preventedDefault) {
m_documentUnderMouse = 0;
if (!viewProtector)
return false;
- ClipboardAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;
- RefPtr<Clipboard> clipboard = Clipboard::createForDragAndDrop(policy, dragData);
+ DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
DragOperation srcOpMask = dragData.draggingSourceOperationMask();
- clipboard->setSourceOperation(srcOpMask);
+ dataTransfer->setSourceOperation(srcOpMask);
PlatformMouseEvent event = createMouseEvent(dragData);
- if (!mainFrame->eventHandler().updateDragAndDrop(event, clipboard.get())) {
- clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security
+ if (!mainFrame->eventHandler().updateDragAndDrop(event, dataTransfer.get())) {
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
return false;
}
- operation = clipboard->destinationOperation();
- if (clipboard->dropEffectIsUninitialized())
+ operation = dataTransfer->destinationOperation();
+ if (dataTransfer->dropEffectIsUninitialized())
operation = defaultOperationForDrag(srcOpMask);
else if (!(srcOpMask & operation)) {
// The element picked an operation which is not supported by the source
operation = DragOperationNone;
}
- clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
return true;
}
IntPoint dragLoc(0, 0);
IntPoint dragImageOffset(0, 0);
- ASSERT(state.clipboard);
+ ASSERT(state.dataTransfer);
- Clipboard& clipboard = *state.clipboard;
+ DataTransfer& dataTransfer = *state.dataTransfer;
if (state.type == DragSourceActionDHTML)
- dragImage = clipboard.createDragImage(dragImageOffset);
+ dragImage = dataTransfer.createDragImage(dragImageOffset);
if (state.type == DragSourceActionSelection || !imageURL.isEmpty() || !linkURL.isEmpty())
// Selection, image, and link drags receive a default set of allowed drag operations that
// follows from:
Image* image = getImage(element);
if (state.type == DragSourceActionSelection) {
- if (!clipboard.pasteboard().hasData()) {
+ if (!dataTransfer.pasteboard().hasData()) {
// FIXME: This entire block is almost identical to the code in Editor::copy, and the code should be shared.
RefPtr<Range> selectionRange = src.selection().toNormalizedRange();
src.editor().willWriteSelectionToPasteboard(selectionRange.get());
if (enclosingTextFormControl(src.selection().selection().start()))
- clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);
+ dataTransfer.pasteboard().writePlainText(src.editor().selectedTextForDataTransfer(), Pasteboard::CannotSmartReplace);
else {
#if PLATFORM(COCOA) || PLATFORM(EFL)
- src.editor().writeSelectionToPasteboard(clipboard.pasteboard());
+ src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard());
#else
// FIXME: Convert all other platforms to match Mac and delete this.
- clipboard.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForClipboard);
+ dataTransfer.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForDataTransfer);
#endif
}
src.editor().didWriteSelectionToPasteboard();
}
- m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard);
+ m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, dataTransfer);
if (!dragImage) {
dragImage = dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha);
dragLoc = dragLocForSelectionDrag(src);
m_dragOffset = IntPoint(dragOrigin.x() - dragLoc.x(), dragOrigin.y() - dragLoc.y());
}
- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
} else if (!imageURL.isEmpty() && image && !image->isNull() && (m_dragSourceAction & DragSourceActionImage)) {
// We shouldn't be starting a drag for an image that can't provide an extension.
// This is an early detection for problems encountered later upon drop.
ASSERT(!image->filenameExtension().isEmpty());
- if (!clipboard.pasteboard().hasData()) {
+ if (!dataTransfer.pasteboard().hasData()) {
m_draggingImageURL = imageURL;
if (element.isContentRichlyEditable())
selectElement(element);
- declareAndWriteDragImage(clipboard, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString());
+ declareAndWriteDragImage(dataTransfer, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString());
}
- m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, clipboard);
+ m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, dataTransfer);
if (!dragImage) {
IntRect imageRect = hitTestResult.imageRect();
imageRect.setLocation(m_page.mainFrame().view()->rootViewToContents(src.view()->contentsToRootView(imageRect.location())));
- doImageDrag(element, dragOrigin, hitTestResult.imageRect(), clipboard, src, m_dragOffset);
+ doImageDrag(element, dragOrigin, hitTestResult.imageRect(), dataTransfer, src, m_dragOffset);
} else {
// DHTML defined drag image
- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
}
} else if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
- if (!clipboard.pasteboard().hasData())
- // Simplify whitespace so the title put on the clipboard resembles what the user sees
+ if (!dataTransfer.pasteboard().hasData()) {
+ // Simplify whitespace so the title put on the dataTransfer resembles what the user sees
// on the web page. This includes replacing newlines with spaces.
- src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), clipboard.pasteboard());
+ src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), dataTransfer.pasteboard());
+ }
const VisibleSelection& sourceSelection = src.selection().selection();
if (sourceSelection.isCaret() && sourceSelection.isContentEditable()) {
src.selection().setSelection(VisibleSelection::selectionFromContentsOfNode(node));
}
- m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);
+ m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, dataTransfer);
if (!dragImage) {
dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src.settings().fontRenderingMode());
IntSize size = dragImageSize(dragImage);
// Later code expects the drag image to be scaled by device's scale factor.
dragImage = scaleDragImage(dragImage, FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor()));
}
- doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, clipboard, src, true);
+ doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, dataTransfer, src, true);
} else if (state.type == DragSourceActionDHTML) {
if (dragImage) {
ASSERT(m_dragSourceAction & DragSourceActionDHTML);
- m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, clipboard);
- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
+ m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer);
+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
} else
startedDrag = false;
} else {
return startedDrag;
}
-void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, Clipboard& clipboard, Frame& frame, IntPoint& dragImageOffset)
+void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, DataTransfer& dataTransfer, Frame& frame, IntPoint& dragImageOffset)
{
IntPoint mouseDownPoint = dragOrigin;
DragImageRef dragImage = nullptr;
}
dragImageOffset = mouseDownPoint + scaledOrigin;
- doSystemDrag(dragImage, dragImageOffset, dragOrigin, clipboard, frame, false);
+ doSystemDrag(dragImage, dragImageOffset, dragOrigin, dataTransfer, frame, false);
deleteDragImage(dragImage);
}
-void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool forLink)
+void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool forLink)
{
m_didInitiateDrag = true;
m_dragInitiator = frame.document();
Ref<MainFrame> frameProtector(m_page.mainFrame());
RefPtr<FrameView> viewProtector = frameProtector->view();
m_client.startDrag(image, viewProtector->rootViewToContents(frame.view()->contentsToRootView(dragLoc)),
- viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), clipboard, frameProtector.get(), forLink);
+ viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), dataTransfer, frameProtector.get(), forLink);
// DragClient::startDrag can cause our Page to dispear, deallocating |this|.
if (!frameProtector->page())
return;
namespace WebCore {
- class Clipboard;
+ class DataTransfer;
class Document;
class DragClient;
class DragData;
void mouseMovedIntoDocument(Document*);
- void doImageDrag(Element&, const IntPoint&, const IntRect&, Clipboard&, Frame&, IntPoint&);
- void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool forLink);
+ void doImageDrag(Element&, const IntPoint&, const IntRect&, DataTransfer&, Frame&, IntPoint&);
+ void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool forLink);
void cleanupAfterSystemDrag();
- void declareAndWriteDragImage(Clipboard&, Element&, const URL&, const String& label);
+ void declareAndWriteDragImage(DataTransfer&, Element&, const URL&, const String& label);
Page& m_page;
DragClient& m_client;
#ifndef DragState_h
#define DragState_h
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "DragActions.h"
#include "Element.h"
RefPtr<Element> source; // Element that may be a drag source, for the current mouse gesture.
bool shouldDispatchEvents;
DragSourceAction type;
- RefPtr<Clipboard> clipboard; // Used on only the source side of dragging.
+ RefPtr<DataTransfer> dataTransfer; // Used on only the source side of dragging.
};
} // namespace WebCore
#if ENABLE(DRAG_SUPPORT)
-bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, Clipboard* clipboard)
+bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, DataTransfer* dataTransfer)
{
FrameView* view = m_frame.view();
event.movementDelta().x(), event.movementDelta().y(),
#endif
event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(),
- 0, 0, clipboard);
+ 0, 0, dataTransfer);
dragTarget.dispatchEvent(me.get(), IGNORE_EXCEPTION);
return me->defaultPrevented();
}
}
-static inline bool hasFileOfType(Clipboard& clipboard, const String& type)
+static inline bool hasFileOfType(DataTransfer& dataTransfer, const String& type)
{
- RefPtr<FileList> fileList = clipboard.files();
+ RefPtr<FileList> fileList = dataTransfer.files();
for (unsigned i = 0; i < fileList->length(); i++) {
if (equalIgnoringCase(fileList->item(i)->type(), type))
return true;
return false;
}
-static inline bool hasStringOfType(Clipboard& clipboard, const String& type)
+static inline bool hasStringOfType(DataTransfer& dataTransfer, const String& type)
{
- return !type.isNull() && clipboard.types().contains(type);
+ return !type.isNull() && dataTransfer.types().contains(type);
}
-static bool hasDropZoneType(Clipboard& clipboard, const String& keyword)
+static bool hasDropZoneType(DataTransfer& dataTransfer, const String& keyword)
{
if (keyword.startsWith("file:"))
- return hasFileOfType(clipboard, keyword.substring(5));
+ return hasFileOfType(dataTransfer, keyword.substring(5));
if (keyword.startsWith("string:"))
- return hasStringOfType(clipboard, keyword.substring(7));
+ return hasStringOfType(dataTransfer, keyword.substring(7));
return false;
}
-static bool findDropZone(Node* target, Clipboard* clipboard)
+static bool findDropZone(Node* target, DataTransfer* dataTransfer)
{
Element* element = target->isElementNode() ? toElement(target) : target->parentElement();
for (; element; element = element->parentElement()) {
if (dragOperation == DragOperationNone)
dragOperation = op;
} else
- matched = matched || hasDropZoneType(*clipboard, keywords[i].string());
+ matched = matched || hasDropZoneType(*dataTransfer, keywords[i].string());
if (matched && dragOperation != DragOperationNone)
break;
}
if (matched) {
- clipboard->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation));
+ dataTransfer->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation));
return true;
}
}
return false;
}
-bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
+bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
{
bool accept = false;
Frame* targetFrame;
if (targetIsFrame(newTarget.get(), targetFrame)) {
if (targetFrame)
- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
} else if (newTarget) {
// 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.
if (dragState().source && dragState().shouldDispatchEvents) {
// for now we don't care if event handler cancels default behavior, since there is none
dispatchDragSrcEvent(eventNames().dragEvent, event);
}
- accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, clipboard);
+ accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, dataTransfer);
if (!accept)
- accept = findDropZone(newTarget.get(), clipboard);
+ accept = findDropZone(newTarget.get(), dataTransfer);
}
if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
if (targetFrame)
- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
} else if (m_dragTarget)
- dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
+ dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer);
if (newTarget) {
// We do not explicitly call dispatchDragEvent here because it could ultimately result in the appearance that
Frame* targetFrame;
if (targetIsFrame(newTarget.get(), targetFrame)) {
if (targetFrame)
- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
} else if (newTarget) {
// Note, when dealing with sub-frames, we may need to fire only a dragover event as a drag event may have been fired earlier.
if (!m_shouldOnlyFireDragOverEvent && dragState().source && dragState().shouldDispatchEvents) {
// for now we don't care if event handler cancels default behavior, since there is none
dispatchDragSrcEvent(eventNames().dragEvent, event);
}
- accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, clipboard);
+ accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, dataTransfer);
if (!accept)
- accept = findDropZone(newTarget.get(), clipboard);
+ accept = findDropZone(newTarget.get(), dataTransfer);
m_shouldOnlyFireDragOverEvent = false;
}
}
return accept;
}
-void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
+void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
{
Frame* targetFrame;
if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
if (targetFrame)
- targetFrame->eventHandler().cancelDragAndDrop(event, clipboard);
+ targetFrame->eventHandler().cancelDragAndDrop(event, dataTransfer);
} else if (m_dragTarget) {
if (dragState().source && dragState().shouldDispatchEvents)
dispatchDragSrcEvent(eventNames().dragEvent, event);
- dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
+ dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer);
}
clearDragState();
}
-bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
+bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
{
Frame* targetFrame;
bool preventedDefault = false;
if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
if (targetFrame)
- preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, clipboard);
+ preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, dataTransfer);
} else if (m_dragTarget)
- preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, clipboard);
+ preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, dataTransfer);
clearDragState();
return preventedDefault;
}
return abs(delta.width()) >= threshold || abs(delta.height()) >= threshold;
}
-void EventHandler::freeClipboard()
+void EventHandler::freeDataTransfer()
{
- if (!dragState().clipboard)
+ if (!dragState().dataTransfer)
return;
- dragState().clipboard->setAccessPolicy(ClipboardNumb);
- dragState().clipboard = 0;
+ dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb);
+ dragState().dataTransfer = 0;
}
void EventHandler::dragSourceEndedAt(const PlatformMouseEvent& event, DragOperation operation)
prepareMouseEvent(request, event);
if (dragState().source && dragState().shouldDispatchEvents) {
- dragState().clipboard->setDestinationOperation(operation);
+ dragState().dataTransfer->setDestinationOperation(operation);
// For now we don't care if event handler cancels default behavior, since there is no default behavior.
dispatchDragSrcEvent(eventNames().dragendEvent, event);
}
- freeClipboard();
+ freeDataTransfer();
dragState().source = 0;
// In case the drag was ended due to an escape key press we need to ensure
// that consecutive mousemove events don't reinitiate the drag and drop.
// Return value indicates if we should continue "default processing", i.e., whether event handler canceled.
bool EventHandler::dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent& event)
{
- return !dispatchDragEvent(eventType, *dragState().source, event, dragState().clipboard.get());
+ return !dispatchDragEvent(eventType, *dragState().source, event, dragState().dataTransfer.get());
}
static bool ExactlyOneBitSet(DragSourceAction n)
DragOperation srcOp = DragOperationNone;
- // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old clipboard gets numbed.
- freeClipboard();
+ // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old dataTransfer gets numbed.
+ freeDataTransfer();
- dragState().clipboard = createDraggingClipboard();
+ dragState().dataTransfer = createDraggingDataTransfer();
if (dragState().shouldDispatchEvents) {
// Check to see if the is a DOM based drag. If it is, get the DOM specified drag image and offset.
// FIXME: This doesn't work correctly with transforms.
FloatPoint absPos = renderer->localToAbsolute();
IntSize delta = m_mouseDownPos - roundedIntPoint(absPos);
- dragState().clipboard->setDragImage(dragState().source.get(), delta.width(), delta.height());
+ dragState().dataTransfer->setDragImage(dragState().source.get(), delta.width(), delta.height());
} else {
// The renderer has disappeared, this can happen if the onStartDrag handler has hidden
// the element in some way. In this case we just kill the drag.
m_mouseDownMayStartDrag = dispatchDragSrcEvent(eventNames().dragstartEvent, m_mouseDown)
&& !m_frame.selection().selection().isInPasswordField();
- // Invalidate clipboard here against anymore pasteboard writing for security. The drag
+ // Invalidate dataTransfer here against anymore pasteboard writing for security. The drag
// image can still be changed as we drag, but not the pasteboard data.
- dragState().clipboard->setAccessPolicy(ClipboardImageWritable);
+ dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::ImageWritable);
if (m_mouseDownMayStartDrag) {
// Gather values from DHTML element, if it set any.
- srcOp = dragState().clipboard->sourceOperation();
+ srcOp = dragState().dataTransfer->sourceOperation();
// Yuck, a draggedImage:moveTo: message can be fired as a result of kicking off the
// drag with dragImage! Because of that dumb reentrancy, we may think we've not
// started the drag when that happens. So we have to assume it's started before we kick it off.
- dragState().clipboard->setDragHasStarted();
+ dragState().dataTransfer->setDragHasStarted();
}
}
cleanupDrag:
if (!m_mouseDownMayStartDrag) {
// Something failed to start the drag, clean up.
- freeClipboard();
+ freeDataTransfer();
dragState().source = 0;
}
namespace WebCore {
class AutoscrollController;
-class Clipboard;
class ContainerNode;
+class DataTransfer;
class Document;
class Element;
class Event;
void setCapturingMouseEventsElement(PassRefPtr<Element>); // A caller is responsible for resetting capturing element to 0.
#if ENABLE(DRAG_SUPPORT)
- bool updateDragAndDrop(const PlatformMouseEvent&, Clipboard*);
- void cancelDragAndDrop(const PlatformMouseEvent&, Clipboard*);
- bool performDragAndDrop(const PlatformMouseEvent&, Clipboard*);
+ bool updateDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
+ void cancelDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
+ bool performDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
void updateDragStateAfterEditDragIfNeeded(Element* rootEditableElement);
#endif
static DragState& dragState();
static const double TextDragDelay;
- PassRefPtr<Clipboard> createDraggingClipboard() const;
+ PassRefPtr<DataTransfer> createDraggingDataTransfer() const;
#endif // ENABLE(DRAG_SUPPORT)
bool eventActivatedView(const PlatformMouseEvent&) const;
bool dispatchMouseEvent(const AtomicString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder);
#if ENABLE(DRAG_SUPPORT)
- bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, Clipboard*);
+ bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer*);
- void freeClipboard();
+ void freeDataTransfer();
bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis);
#endif
#include "config.h"
#include "EventHandler.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "EventNames.h"
#include "FloatPoint.h"
#include "FocusController.h"
}
#if ENABLE(DRAG_SUPPORT)
-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
{
- return Clipboard::createForDragAndDrop();
+ return DataTransfer::createForDragAndDrop();
}
#endif
#include "config.h"
#include "DragController.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "DragData.h"
#include "Element.h"
#include "Frame.h"
{
}
-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
{
- clipboard.pasteboard().writeImage(element, url, label);
+ dataTransfer.pasteboard().writeImage(element, url, label);
}
}
#include "config.h"
#include "EventHandler.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "FloatPoint.h"
#include "FocusController.h"
#include "Frame.h"
}
#if ENABLE(DRAG_SUPPORT)
-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
{
- return Clipboard::createForDragAndDrop();
+ return DataTransfer::createForDragAndDrop();
}
#endif
#if ENABLE(DRAG_SUPPORT)
-#import "Clipboard.h"
+#import "DataTransfer.h"
#import "DragClient.h"
#import "DragData.h"
#import "Element.h"
dragEnded();
}
-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
{
- m_client.declareAndWriteDragImage(clipboard.pasteboard().name(), element, url, label, element.document().frame());
+ m_client.declareAndWriteDragImage(dataTransfer.pasteboard().name(), element, url, label, element.document().frame());
}
} // namespace WebCore
#include "BlockExceptions.h"
#include "Chrome.h"
#include "ChromeClient.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "DragController.h"
#include "EventNames.h"
#include "FocusController.h"
#if ENABLE(DRAG_SUPPORT)
-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
{
// Must be done before ondragstart adds types and data to the pboard,
// also done for security, as it erases data from the last drag.
OwnPtr<Pasteboard> pasteboard = Pasteboard::create(NSDragPboard);
pasteboard->clear();
- return Clipboard::createForDragAndDrop();
+ return DataTransfer::createForDragAndDrop();
}
#endif
#include "config.h"
#include "DragController.h"
-#include "Clipboard.h"
+#include "DataTransfer.h"
#include "DragData.h"
#include "Element.h"
#include "FrameSelection.h"
{
}
-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
{
- Pasteboard& pasteboard = clipboard.pasteboard();
+ Pasteboard& pasteboard = dataTransfer.pasteboard();
// FIXME: Do we really need this check?
if (!pasteboard.writableDataObject())
#include "EventHandler.h"
#include "COMPtr.h"
-#include "Clipboard.h"
#include "Cursor.h"
+#include "DataTransfer.h"
#include "FloatPoint.h"
#include "FocusController.h"
#include "FrameView.h"
}
#if ENABLE(DRAG_SUPPORT)
-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
{
#if OS(WINCE)
return 0;
#else
- return Clipboard::createForDragAndDrop();
+ return DataTransfer::createForDragAndDrop();
#endif
}
#endif
class Range;
class SharedBuffer;
-enum ShouldSerializeSelectedTextForClipboard { DefaultSelectedTextType, IncludeImageAltTextForClipboard };
+enum ShouldSerializeSelectedTextForDataTransfer { DefaultSelectedTextType, IncludeImageAltTextForDataTransfer };
// For writing to the pasteboard. Generally sorted with the richest formats on top.
#if PLATFORM(GTK) || PLATFORM(WIN)
PassRefPtr<DocumentFragment> documentFragment(Frame&, Range&, bool allowPlainText, bool& chosePlainText); // FIXME: Layering violation.
void writeImage(Element&, const URL&, const String& title); // FIXME: Layering violation.
- void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextForClipboard = DefaultSelectedTextType); // FIXME: Layering violation.
+ void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextForDataTransfer = DefaultSelectedTextType); // FIXME: Layering violation.
#endif
#if PLATFORM(GTK)
return false;
}
-void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
+void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer)
{
m_dataObject->clearAll();
- m_dataObject->setText(shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText());
+ m_dataObject->setText(shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText());
m_dataObject->setMarkup(createMarkup(selectedRange, 0, AnnotateForInterchange, false, ResolveNonLocalURLs));
if (m_gtkClipboard)
#import "Pasteboard.h"
#import "CachedImage.h"
-#import "Clipboard.h"
#import "DOMRangeInternal.h"
#import "Document.h"
#import "DocumentFragment.h"
if (medium.hGlobal && FAILED(m_writableDataObject->SetData(htmlFormat(), &medium, TRUE)))
::GlobalFree(medium.hGlobal);
- String str = frame.editor().selectedTextForClipboard();
+ String str = frame.editor().selectedTextForDataTransfer();
replaceNewlinesWithWindowsStyleNewlines(str);
replaceNBSPWithSpace(str);
medium.hGlobal = createGlobalData(str);
m_writableDataObject->SetData(smartPasteFormat(), &medium, TRUE);
}
-void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
+void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer)
{
clear();
}
// Put plain string on the pasteboard. CF_UNICODETEXT covers CF_TEXT as well
- String str = shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText();
+ String str = shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText();
replaceNewlinesWithWindowsStyleNewlines(str);
replaceNBSPWithSpace(str);
if (::OpenClipboard(m_owner)) {
+2014-04-08 Alexey Proskuryakov <ap@apple.com>
+
+ Rename Clipboard to DataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=131371
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPDFViewPlaceholder.mm:
+
2014-04-02 Benjamin Poulain <bpoulain@apple.com>
[iOS] Remove the legacy string drawing code
#import <JavaScriptCore/JSStringRef.h>
#import <JavaScriptCore/JSStringRefCF.h>
#import <UIKit/UIKit.h>
-#import <WebCore/Clipboard.h>
+#import <WebCore/DataTransfer.h>
#import <WebCore/EventHandler.h>
#import <WebCore/EventNames.h>
#import <WebCore/FormState.h>
+2014-04-08 Alexey Proskuryakov <ap@apple.com>
+
+ Rename Clipboard to DataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=131371
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebDragClient.h:
+ * WebCoreSupport/WebDragClient.mm:
+ (WebDragClient::willPerformDragSourceAction):
+ (WebDragClient::startDrag):
+ * WebView/WebPDFView.mm:
+
2014-04-08 Dan Bernstein <mitz@apple.com>
WebKit part of [Cocoa] Add WKFormDelegate
public:
WebDragClient(WebView*);
virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override;
- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&) override;
+ virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override;
virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override;
virtual void dragControllerDestroyed() override;
virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override;
- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag) override;
+ virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag) override;
virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
private:
WebView* m_webView;
#import "WebUIDelegate.h"
#import "WebUIDelegatePrivate.h"
#import "WebViewInternal.h"
-#import <WebCore/Clipboard.h>
+#import <WebCore/DataTransfer.h>
#import <WebCore/DragData.h>
#import <WebCore/Editor.h>
#import <WebCore/EditorClient.h>
return (DragSourceAction)[[m_webView _UIDelegateForwarder] webView:m_webView dragSourceActionMaskForPoint:viewPoint];
}
-void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore::Clipboard& clipboard)
+void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore::DataTransfer& dataTransfer)
{
- [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName:clipboard.pasteboard().name()]];
+ [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()]];
}
-void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool linkDrag)
+void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool linkDrag)
{
RetainPtr<WebHTMLView> htmlView = (WebHTMLView*)[[kit(&frame) frameView] documentView];
if (![htmlView.get() isKindOfClass:[WebHTMLView class]])
RetainPtr<WebHTMLView> topViewProtector = topHTMLView;
[topHTMLView _stopAutoscrollTimer];
- NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:clipboard.pasteboard().name()];
+ NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()];
NSImage *dragNSImage = dragImage.get();
WebHTMLView *sourceHTMLView = htmlView.get();
#import "WebView.h"
#import "WebViewInternal.h"
#import <PDFKit/PDFKit.h>
-#import <WebCore/Clipboard.h>
+#import <WebCore/DataTransfer.h>
#import <WebCore/EventNames.h>
#import <WebCore/FormState.h>
#import <WebCore/Frame.h>
#include "WebDropSource.h"
#include "WebKitGraphics.h"
#include "WebView.h"
-#include <WebCore/Clipboard.h>
+#include <WebCore/DataTransfer.h>
#include <WebCore/DragController.h>
#include <WebCore/DragData.h>
#include <WebCore/EventHandler.h>
return (DragSourceAction)action;
}
-void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, Clipboard& clipboard)
+void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, DataTransfer& dataTransfer)
{
COMPtr<IWebUIDelegate> uiDelegate;
if (!SUCCEEDED(m_webView->uiDelegate(&uiDelegate)))
return;
POINT point = intPoint;
- COMPtr<IDataObject> dataObject = clipboard.pasteboard().dataObject();
+ COMPtr<IDataObject> dataObject = dataTransfer.pasteboard().dataObject();
COMPtr<IDataObject> newDataObject;
HRESULT result = uiDelegate->willPerformDragSourceAction(m_webView, static_cast<WebDragSourceAction>(action), &point, dataObject.get(), &newDataObject);
if (result == S_OK && newDataObject != dataObject)
- const_cast<Pasteboard&>(clipboard.pasteboard()).setExternalDataObject(newDataObject.get());
+ const_cast<Pasteboard&>(dataTransfer.pasteboard()).setExternalDataObject(newDataObject.get());
}
-void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, Clipboard& clipboard, Frame& frame, bool isLink)
+void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, DataTransfer& dataTransfer, Frame& frame, bool isLink)
{
//FIXME: Allow UIDelegate to override behaviour <rdar://problem/5015953>
if (FAILED(WebDropSource::createInstance(m_webView, &source)))
return;
- dataObject = clipboard.pasteboard().dataObject();
+ dataObject = dataTransfer.pasteboard().dataObject();
if (source && (image || dataObject)) {
if (image) {
if(SUCCEEDED(CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER,
virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&);
virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&);
virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&);
- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&);
- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint&, const WebCore::IntPoint&, WebCore::Clipboard&, WebCore::Frame&, bool);
+ virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&);
+ virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint&, const WebCore::IntPoint&, WebCore::DataTransfer&, WebCore::Frame&, bool);
private:
WebView* m_webView;
tile controller visible rect updates always happens via compositing flush (we assert
for this in TileController::setVisibleRect).
+2014-04-08 Alexey Proskuryakov <ap@apple.com>
+
+ Rename Clipboard to DataTransfer
+ https://bugs.webkit.org/show_bug.cgi?id=131371
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebCoreSupport/WebDragClient.cpp:
+ (WebKit::WebDragClient::willPerformDragSourceAction):
+ (WebKit::WebDragClient::startDrag):
+ * WebProcess/WebCoreSupport/WebDragClient.h:
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::startDrag):
+
2014-04-08 Alexey Proskuryakov <ap@apple.com>
FlagsChanged events are not delivered to input methods when using async text input
m_page->mayPerformUploadDragDestinationAction(); // Upload can happen from a drop event handler, so we should prepare early.
}
-void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&)
+void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&)
{
}
}
#if !PLATFORM(COCOA) && !PLATFORM(GTK)
-void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)
+void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool)
{
}
#endif
private:
virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override;
- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&) override;
+ virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override;
virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override;
virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override;
- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag = false) override;
+ virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag = false) override;
#if PLATFORM(COCOA)
virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
return bitmap.release();
}
-void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, Clipboard&, Frame& frame, bool linkDrag)
+void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, DataTransfer&, Frame& frame, bool linkDrag)
{
IntSize bitmapSize([image size]);
RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
git://git.webkit.org / WebKit-https.git / commitdiff