<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166965] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166965">166965</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 15:06:16 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: 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):
Source/WebKit/ios: Rename Clipboard to DataTransfer
https://bugs.webkit.org/show_bug.cgi?id=131371
Reviewed by Anders Carlsson.
* WebView/WebPDFViewPlaceholder.mm:
Source/WebKit/mac: 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:
Source/WebKit2: Fix build.
Patch by Anders Carlsson <andersca@apple.com> on 2014-04-08
* WebKit2Prefix.h:
LayoutTests: 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomdomconstructorsexpectedtxt">trunk/LayoutTests/fast/dom/dom-constructors-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdomconstructorshtml">trunk/LayoutTests/fast/dom/dom-constructors.html</a></li>
<li><a href="#trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt">trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcescpp">trunk/Source/WebCore/DerivedSources.cpp</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp">trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSEventCustomcpp">trunk/Source/WebCore/bindings/js/JSEventCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClipboardEventcpp">trunk/Source/WebCore/dom/ClipboardEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClipboardEventh">trunk/Source/WebCore/dom/ClipboardEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomDOMAllInOnecpp">trunk/Source/WebCore/dom/DOMAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferItemListh">trunk/Source/WebCore/dom/DataTransferItemList.h</a></li>
<li><a href="#trunkSourceWebCoredomEventh">trunk/Source/WebCore/dom/Event.h</a></li>
<li><a href="#trunkSourceWebCoredomEventidl">trunk/Source/WebCore/dom/Event.idl</a></li>
<li><a href="#trunkSourceWebCoredomMouseEventcpp">trunk/Source/WebCore/dom/MouseEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomMouseEventh">trunk/Source/WebCore/dom/MouseEvent.h</a></li>
<li><a href="#trunkSourceWebCoredomMouseEventidl">trunk/Source/WebCore/dom/MouseEvent.idl</a></li>
<li><a href="#trunkSourceWebCoredomWheelEventcpp">trunk/Source/WebCore/dom/WheelEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorh">trunk/Source/WebCore/editing/Editor.h</a></li>
<li><a href="#trunkSourceWebCoreeditingiosEditorIOSmm">trunk/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCorepageDragClienth">trunk/Source/WebCore/page/DragClient.h</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDragControllerh">trunk/Source/WebCore/page/DragController.h</a></li>
<li><a href="#trunkSourceWebCorepageDragStateh">trunk/Source/WebCore/page/DragState.h</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepageeflEventHandlerEflcpp">trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp</a></li>
<li><a href="#trunkSourceWebCorepagegtkDragControllerGtkcpp">trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorepagegtkEventHandlerGtkcpp">trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorepagemacDragControllerMacmm">trunk/Source/WebCore/page/mac/DragControllerMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagewinDragControllerWincpp">trunk/Source/WebCore/page/win/DragControllerWin.cpp</a></li>
<li><a href="#trunkSourceWebCorepagewinEventHandlerWincpp">trunk/Source/WebCore/page/win/EventHandlerWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPasteboardMacmm">trunk/Source/WebCore/platform/mac/PasteboardMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPasteboardWincpp">trunk/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosWebViewWebPDFViewPlaceholdermm">trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebDragClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebDragClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPDFViewmm">trunk/Source/WebKit/mac/WebView/WebPDFView.mm</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebDragClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebDragClienth">trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDragClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDragClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSDataTransferCustomcpp">trunk/Source/WebCore/bindings/js/JSDataTransferCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransfercpp">trunk/Source/WebCore/dom/DataTransfer.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferh">trunk/Source/WebCore/dom/DataTransfer.h</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferidl">trunk/Source/WebCore/dom/DataTransfer.idl</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferAccessPolicyh">trunk/Source/WebCore/dom/DataTransferAccessPolicy.h</a></li>
<li><a href="#trunkSourceWebCoredomDataTransferMacmm">trunk/Source/WebCore/dom/DataTransferMac.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSClipboardCustomcpp">trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClipboardcpp">trunk/Source/WebCore/dom/Clipboard.cpp</a></li>
<li><a href="#trunkSourceWebCoredomClipboardh">trunk/Source/WebCore/dom/Clipboard.h</a></li>
<li><a href="#trunkSourceWebCoredomClipboardidl">trunk/Source/WebCore/dom/Clipboard.idl</a></li>
<li><a href="#trunkSourceWebCoredomClipboardAccessPolicyh">trunk/Source/WebCore/dom/ClipboardAccessPolicy.h</a></li>
<li><a href="#trunkSourceWebCoredomClipboardMacmm">trunk/Source/WebCore/dom/ClipboardMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/ChangeLog 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-08 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Unreviewed test gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdomconstructorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/dom-constructors-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/dom-constructors-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/fast/dom/dom-constructors-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> PASS TryAllocate('HTMLUListElement') is 'exception'
</span><span class="cx"> PASS TryAllocate('HTMLElement') is 'exception'
</span><span class="cx"> PASS TryAllocate('CanvasRenderingContext2D') is 'exception'
</span><del>-PASS TryAllocate('Clipboard') is 'exception'
</del><span class="cx"> PASS TryAllocate('Counter') is 'exception'
</span><span class="cx"> PASS TryAllocate('CSSCharsetRule') is 'exception'
</span><span class="cx"> PASS TryAllocate('CSSFontFaceRule') is 'exception'
</span><span class="lines">@@ -86,6 +85,7 @@
</span><span class="cx"> PASS TryAllocate('CSSStyleSheet') is 'exception'
</span><span class="cx"> PASS TryAllocate('CSSValue') is 'exception'
</span><span class="cx"> PASS TryAllocate('CSSValueList') is 'exception'
</span><ins>+PASS TryAllocate('DataTransfer') is 'exception'
</ins><span class="cx"> PASS TryAllocate('DOMImplementation') is 'exception'
</span><span class="cx"> PASS TryAllocate('HTMLCollection') is 'exception'
</span><span class="cx"> PASS TryAllocate('MediaList') is 'exception'
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdomconstructorshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/dom-constructors.html (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/dom-constructors.html 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/fast/dom/dom-constructors.html 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> 'HTMLUListElement',
</span><span class="cx"> 'HTMLElement',
</span><span class="cx"> 'CanvasRenderingContext2D',
</span><del>- 'Clipboard',
</del><span class="cx"> 'Counter',
</span><span class="cx"> 'CSSCharsetRule',
</span><span class="cx"> 'CSSFontFaceRule',
</span><span class="lines">@@ -96,6 +95,7 @@
</span><span class="cx"> 'CSSStyleSheet',
</span><span class="cx"> 'CSSValue',
</span><span class="cx"> 'CSSValueList',
</span><ins>+ 'DataTransfer',
</ins><span class="cx"> 'DOMImplementation',
</span><span class="cx"> 'HTMLCollection',
</span><span class="cx"> 'MediaList',
</span></span></pre></div>
<a id="trunkLayoutTestsjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -188,11 +188,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -263,6 +258,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformefljsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -188,11 +188,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -263,6 +258,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -193,11 +193,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -268,6 +263,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -188,11 +188,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -263,6 +258,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacmountainlionjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -188,11 +188,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -263,6 +258,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').value is DelayNode
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DelayNode').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinjsdomglobalconstructorsattributesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -133,11 +133,6 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'ClientRectList').configurable is true
</span><del>-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
</del><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').value is CloseEvent
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'CloseEvent').hasOwnProperty('set') is false
</span><span class="lines">@@ -203,6 +198,11 @@
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').hasOwnProperty('set') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').enumerable is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'DataCue').configurable is true
</span><ins>+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
</ins><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Document').value is Document
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Document').hasOwnProperty('get') is false
</span><span class="cx"> PASS Object.getOwnPropertyDescriptor(global, 'Document').hasOwnProperty('set') is false
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -344,7 +344,6 @@
</span><span class="cx"> dom/ChildNode.idl
</span><span class="cx"> dom/ClientRect.idl
</span><span class="cx"> dom/ClientRectList.idl
</span><del>- dom/Clipboard.idl
</del><span class="cx"> dom/Comment.idl
</span><span class="cx"> dom/CompositionEvent.idl
</span><span class="cx"> dom/CustomEvent.idl
</span><span class="lines">@@ -354,6 +353,7 @@
</span><span class="cx"> dom/DOMNamedFlowCollection.idl
</span><span class="cx"> dom/DOMStringList.idl
</span><span class="cx"> dom/DOMStringMap.idl
</span><ins>+ dom/DataTransfer.idl
</ins><span class="cx"> dom/DataTransferItem.idl
</span><span class="cx"> dom/DataTransferItemList.idl
</span><span class="cx"> dom/DeviceMotionEvent.idl
</span><span class="lines">@@ -1127,7 +1127,6 @@
</span><span class="cx"> dom/ClassNodeList.cpp
</span><span class="cx"> dom/ClientRect.cpp
</span><span class="cx"> dom/ClientRectList.cpp
</span><del>- dom/Clipboard.cpp
</del><span class="cx"> dom/ClipboardEvent.cpp
</span><span class="cx"> dom/CollectionIndexCache.cpp
</span><span class="cx"> dom/Comment.cpp
</span><span class="lines">@@ -1141,6 +1140,7 @@
</span><span class="cx"> dom/DOMImplementation.cpp
</span><span class="cx"> dom/DOMNamedFlowCollection.cpp
</span><span class="cx"> dom/DOMStringList.cpp
</span><ins>+ dom/DataTransfer.cpp
</ins><span class="cx"> dom/DataTransferItem.cpp
</span><span class="cx"> dom/DatasetDOMStringMap.cpp
</span><span class="cx"> dom/DecodedDataDocumentParser.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,3 +1,181 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-04-08 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed iOS build fix. Pass 0 instead of nil to the options parameter of addObserver:forKeyPath:options:context.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -112,6 +112,6 @@
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-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;
</del><ins>+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;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> 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;
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/DerivedSources.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> #include "JSCharacterData.cpp"
</span><span class="cx"> #include "JSClientRect.cpp"
</span><span class="cx"> #include "JSClientRectList.cpp"
</span><del>-#include "JSClipboard.cpp"
</del><span class="cx"> #include "JSCloseEvent.cpp"
</span><span class="cx"> #include "JSCommandLineAPIHost.cpp"
</span><span class="cx"> #include "JSComment.cpp"
</span><span class="lines">@@ -104,6 +103,7 @@
</span><span class="cx"> #include "JSDatabase.cpp"
</span><span class="cx"> #include "JSDatabaseCallback.cpp"
</span><span class="cx"> #include "JSDatabaseSync.cpp"
</span><ins>+#include "JSDataTransfer.cpp"
</ins><span class="cx"> #include "JSDataTransferItem.cpp"
</span><span class="cx"> #include "JSDataTransferItemList.cpp"
</span><span class="cx"> #include "JSDedicatedWorkerGlobalScope.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/DerivedSources.make 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -251,7 +251,6 @@
</span><span class="cx"> $(WebCore)/dom/ChildNode.idl \
</span><span class="cx"> $(WebCore)/dom/ClientRect.idl \
</span><span class="cx"> $(WebCore)/dom/ClientRectList.idl \
</span><del>- $(WebCore)/dom/Clipboard.idl \
</del><span class="cx"> $(WebCore)/dom/Comment.idl \
</span><span class="cx"> $(WebCore)/dom/CompositionEvent.idl \
</span><span class="cx"> $(WebCore)/dom/CustomEvent.idl \
</span><span class="lines">@@ -260,6 +259,7 @@
</span><span class="cx"> $(WebCore)/dom/DOMImplementation.idl \
</span><span class="cx"> $(WebCore)/dom/DOMStringList.idl \
</span><span class="cx"> $(WebCore)/dom/DOMStringMap.idl \
</span><ins>+ $(WebCore)/dom/DataTransfer.idl \
</ins><span class="cx"> $(WebCore)/dom/DataTransferItem.idl \
</span><span class="cx"> $(WebCore)/dom/DataTransferItemList.idl \
</span><span class="cx"> $(WebCore)/dom/DeviceMotionEvent.idl \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> __ZN7WebCore10JSDocument6s_infoE
</span><span class="cx"> __ZN7WebCore10LayoutRectC1ERKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringENS1_10PassRefPtrINS_9DOMWindowEEERKNS_18PlatformMouseEventEiNS5_INS_4NodeEEE
</span><del>-__ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_9ClipboardEEEb
</del><ins>+__ZN7WebCore10MouseEvent6createERKN3WTF12AtomicStringEbbdNS1_10PassRefPtrINS_9DOMWindowEEEiiiiibbbbtNS5_INS_11EventTargetEEENS5_INS_12DataTransferEEEb
</ins><span class="cx"> __ZN7WebCore10Pasteboard14writePlainTextERKN3WTF6StringENS0_18SmartReplaceOptionE
</span><span class="cx"> __ZN7WebCore10Pasteboard21createForCopyAndPasteEv
</span><span class="cx"> __ZN7WebCore10RenderView10compositorEv
</span><span class="lines">@@ -189,6 +189,7 @@
</span><span class="cx"> __ZN7WebCore11startOfLineERKNS_15VisiblePositionE
</span><span class="cx"> __ZN7WebCore11startOfWordERKNS_15VisiblePositionENS_9EWordSideE
</span><span class="cx"> __ZN7WebCore11writeToFileEiPKci
</span><ins>+__ZN7WebCore12DataTransferD1Ev
</ins><span class="cx"> __ZN7WebCore12EditingStyleD1Ev
</span><span class="cx"> __ZN7WebCore12EventHandler10mouseMovedERKNS_18PlatformMouseEventE
</span><span class="cx"> __ZN7WebCore12EventHandler14scrollOverflowENS_15ScrollDirectionENS_17ScrollGranularityEPNS_4NodeE
</span><span class="lines">@@ -1307,7 +1308,6 @@
</span><span class="cx"> __ZN7WebCore8toStringERKN3WTF6VectorINS_11ProxyServerELm0ENS0_15CrashOnOverflowEEE
</span><span class="cx"> __ZN7WebCore8toUInt16EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
</span><span class="cx"> __ZN7WebCore8toUInt64EPN3JSC9ExecStateENS0_7JSValueENS_30IntegerConversionConfigurationE
</span><del>-__ZN7WebCore9ClipboardD1Ev
</del><span class="cx"> __ZN7WebCore9DOMWindow30dispatchAllPendingUnloadEventsEv
</span><span class="cx"> __ZN7WebCore9DOMWindow36dispatchAllPendingBeforeUnloadEventsEv
</span><span class="cx"> __ZN7WebCore9FloatRect5scaleEff
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -995,20 +995,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <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>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -1345,6 +1331,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <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>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12377,7 +12377,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\Clipboard.cpp">
</del><ins>+ <ClCompile Include="..\dom\ClipboardEvent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12391,7 +12391,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\ClipboardEvent.cpp">
</del><ins>+ <ClCompile Include="..\dom\CollectionIndexCache.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12405,7 +12405,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\CollectionIndexCache.cpp">
</del><ins>+ <ClCompile Include="..\dom\Comment.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12419,7 +12419,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\Comment.cpp">
</del><ins>+ <ClCompile Include="..\dom\CompositionEvent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12433,7 +12433,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\CompositionEvent.cpp">
</del><ins>+ <ClCompile Include="..\dom\ContainerNode.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12447,7 +12447,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\ContainerNode.cpp">
</del><ins>+ <ClCompile Include="..\dom\ContextDestructionObserver.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12461,7 +12461,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\ContextDestructionObserver.cpp">
</del><ins>+ <ClCompile Include="..\dom\CustomEvent.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12475,7 +12475,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\CustomEvent.cpp">
</del><ins>+ <ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -12489,7 +12489,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
</del><ins>+ <ClCompile Include="..\dom\DataTransfer.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16054,7 +16054,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16068,7 +16068,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCSSRuleCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16082,7 +16082,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCSSRuleCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCSSRuleListCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16096,7 +16096,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCSSRuleListCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCSSStyleDeclarationCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16110,7 +16110,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCSSStyleDeclarationCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCSSValueCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16124,7 +16124,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCSSValueCustom.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16138,7 +16138,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCustomSQLStatementErrorCallback.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -16152,7 +16152,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
</del><ins>+ <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -18113,7 +18113,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCharacterData.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRect.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.h" />
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h" />
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSComment.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCompositionEvent.h" />
</span><span class="lines">@@ -18138,6 +18137,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCustomEvent.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabase.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h" />
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h" />
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItemList.h" />
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSDedicatedWorkerGlobalScope.h" />
</span><span class="lines">@@ -20232,8 +20232,6 @@
</span><span class="cx"> <ClInclude Include="..\dom\ClassNodeList.h" />
</span><span class="cx"> <ClInclude Include="..\dom\ClientRect.h" />
</span><span class="cx"> <ClInclude Include="..\dom\ClientRectList.h" />
</span><del>- <ClInclude Include="..\dom\Clipboard.h" />
- <ClInclude Include="..\dom\ClipboardAccessPolicy.h" />
</del><span class="cx"> <ClInclude Include="..\dom\ClipboardEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\CollectionIndexCache.h" />
</span><span class="cx"> <ClInclude Include="..\dom\Comment.h" />
</span><span class="lines">@@ -20243,6 +20241,8 @@
</span><span class="cx"> <ClInclude Include="..\dom\CrossThreadTask.h" />
</span><span class="cx"> <ClInclude Include="..\dom\CustomEvent.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DatasetDOMStringMap.h" />
</span><ins>+ <ClInclude Include="..\dom\DataTransfer.h" />
+ <ClInclude Include="..\dom\DataTransferAccessPolicy.h" />
</ins><span class="cx"> <ClInclude Include="..\dom\DataTransferItem.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DataTransferItemList.h" />
</span><span class="cx"> <ClInclude Include="..\dom\DecodedDataDocumentParser.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -3054,9 +3054,6 @@
</span><span class="cx"> <ClCompile Include="..\dom\ClientRectList.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\Clipboard.cpp">
- <Filter>dom</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\ClipboardEvent.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -3078,6 +3075,9 @@
</span><span class="cx"> <ClCompile Include="..\dom\DatasetDOMStringMap.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\DataTransfer.cpp">
+ <Filter>dom</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\dom\DataTransferItem.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4263,9 +4263,6 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\JSCDATASectionCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bindings\js\JSClipboardCustom.cpp">
- <Filter>bindings\js</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bindings\js\JSCommandLineAPIHostCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4287,6 +4284,9 @@
</span><span class="cx"> <ClCompile Include="..\bindings\js\JSCustomXPathNSResolver.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bindings\js\JSDataTransferCustom.cpp">
+ <Filter>bindings\js</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bindings\js\JSDedicatedWorkerGlobalScopeCustom.cpp">
</span><span class="cx"> <Filter>bindings\js</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -5224,9 +5224,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -5299,6 +5296,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -10003,12 +10003,6 @@
</span><span class="cx"> <ClInclude Include="..\dom\ClientRectList.h">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dom\Clipboard.h">
- <Filter>dom</Filter>
- </ClInclude>
- <ClInclude Include="..\dom\ClipboardAccessPolicy.h">
- <Filter>dom</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dom\ClipboardEvent.h">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -10033,6 +10027,12 @@
</span><span class="cx"> <ClInclude Include="..\dom\DatasetDOMStringMap.h">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\dom\DataTransfer.h">
+ <Filter>dom</Filter>
+ </ClInclude>
+ <ClInclude Include="..\dom\DataTransferAccessPolicy.h">
+ <Filter>dom</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\dom\DataTransferItem.h">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -13038,9 +13038,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClientRectList.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSClipboard.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCommandLineAPIHost.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -13113,6 +13110,9 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDatabaseSync.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransfer.h">
+ <Filter>DerivedSources</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItem.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1715,7 +1715,7 @@
</span><span class="cx"> 4B3480940EEF50D400AC1B41 /* ImageSourceCG.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */; };
</span><span class="cx"> 4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B6FA6F20C39E48C00087011 /* SmartReplace.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4B6FA6F70C39E4A100087011 /* SmartReplaceCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */; };
</span><del>- 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 4BAE95B10B2FA9CE00AED8A0 /* EditorDeleteAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4E1959210A39DABA00220FE5 /* MediaFeatureNames.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */; };
</span><span class="cx"> 4E1959220A39DABA00220FE5 /* MediaFeatureNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */; };
</span><span class="lines">@@ -2493,7 +2493,7 @@
</span><span class="cx"> 84D0C4061115F1EA0018AA34 /* AffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 84D0C4051115F1EA0018AA34 /* AffineTransform.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 85031B3C0A44EFC700F992E0 /* BeforeUnloadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */; };
</span><span class="cx"> 85031B3D0A44EFC700F992E0 /* BeforeUnloadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */; };
</span><del>- 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* Clipboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B280A44EFC700F992E0 /* DataTransfer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */; };
</span><span class="cx"> 85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */; };
</span><span class="cx"> 85031B410A44EFC700F992E0 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85031B2B0A44EFC700F992E0 /* Event.cpp */; };
</span><span class="lines">@@ -3274,7 +3274,7 @@
</span><span class="cx"> 93F19AE608245E59001E9ABC /* SSLKeyGeneratorMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84B2B24F056BF15F00D2B771 /* SSLKeyGeneratorMac.cpp */; };
</span><span class="cx"> 93F19AF808245E59001E9ABC /* Position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BE91FC8C06133666005E3790 /* Position.cpp */; };
</span><span class="cx"> 93F19AFD08245E59001E9ABC /* HTMLCanvasElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */; };
</span><del>- 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* ClipboardMac.mm */; };
</del><ins>+ 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D90660C0665D937006B6F1A /* DataTransferMac.mm */; };
</ins><span class="cx"> 93F19B0308245E59001E9ABC /* XSLStyleSheetLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24906D18A7E004A6FA3 /* XSLStyleSheetLibxslt.cpp */; };
</span><span class="cx"> 93F19B0408245E59001E9ABC /* XSLTProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24B06D18A7E004A6FA3 /* XSLTProcessor.cpp */; };
</span><span class="cx"> 93F19B0508245E59001E9ABC /* XSLTProcessorLibxslt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC06F24D06D18A7E004A6FA3 /* XSLTProcessorLibxslt.cpp */; };
</span><span class="lines">@@ -3777,7 +3777,7 @@
</span><span class="cx"> A77E1FEF14AACB6E005B7CB6 /* TreeScopeAdopter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A77E1FED14AACB6E005B7CB6 /* TreeScopeAdopter.cpp */; };
</span><span class="cx"> A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */ = {isa = PBXBuildFile; fileRef = A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */; };
</span><span class="cx"> A781C6A713828B5D0012A62A /* DocumentMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A781C6A613828B5D0012A62A /* DocumentMarker.cpp */; };
</span><del>- A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* Clipboard.cpp */; };
</del><ins>+ A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A784941A0B5FE507001E237A /* DataTransfer.cpp */; };
</ins><span class="cx"> A78E526F1346BD1700AD9C31 /* MeterShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */; };
</span><span class="cx"> A78E52701346BD1700AD9C31 /* MeterShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */; };
</span><span class="cx"> A78FE13B12366B1000ACE8D0 /* SpellChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */; };
</span><span class="lines">@@ -5195,9 +5195,9 @@
</span><span class="cx"> BCA257151293C010007A263D /* VerticalPositionCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA257141293C010007A263D /* VerticalPositionCache.h */; };
</span><span class="cx"> BCA2B061105047600043BD1C /* UserScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B0601050475F0043BD1C /* UserScript.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCA2B08B10505BCD0043BD1C /* UserScriptTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA2B08A10505BCD0043BD1C /* UserScriptTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 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 */; };
</del><ins>+ 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 */; };
</ins><span class="cx"> BCA846D60DC67A350026C309 /* RenderReplica.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCA846D40DC67A350026C309 /* RenderReplica.cpp */; };
</span><span class="cx"> BCA846D70DC67A350026C309 /* RenderReplica.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA846D50DC67A350026C309 /* RenderReplica.h */; };
</span><span class="cx"> BCA8C81E11E3D36900812FB7 /* BackForwardController.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA8C81C11E3D36900812FB7 /* BackForwardController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7959,7 +7959,7 @@
</span><span class="cx"> 2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCrossfadeValue.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
</span><del>- 2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</del><ins>+ 2D90660C0665D937006B6F1A /* DataTransferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DataTransferMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
</ins><span class="cx"> 2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSecurityPolicy.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSecurityPolicy.h; sourceTree = "<group>"; };
</span><span class="cx"> 2D9A247015B9C29500D34527 /* DOMDOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMSecurityPolicy.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -8686,7 +8686,7 @@
</span><span class="cx"> 4B3480920EEF50D400AC1B41 /* ImageSourceCG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSourceCG.h; sourceTree = "<group>"; };
</span><span class="cx"> 4B6FA6F20C39E48C00087011 /* SmartReplace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartReplace.h; sourceTree = "<group>"; };
</span><span class="cx"> 4B6FA6F60C39E4A100087011 /* SmartReplaceCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartReplaceCF.cpp; sourceTree = "<group>"; };
</span><del>- 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardAccessPolicy.h; sourceTree = "<group>"; };
</del><ins>+ 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransferAccessPolicy.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4BAE95B00B2FA9CE00AED8A0 /* EditorDeleteAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditorDeleteAction.h; sourceTree = "<group>"; };
</span><span class="cx"> 4E19591F0A39DABA00220FE5 /* MediaFeatureNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MediaFeatureNames.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4E1959200A39DABA00220FE5 /* MediaFeatureNames.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaFeatureNames.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -9538,7 +9538,7 @@
</span><span class="cx"> 84D0C4051115F1EA0018AA34 /* AffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AffineTransform.h; path = transforms/AffineTransform.h; sourceTree = "<group>"; };
</span><span class="cx"> 85031B260A44EFC700F992E0 /* BeforeUnloadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BeforeUnloadEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 85031B270A44EFC700F992E0 /* BeforeUnloadEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BeforeUnloadEvent.h; sourceTree = "<group>"; };
</span><del>- 85031B280A44EFC700F992E0 /* Clipboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Clipboard.h; sourceTree = "<group>"; };
</del><ins>+ 85031B280A44EFC700F992E0 /* DataTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DataTransfer.h; sourceTree = "<group>"; };
</ins><span class="cx"> 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ClipboardEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ClipboardEvent.h; sourceTree = "<group>"; };
</span><span class="cx"> 85031B2B0A44EFC700F992E0 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -10835,7 +10835,7 @@
</span><span class="cx"> A77E1FED14AACB6E005B7CB6 /* TreeScopeAdopter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TreeScopeAdopter.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A77E1FEE14AACB6E005B7CB6 /* TreeScopeAdopter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeScopeAdopter.h; sourceTree = "<group>"; };
</span><span class="cx"> A781C6A613828B5D0012A62A /* DocumentMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentMarker.cpp; sourceTree = "<group>"; };
</span><del>- A784941A0B5FE507001E237A /* Clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Clipboard.cpp; sourceTree = "<group>"; };
</del><ins>+ A784941A0B5FE507001E237A /* DataTransfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DataTransfer.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> A78E526D1346BD1700AD9C31 /* MeterShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MeterShadowElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> A78E526E1346BD1700AD9C31 /* MeterShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MeterShadowElement.h; sourceTree = "<group>"; };
</span><span class="cx"> A78FE13912366B1000ACE8D0 /* SpellChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SpellChecker.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12477,10 +12477,10 @@
</span><span class="cx"> BCA2B08A10505BCD0043BD1C /* UserScriptTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserScriptTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScheduledAction.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCA378BB0D15F64200B793D6 /* ScheduledAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScheduledAction.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><ins>+ 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>"; };
</ins><span class="cx"> BCA846D40DC67A350026C309 /* RenderReplica.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderReplica.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCA846D50DC67A350026C309 /* RenderReplica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderReplica.h; sourceTree = "<group>"; };
</span><span class="cx"> BCA8C81C11E3D36900812FB7 /* BackForwardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BackForwardController.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -18942,12 +18942,12 @@
</span><span class="cx"> 93F9B79F0BA6032600854064 /* JSCDATASection.h */,
</span><span class="cx"> 65DF31DF09D1CC60000BE325 /* JSCharacterData.cpp */,
</span><span class="cx"> 65DF31E009D1CC60000BE325 /* JSCharacterData.h */,
</span><del>- BCA83E4D0D7CE1E9003421A8 /* JSClipboard.cpp */,
- BCA83E4E0D7CE1E9003421A8 /* JSClipboard.h */,
</del><span class="cx"> 93F9B6DE0BA0FB7200854064 /* JSComment.cpp */,
</span><span class="cx"> 93F9B6DF0BA0FB7200854064 /* JSComment.h */,
</span><span class="cx"> FE6FD48B0F676E9300092873 /* JSCoordinates.cpp */,
</span><span class="cx"> FE6FD48C0F676E9300092873 /* JSCoordinates.h */,
</span><ins>+ BCA83E4D0D7CE1E9003421A8 /* JSDataTransfer.cpp */,
+ BCA83E4E0D7CE1E9003421A8 /* JSDataTransfer.h */,
</ins><span class="cx"> 31FB1A63120A5D3F00DC02A0 /* JSDeviceMotionEvent.cpp */,
</span><span class="cx"> 31FB1A64120A5D3F00DC02A0 /* JSDeviceMotionEvent.h */,
</span><span class="cx"> 59A86005119DAF7F00DEF1EF /* JSDeviceOrientationEvent.cpp */,
</span><span class="lines">@@ -20519,7 +20519,6 @@
</span><span class="cx"> 49EED14B1051971900099FAB /* JSCanvasRenderingContext2DCustom.cpp */,
</span><span class="cx"> 49EED14D1051971A00099FAB /* JSCanvasRenderingContextCustom.cpp */,
</span><span class="cx"> 93BA59B10F2AA5FE008E8E99 /* JSCDATASectionCustom.cpp */,
</span><del>- BCA83E510D7CE205003421A8 /* JSClipboardCustom.cpp */,
</del><span class="cx"> A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */,
</span><span class="cx"> 209B456A16796A7E00E54E4E /* JSCryptoCustom.cpp */,
</span><span class="cx"> E157A8E618184C67009F821D /* JSCryptoKeyCustom.cpp */,
</span><span class="lines">@@ -20530,6 +20529,7 @@
</span><span class="cx"> BC5825F20C0B89380053F1B5 /* JSCSSStyleDeclarationCustom.cpp */,
</span><span class="cx"> AD726FEA16D9F40B003A4E6D /* JSCSSStyleDeclarationCustom.h */,
</span><span class="cx"> BC20FB7E0C0E8E6C00D1447F /* JSCSSValueCustom.cpp */,
</span><ins>+ BCA83E510D7CE205003421A8 /* JSDataTransferCustom.cpp */,
</ins><span class="cx"> 4162A453101145E300DFF3ED /* JSDedicatedWorkerGlobalScopeCustom.cpp */,
</span><span class="cx"> 31FB1A6B120A5D6900DC02A0 /* JSDeviceMotionEventCustom.cpp */,
</span><span class="cx"> 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */,
</span><span class="lines">@@ -22138,13 +22138,8 @@
</span><span class="cx"> BCC0657A0F3CE1B700CD2D87 /* ClientRectList.cpp */,
</span><span class="cx"> BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */,
</span><span class="cx"> BCC0657C0F3CE1B700CD2D87 /* ClientRectList.idl */,
</span><del>- A784941A0B5FE507001E237A /* Clipboard.cpp */,
- 85031B280A44EFC700F992E0 /* Clipboard.h */,
- BCA83E360D7CDC4E003421A8 /* Clipboard.idl */,
- 4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */,
</del><span class="cx"> 85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */,
</span><span class="cx"> 85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */,
</span><del>- 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
</del><span class="cx"> E425A49918292B840020CFCF /* CollectionIndexCache.h */,
</span><span class="cx"> 9BD8A95918BEFC7600987E9A /* CollectionIndexCache.cpp */,
</span><span class="cx"> 6550B697099DF0270090D781 /* Comment.cpp */,
</span><span class="lines">@@ -22163,6 +22158,11 @@
</span><span class="cx"> 62CD32561157E57C0063B0A7 /* CustomEvent.cpp */,
</span><span class="cx"> 62CD32571157E57C0063B0A7 /* CustomEvent.h */,
</span><span class="cx"> 62CD32581157E57C0063B0A7 /* CustomEvent.idl */,
</span><ins>+ A784941A0B5FE507001E237A /* DataTransfer.cpp */,
+ 85031B280A44EFC700F992E0 /* DataTransfer.h */,
+ BCA83E360D7CDC4E003421A8 /* DataTransfer.idl */,
+ 2D90660C0665D937006B6F1A /* DataTransferMac.mm */,
+ 4B8AF4A90B1CE02B00687690 /* DataTransferAccessPolicy.h */,
</ins><span class="cx"> BC64641B11D7F416006455B0 /* DatasetDOMStringMap.cpp */,
</span><span class="cx"> BC64641A11D7F416006455B0 /* DatasetDOMStringMap.h */,
</span><span class="cx"> 81AC5997131636E60009A7E0 /* DataTransferItem.h */,
</span><span class="lines">@@ -23121,8 +23121,8 @@
</span><span class="cx"> BC904B770D10998F00680D32 /* ClassNodeList.h in Headers */,
</span><span class="cx"> BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */,
</span><span class="cx"> BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */,
</span><del>- 85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */,
- 4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
</del><ins>+ 85031B3E0A44EFC700F992E0 /* DataTransfer.h in Headers */,
+ 4B8AF4AA0B1CE02B00687690 /* DataTransferAccessPolicy.h in Headers */,
</ins><span class="cx"> 85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
</span><span class="cx"> FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
</span><span class="cx"> 97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
</span><span class="lines">@@ -24272,7 +24272,7 @@
</span><span class="cx"> 65DF31F409D1CC60000BE325 /* JSCharacterData.h in Headers */,
</span><span class="cx"> BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */,
</span><span class="cx"> BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */,
</span><del>- BCA83E500D7CE1E9003421A8 /* JSClipboard.h in Headers */,
</del><ins>+ BCA83E500D7CE1E9003421A8 /* JSDataTransfer.h in Headers */,
</ins><span class="cx"> 51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */,
</span><span class="cx"> A584FE3C1864E2D800843B10 /* JSCommandLineAPIHost.h in Headers */,
</span><span class="cx"> 93F9B6E10BA0FB7200854064 /* JSComment.h in Headers */,
</span><span class="lines">@@ -26783,9 +26783,9 @@
</span><span class="cx"> BC904B760D10998F00680D32 /* ClassNodeList.cpp in Sources */,
</span><span class="cx"> BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
</span><span class="cx"> BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
</span><del>- A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */,
</del><ins>+ A784941B0B5FE507001E237A /* DataTransfer.cpp in Sources */,
</ins><span class="cx"> 85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
</span><del>- 93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
</del><ins>+ 93F19AFF08245E59001E9ABC /* DataTransferMac.mm in Sources */,
</ins><span class="cx"> CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
</span><span class="cx"> CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
</span><span class="cx"> B27535660B053814002CE64F /* Color.cpp in Sources */,
</span><span class="lines">@@ -27674,8 +27674,8 @@
</span><span class="cx"> 65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */,
</span><span class="cx"> BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */,
</span><span class="cx"> BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */,
</span><del>- BCA83E4F0D7CE1E9003421A8 /* JSClipboard.cpp in Sources */,
- BCA83E520D7CE205003421A8 /* JSClipboardCustom.cpp in Sources */,
</del><ins>+ BCA83E4F0D7CE1E9003421A8 /* JSDataTransfer.cpp in Sources */,
+ BCA83E520D7CE205003421A8 /* JSDataTransferCustom.cpp in Sources */,
</ins><span class="cx"> 51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */,
</span><span class="cx"> A584FE3B1864E2D800843B10 /* JSCommandLineAPIHost.cpp in Sources */,
</span><span class="cx"> A584FE381864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSBindingsAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "JSCallbackData.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContext2DCustom.cpp"
</span><span class="cx"> #include "JSCanvasRenderingContextCustom.cpp"
</span><del>-#include "JSClipboardCustom.cpp"
</del><span class="cx"> #include "JSCommandLineAPIHostCustom.cpp"
</span><span class="cx"> #include "JSCryptoCustom.cpp"
</span><span class="cx"> #include "JSCustomSQLStatementErrorCallback.cpp"
</span><span class="lines">@@ -62,6 +61,7 @@
</span><span class="cx"> #include "JSDOMWindowCustom.cpp"
</span><span class="cx"> #include "JSDOMWindowShell.cpp"
</span><span class="cx"> #include "JSDOMWrapper.cpp"
</span><ins>+#include "JSDataTransferCustom.cpp"
</ins><span class="cx"> #include "JSDedicatedWorkerGlobalScopeCustom.cpp"
</span><span class="cx"> #include "JSDeviceOrientationEventCustom.cpp"
</span><span class="cx"> #include "JSDictionary.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSClipboardCustomcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "JSClipboard.h"
-
-#include "Clipboard.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSClipboard::types(ExecState* exec) const
-{
- Vector<String> types = impl().types();
- return types.isEmpty() ? jsNull() : jsArray(exec, globalObject(), types);
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDataTransferCustomcppfromrev166873trunkSourceWebCorebindingsjsJSClipboardCustomcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/bindings/js/JSDataTransferCustom.cpp (from rev 166873, trunk/Source/WebCore/bindings/js/JSClipboardCustom.cpp) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDataTransferCustom.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDataTransferCustom.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSDataTransfer.h"
+
+#include "DataTransfer.h"
+
+using namespace JSC;
+
+namespace WebCore {
+
+JSValue JSDataTransfer::types(ExecState* exec) const
+{
+ Vector<String> types = impl().types();
+ return types.isEmpty() ? jsNull() : jsArray(exec, globalObject(), types);
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventCustom.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventCustom.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/bindings/js/JSEventCustom.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -29,12 +29,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSEvent.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventHeaders.h"
</span><span class="cx"> #include "EventInterfaces.h"
</span><span class="cx"> #include "EventNames.h"
</span><del>-#include "JSClipboard.h"
</del><ins>+#include "JSDataTransfer.h"
</ins><span class="cx"> #include <runtime/JSLock.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/Clipboard.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Clipboard.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/Clipboard.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,422 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Clipboard.h"
-
-#include "CachedImage.h"
-#include "CachedImageClient.h"
-#include "DragData.h"
-#include "Editor.h"
-#include "FileList.h"
-#include "Frame.h"
-#include "FrameLoader.h"
-#include "HTMLImageElement.h"
-#include "Image.h"
-#include "Pasteboard.h"
-
-namespace WebCore {
-
-#if ENABLE(DRAG_SUPPORT)
-
-class DragImageLoader final : private CachedImageClient {
- WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
-public:
- explicit DragImageLoader(Clipboard*);
- void startLoading(CachedResourceHandle<CachedImage>&);
- void stopLoading(CachedResourceHandle<CachedImage>&);
-
-private:
- virtual void imageChanged(CachedImage*, const IntRect*) override;
- Clipboard* m_clipboard;
-};
-
-#endif
-
-Clipboard::Clipboard(ClipboardAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, ClipboardType type, bool forFileDrag)
- : m_policy(policy)
- , m_pasteboard(pasteboard)
-#if ENABLE(DRAG_SUPPORT)
- , m_forDrag(type != CopyAndPaste)
- , m_forFileDrag(forFileDrag)
- , m_dropEffect(ASCIILiteral("uninitialized"))
- , m_effectAllowed(ASCIILiteral("uninitialized"))
- , m_shouldUpdateDragImage(false)
-#endif
-{
-#if !ENABLE(DRAG_SUPPORT)
- ASSERT_UNUSED(type, type == CopyAndPaste);
- ASSERT_UNUSED(forFileDrag, !forFileDrag);
-#endif
-}
-
-PassRefPtr<Clipboard> Clipboard::createForCopyAndPaste(ClipboardAccessPolicy policy)
-{
- return adoptRef(new Clipboard(policy, policy == ClipboardWritable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste()));
-}
-
-Clipboard::~Clipboard()
-{
-#if ENABLE(DRAG_SUPPORT)
- if (m_dragImageLoader && m_dragImage)
- m_dragImageLoader->stopLoading(m_dragImage);
-#endif
-}
-
-void Clipboard::setAccessPolicy(ClipboardAccessPolicy policy)
-{
- // Once the clipboard goes numb, it can never go back.
- ASSERT(m_policy != ClipboardNumb || policy == ClipboardNumb);
- m_policy = policy;
-}
-
-bool Clipboard::canReadTypes() const
-{
- return m_policy == ClipboardReadable || m_policy == ClipboardTypesReadable || m_policy == ClipboardWritable;
-}
-
-bool Clipboard::canReadData() const
-{
- return m_policy == ClipboardReadable || m_policy == ClipboardWritable;
-}
-
-bool Clipboard::canWriteData() const
-{
- return m_policy == ClipboardWritable;
-}
-
-void Clipboard::clearData(const String& type)
-{
- if (!canWriteData())
- return;
-
- m_pasteboard->clear(type);
-}
-
-void Clipboard::clearData()
-{
- if (!canWriteData())
- return;
-
- m_pasteboard->clear();
-}
-
-String Clipboard::getData(const String& type) const
-{
- if (!canReadData())
- return String();
-
-#if ENABLE(DRAG_SUPPORT)
- if (m_forFileDrag)
- return String();
-#endif
-
- return m_pasteboard->readString(type);
-}
-
-bool Clipboard::setData(const String& type, const String& data)
-{
- if (!canWriteData())
- return false;
-
-#if ENABLE(DRAG_SUPPORT)
- if (m_forFileDrag)
- return false;
-#endif
-
- return m_pasteboard->writeString(type, data);
-}
-
-Vector<String> Clipboard::types() const
-{
- if (!canReadTypes())
- return Vector<String>();
-
- return m_pasteboard->types();
-}
-
-PassRefPtr<FileList> Clipboard::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.
-
- if (!canReadData())
- return FileList::create();
-
-#if ENABLE(DRAG_SUPPORT)
- if (m_forDrag && !m_forFileDrag)
- return FileList::create();
-#endif
-
- Vector<String> filenames = m_pasteboard->readFilenames();
- RefPtr<FileList> fileList = FileList::create();
- for (size_t i = 0; i < filenames.size(); ++i)
- fileList->append(File::create(filenames[i], File::AllContentTypes));
- return fileList.release();
-}
-
-#if !ENABLE(DRAG_SUPPORT)
-
-String Clipboard::dropEffect() const
-{
- return ASCIILiteral("none");
-}
-
-void Clipboard::setDropEffect(const String&)
-{
-}
-
-String Clipboard::effectAllowed() const
-{
- return ASCIILiteral("uninitialized");
-}
-
-void Clipboard::setEffectAllowed(const String&)
-{
-}
-
-void Clipboard::setDragImage(Element*, int, int)
-{
-}
-
-#else
-
-PassRefPtr<Clipboard> Clipboard::createForDragAndDrop()
-{
- return adoptRef(new Clipboard(ClipboardWritable, Pasteboard::createForDragAndDrop(), DragAndDrop));
-}
-
-PassRefPtr<Clipboard> Clipboard::createForDragAndDrop(ClipboardAccessPolicy policy, const DragData& dragData)
-{
- return adoptRef(new Clipboard(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
-}
-
-bool Clipboard::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);
-}
-
-void Clipboard::setDragImage(Element* element, int x, int y)
-{
- if (!canSetDragImage())
- return;
-
- CachedImage* image;
- if (element && isHTMLImageElement(element) && !element->inDocument())
- image = toHTMLImageElement(element)->cachedImage();
- else
- image = 0;
-
- m_dragLocation = IntPoint(x, y);
-
- if (m_dragImageLoader && m_dragImage)
- m_dragImageLoader->stopLoading(m_dragImage);
- m_dragImage = image;
- if (m_dragImage) {
- if (!m_dragImageLoader)
- m_dragImageLoader = std::make_unique<DragImageLoader>(this);
- m_dragImageLoader->startLoading(m_dragImage);
- }
-
- m_dragImageElement = image ? 0 : element;
-
- updateDragImage();
-}
-
-void Clipboard::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 (!m_shouldUpdateDragImage)
- return;
-
- IntPoint computedHotSpot;
- DragImageRef computedImage = createDragImage(computedHotSpot);
- if (!computedImage)
- return;
-
- m_pasteboard->setDragImage(computedImage, computedHotSpot);
-}
-
-#if !PLATFORM(COCOA)
-
-DragImageRef Clipboard::createDragImage(IntPoint& location) const
-{
- location = m_dragLocation;
-
- if (m_dragImage)
- return createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
-
- if (m_dragImageElement) {
- if (Frame* frame = m_dragImageElement->document().frame())
- return createDragImageForNode(*frame, *m_dragImageElement);
- }
-
- // We do not have enough information to create a drag image, use the default icon.
- return nullptr;
-}
-
-#endif
-
-DragImageLoader::DragImageLoader(Clipboard* clipboard)
- : m_clipboard(clipboard)
-{
-}
-
-void DragImageLoader::startLoading(CachedResourceHandle<WebCore::CachedImage>& image)
-{
- // FIXME: Does this really trigger a load? Does it need to?
- image->addClient(this);
-}
-
-void DragImageLoader::stopLoading(CachedResourceHandle<WebCore::CachedImage>& image)
-{
- image->removeClient(this);
-}
-
-void DragImageLoader::imageChanged(CachedImage*, const IntRect*)
-{
- m_clipboard->updateDragImage();
-}
-
-static DragOperation dragOpFromIEOp(const String& operation)
-{
- if (operation == "uninitialized")
- return DragOperationEvery;
- if (operation == "none")
- return DragOperationNone;
- if (operation == "copy")
- return DragOperationCopy;
- if (operation == "link")
- return DragOperationLink;
- if (operation == "move")
- return (DragOperation)(DragOperationGeneric | DragOperationMove);
- if (operation == "copyLink")
- return (DragOperation)(DragOperationCopy | DragOperationLink);
- if (operation == "copyMove")
- return (DragOperation)(DragOperationCopy | DragOperationGeneric | DragOperationMove);
- if (operation == "linkMove")
- return (DragOperation)(DragOperationLink | DragOperationGeneric | DragOperationMove);
- if (operation == "all")
- return DragOperationEvery;
- return DragOperationPrivate; // really a marker for "no conversion"
-}
-
-static const char* IEOpFromDragOp(DragOperation operation)
-{
- bool isGenericMove = operation & (DragOperationGeneric | DragOperationMove);
-
- if ((isGenericMove && (operation & DragOperationCopy) && (operation & DragOperationLink)) || operation == DragOperationEvery)
- return "all";
- if (isGenericMove && (operation & DragOperationCopy))
- return "copyMove";
- if (isGenericMove && (operation & DragOperationLink))
- return "linkMove";
- if ((operation & DragOperationCopy) && (operation & DragOperationLink))
- return "copyLink";
- if (isGenericMove)
- return "move";
- if (operation & DragOperationCopy)
- return "copy";
- if (operation & DragOperationLink)
- return "link";
- return "none";
-}
-
-DragOperation Clipboard::sourceOperation() const
-{
- DragOperation operation = dragOpFromIEOp(m_effectAllowed);
- ASSERT(operation != DragOperationPrivate);
- return operation;
-}
-
-DragOperation Clipboard::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)
-{
- ASSERT_ARG(operation, operation != DragOperationPrivate);
- m_effectAllowed = IEOpFromDragOp(operation);
-}
-
-void Clipboard::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
-{
- return m_dropEffect == "uninitialized" ? ASCIILiteral("none") : m_dropEffect;
-}
-
-void Clipboard::setDropEffect(const String& effect)
-{
- if (!m_forDrag)
- return;
-
- if (effect != "none" && effect != "copy" && effect != "link" && effect != "move")
- return;
-
- // FIXME: The spec allows this in all circumstances. There is probably no value
- // in ignoring attempts to change it.
- if (!canReadTypes())
- return;
-
- m_dropEffect = effect;
-}
-
-String Clipboard::effectAllowed() const
-{
- return m_effectAllowed;
-}
-
-void Clipboard::setEffectAllowed(const String& effect)
-{
- if (!m_forDrag)
- return;
-
- // Ignore any attempts to set it to an unknown value.
- if (dragOpFromIEOp(effect) == DragOperationPrivate)
- return;
-
- if (!canWriteData())
- return;
-
- m_effectAllowed = effect;
-}
-
-#endif // ENABLE(DRAG_SUPPORT)
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCoredomClipboardh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/Clipboard.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Clipboard.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/Clipboard.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,123 +0,0 @@
</span><del>-/*
- * Copyright (C) 2001 Peter Kelly (pmk@post.com)
- * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
- * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2013 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef Clipboard_h
-#define Clipboard_h
-
-#include "CachedResourceHandle.h"
-#include "ClipboardAccessPolicy.h"
-#include "DragActions.h"
-#include "DragImage.h"
-#include "IntPoint.h"
-#include <wtf/RefCounted.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
- class CachedImage;
- class DataTransferItemList;
- class DragData;
- class DragImageLoader;
- class Element;
- class FileList;
- class Pasteboard;
-
- class Clipboard : public RefCounted<Clipboard> {
- public:
- static PassRefPtr<Clipboard> createForCopyAndPaste(ClipboardAccessPolicy);
-
- ~Clipboard();
-
- String dropEffect() const;
- void setDropEffect(const String&);
-
- String effectAllowed() const;
- void setEffectAllowed(const String&);
-
- Vector<String> types() const;
-
- PassRefPtr<FileList> files() const;
-
- void clearData(const String& type);
- void clearData();
-
- String getData(const String& type) const;
-
- bool setData(const String& type, const String& data);
-
- void setDragImage(Element*, int x, int y);
-
-#if ENABLE(DATA_TRANSFER_ITEMS)
- PassRefPtr<DataTransferItemList> items() = 0;
-#endif
-
- void setAccessPolicy(ClipboardAccessPolicy);
- 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&);
-
- bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
-
- DragOperation sourceOperation() const;
- DragOperation destinationOperation() const;
- void setSourceOperation(DragOperation);
- void setDestinationOperation(DragOperation);
-
- void setDragHasStarted() { m_shouldUpdateDragImage = true; }
- DragImageRef createDragImage(IntPoint& dragLocation) const;
- void updateDragImage();
-#endif
-
- private:
- enum ClipboardType { CopyAndPaste, DragAndDrop };
- Clipboard(ClipboardAccessPolicy, PassOwnPtr<Pasteboard>, ClipboardType = CopyAndPaste, bool forFileDrag = false);
-
-#if ENABLE(DRAG_SUPPORT)
- bool canSetDragImage() const;
-#endif
-
- ClipboardAccessPolicy m_policy;
- OwnPtr<Pasteboard> m_pasteboard;
-
-#if ENABLE(DRAG_SUPPORT)
- bool m_forDrag;
- bool m_forFileDrag;
- String m_dropEffect;
- String m_effectAllowed;
- bool m_shouldUpdateDragImage;
- IntPoint m_dragLocation;
- CachedResourceHandle<CachedImage> m_dragImage;
- RefPtr<Element> m_dragImageElement;
- std::unique_ptr<DragImageLoader> m_dragImageLoader;
-#endif
- };
-
-} // namespace WebCore
-
-#endif // Clipboard_h
</del></span></pre></div>
<a id="trunkSourceWebCoredomClipboardidl"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/Clipboard.idl (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Clipboard.idl 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/Clipboard.idl 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-[
- SkipVTableValidation,
-] interface Clipboard {
- attribute DOMString dropEffect;
- attribute DOMString effectAllowed;
-
- [CustomGetter] readonly attribute Array types;
- readonly attribute FileList files;
-
- void clearData(optional DOMString type);
- DOMString getData(DOMString type);
- boolean setData(DOMString type, DOMString data);
- void setDragImage(Element image, long x, long y);
-
- [Conditional=DATA_TRANSFER_ITEMS] readonly attribute DataTransferItemList items;
-};
</del></span></pre></div>
<a id="trunkSourceWebCoredomClipboardAccessPolicyh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/ClipboardAccessPolicy.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClipboardAccessPolicy.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/ClipboardAccessPolicy.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (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
-
-namespace WebCore {
-
-enum ClipboardAccessPolicy {
- ClipboardNumb, ClipboardImageWritable, ClipboardWritable, ClipboardTypesReadable, ClipboardReadable
-};
-
-} // namespace
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoredomClipboardEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClipboardEvent.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClipboardEvent.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/ClipboardEvent.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ClipboardEvent.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<Clipboard> clipboard)
- : Event(eventType, canBubble, cancelable), m_clipboard(clipboard)
</del><ins>+ClipboardEvent::ClipboardEvent(const AtomicString& eventType, bool canBubble, bool cancelable, PassRefPtr<DataTransfer> dataTransfer)
+ : Event(eventType, canBubble, cancelable), m_dataTransfer(dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ClipboardEvent.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClipboardEvent.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/ClipboardEvent.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Clipboard;
</del><ins>+ class DataTransfer;
</ins><span class="cx">
</span><span class="cx"> class ClipboardEvent : public Event {
</span><span class="cx"> public:
</span><span class="lines">@@ -38,21 +38,21 @@
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new ClipboardEvent);
</span><span class="cx"> }
</span><del>- static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<Clipboard> clipboardArg)
</del><ins>+ static PassRefPtr<ClipboardEvent> create(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer> clipboardArg)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new ClipboardEvent(type, canBubbleArg, cancelableArg, clipboardArg));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Clipboard* clipboard() const { return m_clipboard.get(); }
</del><ins>+ virtual DataTransfer* internalDataTransfer() const override { return m_dataTransfer.get(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ClipboardEvent();
</span><del>- ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<Clipboard>);
</del><ins>+ ClipboardEvent(const AtomicString& type, bool canBubbleArg, bool cancelableArg, PassRefPtr<DataTransfer>);
</ins><span class="cx">
</span><span class="cx"> virtual EventInterface eventInterface() const override;
</span><span class="cx"> virtual bool isClipboardEvent() const override;
</span><span class="cx">
</span><del>- RefPtr<Clipboard> m_clipboard;
</del><ins>+ RefPtr<DataTransfer> m_dataTransfer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomClipboardMacmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/dom/ClipboardMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ClipboardMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/ClipboardMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2004, 2005, 2006, 2008, 2010, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "config.h"
-#import "Clipboard.h"
-
-#import "CachedImage.h"
-#import "Element.h"
-#import "DragImage.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
-{
- DragImageRef result = nil;
- if (m_dragImageElement) {
- if (Frame* frame = m_dragImageElement->document().frame()) {
- IntRect imageRect;
- IntRect elementRect;
- result = createDragImageForImage(*frame, *m_dragImageElement, imageRect, elementRect);
- // Client specifies point relative to element, not the whole image, which may include child
- // layers spread out all over the place.
- location.setX(elementRect.x() - imageRect.x() + m_dragLocation.x());
- location.setY(imageRect.height() - (elementRect.y() - imageRect.y() + m_dragLocation.y()));
- }
- } else if (m_dragImage) {
- result = m_dragImage->image()->getNSImage();
-
- location = m_dragLocation;
- location.setY([result size].height - location.y());
- }
- return result;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoredomDOMAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DOMAllInOne.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DOMAllInOne.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/DOMAllInOne.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "ClassNodeList.cpp"
</span><span class="cx"> #include "ClientRect.cpp"
</span><span class="cx"> #include "ClientRectList.cpp"
</span><del>-#include "Clipboard.cpp"
</del><span class="cx"> #include "ClipboardEvent.cpp"
</span><span class="cx"> #include "CollectionIndexCache.cpp"
</span><span class="cx"> #include "Comment.cpp"
</span><span class="lines">@@ -50,6 +49,7 @@
</span><span class="cx"> #include "DOMImplementation.cpp"
</span><span class="cx"> #include "DOMNamedFlowCollection.cpp"
</span><span class="cx"> #include "DOMStringList.cpp"
</span><ins>+#include "DataTransfer.cpp"
</ins><span class="cx"> #include "DatasetDOMStringMap.cpp"
</span><span class="cx"> #include "DecodedDataDocumentParser.cpp"
</span><span class="cx"> #include "DeviceMotionController.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercppfromrev166873trunkSourceWebCoredomClipboardcpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/DataTransfer.cpp (from rev 166873, trunk/Source/WebCore/dom/Clipboard.cpp) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp (rev 0)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,422 @@
</span><ins>+/*
+ * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "DataTransfer.h"
+
+#include "CachedImage.h"
+#include "CachedImageClient.h"
+#include "DragData.h"
+#include "Editor.h"
+#include "FileList.h"
+#include "Frame.h"
+#include "FrameLoader.h"
+#include "HTMLImageElement.h"
+#include "Image.h"
+#include "Pasteboard.h"
+
+namespace WebCore {
+
+#if ENABLE(DRAG_SUPPORT)
+
+class DragImageLoader final : private CachedImageClient {
+ WTF_MAKE_NONCOPYABLE(DragImageLoader); WTF_MAKE_FAST_ALLOCATED;
+public:
+ explicit DragImageLoader(DataTransfer*);
+ void startLoading(CachedResourceHandle<CachedImage>&);
+ void stopLoading(CachedResourceHandle<CachedImage>&);
+
+private:
+ virtual void imageChanged(CachedImage*, const IntRect*) override;
+ DataTransfer* m_dataTransfer;
+};
+
+#endif
+
+DataTransfer::DataTransfer(DataTransferAccessPolicy policy, PassOwnPtr<Pasteboard> pasteboard, Type type, bool forFileDrag)
+ : m_policy(policy)
+ , m_pasteboard(pasteboard)
+#if ENABLE(DRAG_SUPPORT)
+ , m_forDrag(type != CopyAndPaste)
+ , m_forFileDrag(forFileDrag)
+ , m_dropEffect(ASCIILiteral("uninitialized"))
+ , m_effectAllowed(ASCIILiteral("uninitialized"))
+ , m_shouldUpdateDragImage(false)
+#endif
+{
+#if !ENABLE(DRAG_SUPPORT)
+ ASSERT_UNUSED(type, type == CopyAndPaste);
+ ASSERT_UNUSED(forFileDrag, !forFileDrag);
+#endif
+}
+
+PassRefPtr<DataTransfer> DataTransfer::createForCopyAndPaste(DataTransferAccessPolicy policy)
+{
+ return adoptRef(new DataTransfer(policy, policy == DataTransferAccessPolicy::Writable ? Pasteboard::createPrivate() : Pasteboard::createForCopyAndPaste()));
+}
+
+DataTransfer::~DataTransfer()
+{
+#if ENABLE(DRAG_SUPPORT)
+ if (m_dragImageLoader && m_dragImage)
+ m_dragImageLoader->stopLoading(m_dragImage);
+#endif
+}
+
+void DataTransfer::setAccessPolicy(DataTransferAccessPolicy policy)
+{
+ // Once the dataTransfer goes numb, it can never go back.
+ ASSERT(m_policy != DataTransferAccessPolicy::Numb || policy == DataTransferAccessPolicy::Numb);
+ m_policy = policy;
+}
+
+bool DataTransfer::canReadTypes() const
+{
+ return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::TypesReadable || m_policy == DataTransferAccessPolicy::Writable;
+}
+
+bool DataTransfer::canReadData() const
+{
+ return m_policy == DataTransferAccessPolicy::Readable || m_policy == DataTransferAccessPolicy::Writable;
+}
+
+bool DataTransfer::canWriteData() const
+{
+ return m_policy == DataTransferAccessPolicy::Writable;
+}
+
+void DataTransfer::clearData(const String& type)
+{
+ if (!canWriteData())
+ return;
+
+ m_pasteboard->clear(type);
+}
+
+void DataTransfer::clearData()
+{
+ if (!canWriteData())
+ return;
+
+ m_pasteboard->clear();
+}
+
+String DataTransfer::getData(const String& type) const
+{
+ if (!canReadData())
+ return String();
+
+#if ENABLE(DRAG_SUPPORT)
+ if (m_forFileDrag)
+ return String();
+#endif
+
+ return m_pasteboard->readString(type);
+}
+
+bool DataTransfer::setData(const String& type, const String& data)
+{
+ if (!canWriteData())
+ return false;
+
+#if ENABLE(DRAG_SUPPORT)
+ if (m_forFileDrag)
+ return false;
+#endif
+
+ return m_pasteboard->writeString(type, data);
+}
+
+Vector<String> DataTransfer::types() const
+{
+ if (!canReadTypes())
+ return Vector<String>();
+
+ return m_pasteboard->types();
+}
+
+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
+ // dataTransfer are not reflected in any FileList objects the page has accessed and stored.
+
+ if (!canReadData())
+ return FileList::create();
+
+#if ENABLE(DRAG_SUPPORT)
+ if (m_forDrag && !m_forFileDrag)
+ return FileList::create();
+#endif
+
+ Vector<String> filenames = m_pasteboard->readFilenames();
+ RefPtr<FileList> fileList = FileList::create();
+ for (size_t i = 0; i < filenames.size(); ++i)
+ fileList->append(File::create(filenames[i], File::AllContentTypes));
+ return fileList.release();
+}
+
+#if !ENABLE(DRAG_SUPPORT)
+
+String DataTransfer::dropEffect() const
+{
+ return ASCIILiteral("none");
+}
+
+void DataTransfer::setDropEffect(const String&)
+{
+}
+
+String DataTransfer::effectAllowed() const
+{
+ return ASCIILiteral("uninitialized");
+}
+
+void DataTransfer::setEffectAllowed(const String&)
+{
+}
+
+void DataTransfer::setDragImage(Element*, int, int)
+{
+}
+
+#else
+
+PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop()
+{
+ return adoptRef(new DataTransfer(DataTransferAccessPolicy::Writable, Pasteboard::createForDragAndDrop(), DragAndDrop));
+}
+
+PassRefPtr<DataTransfer> DataTransfer::createForDragAndDrop(DataTransferAccessPolicy policy, const DragData& dragData)
+{
+ return adoptRef(new DataTransfer(policy, Pasteboard::createForDragAndDrop(dragData), DragAndDrop, dragData.containsFiles()));
+}
+
+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 == DataTransferAccessPolicy::ImageWritable || m_policy == DataTransferAccessPolicy::Writable);
+}
+
+void DataTransfer::setDragImage(Element* element, int x, int y)
+{
+ if (!canSetDragImage())
+ return;
+
+ CachedImage* image;
+ if (element && isHTMLImageElement(element) && !element->inDocument())
+ image = toHTMLImageElement(element)->cachedImage();
+ else
+ image = 0;
+
+ m_dragLocation = IntPoint(x, y);
+
+ if (m_dragImageLoader && m_dragImage)
+ m_dragImageLoader->stopLoading(m_dragImage);
+ m_dragImage = image;
+ if (m_dragImage) {
+ if (!m_dragImageLoader)
+ m_dragImageLoader = std::make_unique<DragImageLoader>(this);
+ m_dragImageLoader->startLoading(m_dragImage);
+ }
+
+ m_dragImageElement = image ? 0 : element;
+
+ 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 (!m_shouldUpdateDragImage)
+ return;
+
+ IntPoint computedHotSpot;
+ DragImageRef computedImage = createDragImage(computedHotSpot);
+ if (!computedImage)
+ return;
+
+ m_pasteboard->setDragImage(computedImage, computedHotSpot);
+}
+
+#if !PLATFORM(COCOA)
+
+DragImageRef DataTransfer::createDragImage(IntPoint& location) const
+{
+ location = m_dragLocation;
+
+ if (m_dragImage)
+ return createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
+
+ if (m_dragImageElement) {
+ if (Frame* frame = m_dragImageElement->document().frame())
+ return createDragImageForNode(*frame, *m_dragImageElement);
+ }
+
+ // We do not have enough information to create a drag image, use the default icon.
+ return nullptr;
+}
+
+#endif
+
+DragImageLoader::DragImageLoader(DataTransfer* dataTransfer)
+ : m_dataTransfer(dataTransfer)
+{
+}
+
+void DragImageLoader::startLoading(CachedResourceHandle<WebCore::CachedImage>& image)
+{
+ // FIXME: Does this really trigger a load? Does it need to?
+ image->addClient(this);
+}
+
+void DragImageLoader::stopLoading(CachedResourceHandle<WebCore::CachedImage>& image)
+{
+ image->removeClient(this);
+}
+
+void DragImageLoader::imageChanged(CachedImage*, const IntRect*)
+{
+ m_dataTransfer->updateDragImage();
+}
+
+static DragOperation dragOpFromIEOp(const String& operation)
+{
+ if (operation == "uninitialized")
+ return DragOperationEvery;
+ if (operation == "none")
+ return DragOperationNone;
+ if (operation == "copy")
+ return DragOperationCopy;
+ if (operation == "link")
+ return DragOperationLink;
+ if (operation == "move")
+ return (DragOperation)(DragOperationGeneric | DragOperationMove);
+ if (operation == "copyLink")
+ return (DragOperation)(DragOperationCopy | DragOperationLink);
+ if (operation == "copyMove")
+ return (DragOperation)(DragOperationCopy | DragOperationGeneric | DragOperationMove);
+ if (operation == "linkMove")
+ return (DragOperation)(DragOperationLink | DragOperationGeneric | DragOperationMove);
+ if (operation == "all")
+ return DragOperationEvery;
+ return DragOperationPrivate; // really a marker for "no conversion"
+}
+
+static const char* IEOpFromDragOp(DragOperation operation)
+{
+ bool isGenericMove = operation & (DragOperationGeneric | DragOperationMove);
+
+ if ((isGenericMove && (operation & DragOperationCopy) && (operation & DragOperationLink)) || operation == DragOperationEvery)
+ return "all";
+ if (isGenericMove && (operation & DragOperationCopy))
+ return "copyMove";
+ if (isGenericMove && (operation & DragOperationLink))
+ return "linkMove";
+ if ((operation & DragOperationCopy) && (operation & DragOperationLink))
+ return "copyLink";
+ if (isGenericMove)
+ return "move";
+ if (operation & DragOperationCopy)
+ return "copy";
+ if (operation & DragOperationLink)
+ return "link";
+ return "none";
+}
+
+DragOperation DataTransfer::sourceOperation() const
+{
+ DragOperation operation = dragOpFromIEOp(m_effectAllowed);
+ ASSERT(operation != DragOperationPrivate);
+ return operation;
+}
+
+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 DataTransfer::setSourceOperation(DragOperation operation)
+{
+ ASSERT_ARG(operation, operation != DragOperationPrivate);
+ m_effectAllowed = IEOpFromDragOp(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 DataTransfer::dropEffect() const
+{
+ return m_dropEffect == "uninitialized" ? ASCIILiteral("none") : m_dropEffect;
+}
+
+void DataTransfer::setDropEffect(const String& effect)
+{
+ if (!m_forDrag)
+ return;
+
+ if (effect != "none" && effect != "copy" && effect != "link" && effect != "move")
+ return;
+
+ // FIXME: The spec allows this in all circumstances. There is probably no value
+ // in ignoring attempts to change it.
+ if (!canReadTypes())
+ return;
+
+ m_dropEffect = effect;
+}
+
+String DataTransfer::effectAllowed() const
+{
+ return m_effectAllowed;
+}
+
+void DataTransfer::setEffectAllowed(const String& effect)
+{
+ if (!m_forDrag)
+ return;
+
+ // Ignore any attempts to set it to an unknown value.
+ if (dragOpFromIEOp(effect) == DragOperationPrivate)
+ return;
+
+ if (!canWriteData())
+ return;
+
+ m_effectAllowed = effect;
+}
+
+#endif // ENABLE(DRAG_SUPPORT)
+
+} // namespace WebCore
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferhfromrev166873trunkSourceWebCoredomClipboardh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/DataTransfer.h (from rev 166873, trunk/Source/WebCore/dom/Clipboard.h) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.h (rev 0)
+++ trunk/Source/WebCore/dom/DataTransfer.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,123 @@
</span><ins>+/*
+ * Copyright (C) 2001 Peter Kelly (pmk@post.com)
+ * Copyright (C) 2001 Tobias Anton (anton@stud.fbi.fh-darmstadt.de)
+ * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
+ * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef DataTransfer_h
+#define DataTransfer_h
+
+#include "CachedResourceHandle.h"
+#include "DataTransferAccessPolicy.h"
+#include "DragActions.h"
+#include "DragImage.h"
+#include "IntPoint.h"
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+ class CachedImage;
+ class DataTransferItemList;
+ class DragData;
+ class DragImageLoader;
+ class Element;
+ class FileList;
+ class Pasteboard;
+
+ class DataTransfer : public RefCounted<DataTransfer> {
+ public:
+ static PassRefPtr<DataTransfer> createForCopyAndPaste(DataTransferAccessPolicy);
+
+ ~DataTransfer();
+
+ String dropEffect() const;
+ void setDropEffect(const String&);
+
+ String effectAllowed() const;
+ void setEffectAllowed(const String&);
+
+ Vector<String> types() const;
+
+ PassRefPtr<FileList> files() const;
+
+ void clearData(const String& type);
+ void clearData();
+
+ String getData(const String& type) const;
+
+ bool setData(const String& type, const String& data);
+
+ void setDragImage(Element*, int x, int y);
+
+#if ENABLE(DATA_TRANSFER_ITEMS)
+ PassRefPtr<DataTransferItemList> items() = 0;
+#endif
+
+ void setAccessPolicy(DataTransferAccessPolicy);
+ bool canReadTypes() const;
+ bool canReadData() const;
+ bool canWriteData() const;
+
+ Pasteboard& pasteboard() { return *m_pasteboard; }
+
+#if ENABLE(DRAG_SUPPORT)
+ static PassRefPtr<DataTransfer> createForDragAndDrop();
+ static PassRefPtr<DataTransfer> createForDragAndDrop(DataTransferAccessPolicy, const DragData&);
+
+ bool dropEffectIsUninitialized() const { return m_dropEffect == "uninitialized"; }
+
+ DragOperation sourceOperation() const;
+ DragOperation destinationOperation() const;
+ void setSourceOperation(DragOperation);
+ void setDestinationOperation(DragOperation);
+
+ void setDragHasStarted() { m_shouldUpdateDragImage = true; }
+ DragImageRef createDragImage(IntPoint& dragLocation) const;
+ void updateDragImage();
+#endif
+
+ private:
+ enum Type { CopyAndPaste, DragAndDrop };
+ DataTransfer(DataTransferAccessPolicy, PassOwnPtr<Pasteboard>, Type = CopyAndPaste, bool forFileDrag = false);
+
+#if ENABLE(DRAG_SUPPORT)
+ bool canSetDragImage() const;
+#endif
+
+ DataTransferAccessPolicy m_policy;
+ OwnPtr<Pasteboard> m_pasteboard;
+
+#if ENABLE(DRAG_SUPPORT)
+ bool m_forDrag;
+ bool m_forFileDrag;
+ String m_dropEffect;
+ String m_effectAllowed;
+ bool m_shouldUpdateDragImage;
+ IntPoint m_dragLocation;
+ CachedResourceHandle<CachedImage> m_dragImage;
+ RefPtr<Element> m_dragImageElement;
+ std::unique_ptr<DragImageLoader> m_dragImageLoader;
+#endif
+ };
+
+} // namespace WebCore
+
+#endif // DataTransfer_h
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferidlfromrev166873trunkSourceWebCoredomClipboardidl"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/DataTransfer.idl (from rev 166873, trunk/Source/WebCore/dom/Clipboard.idl) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.idl (rev 0)
+++ trunk/Source/WebCore/dom/DataTransfer.idl 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ SkipVTableValidation,
+] interface DataTransfer {
+ attribute DOMString dropEffect;
+ attribute DOMString effectAllowed;
+
+ [CustomGetter] readonly attribute Array types;
+ readonly attribute FileList files;
+
+ void clearData(optional DOMString type);
+ DOMString getData(DOMString type);
+ boolean setData(DOMString type, DOMString data);
+ void setDragImage(Element image, long x, long y);
+
+ [Conditional=DATA_TRANSFER_ITEMS] readonly attribute DataTransferItemList items;
+};
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferAccessPolicyhfromrev166873trunkSourceWebCoredomClipboardAccessPolicyh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/DataTransferAccessPolicy.h (from rev 166873, trunk/Source/WebCore/dom/ClipboardAccessPolicy.h) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferAccessPolicy.h (rev 0)
+++ trunk/Source/WebCore/dom/DataTransferAccessPolicy.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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 DataTransferAccessPolicy_h
+#define DataTransferAccessPolicy_h
+
+namespace WebCore {
+
+enum class DataTransferAccessPolicy {
+ Numb, ImageWritable, Writable, TypesReadable, Readable
+};
+
+} // namespace
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferItemListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransferItemList.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferItemList.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/DataTransferItemList.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Clipboard;
</del><span class="cx"> class File;
</span><span class="cx">
</span><span class="cx"> typedef int ExceptionCode;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransferMacmmfromrev166873trunkSourceWebCoredomClipboardMacmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/dom/DataTransferMac.mm (from rev 166873, trunk/Source/WebCore/dom/ClipboardMac.mm) (0 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransferMac.mm (rev 0)
+++ trunk/Source/WebCore/dom/DataTransferMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+/*
+ * Copyright (C) 2004, 2005, 2006, 2008, 2010, 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "DataTransfer.h"
+
+#import "CachedImage.h"
+#import "Element.h"
+#import "DragImage.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 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) {
+ if (Frame* frame = m_dragImageElement->document().frame()) {
+ IntRect imageRect;
+ IntRect elementRect;
+ result = createDragImageForImage(*frame, *m_dragImageElement, imageRect, elementRect);
+ // Client specifies point relative to element, not the whole image, which may include child
+ // layers spread out all over the place.
+ location.setX(elementRect.x() - imageRect.x() + m_dragLocation.x());
+ location.setY(imageRect.height() - (elementRect.y() - imageRect.y() + m_dragLocation.y()));
+ }
+ } else if (m_dragImage) {
+ result = m_dragImage->image()->getNSImage();
+
+ location = m_dragLocation;
+ location.setY([result size].height - location.y());
+ }
+ return result;
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoredomEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Event.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Event.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/Event.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Clipboard;
</del><ins>+class DataTransfer;
</ins><span class="cx"> class EventTarget;
</span><span class="cx"> class HTMLIFrameElement;
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> bool legacyReturnValue() const { return !defaultPrevented(); }
</span><span class="cx"> void setLegacyReturnValue(bool returnValue) { setDefaultPrevented(!returnValue); }
</span><span class="cx">
</span><del>- Clipboard* clipboardData() const { return isClipboardEvent() ? clipboard() : 0; }
</del><ins>+ DataTransfer* clipboardData() const { return isClipboardEvent() ? internalDataTransfer() : 0; }
</ins><span class="cx">
</span><span class="cx"> virtual EventInterface eventInterface() const;
</span><span class="cx">
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> Event* underlyingEvent() const { return m_underlyingEvent.get(); }
</span><span class="cx"> void setUnderlyingEvent(PassRefPtr<Event>);
</span><span class="cx">
</span><del>- virtual Clipboard* clipboard() const { return 0; }
</del><ins>+ virtual DataTransfer* internalDataTransfer() const { return 0; }
</ins><span class="cx">
</span><span class="cx"> bool isBeingDispatched() const { return eventPhase(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Event.idl (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Event.idl 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/Event.idl 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> attribute boolean cancelBubble;
</span><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- [Custom] readonly attribute Clipboard clipboardData;
</del><ins>+ [Custom] readonly attribute DataTransfer clipboardData;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomMouseEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MouseEvent.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MouseEvent.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/MouseEvent.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -92,14 +92,14 @@
</span><span class="cx"> int movementX, int movementY,
</span><span class="cx"> #endif
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
</span><del>- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard> clipboard, bool isSimulated)
</del><ins>+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new MouseEvent(type, canBubble, cancelable, timestamp, view,
</span><span class="cx"> detail, screenX, screenY, pageX, pageY,
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx"> movementX, movementY,
</span><span class="cx"> #endif
</span><del>- ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, clipboard, isSimulated));
</del><ins>+ ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MouseEvent::MouseEvent()
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey,
</span><span class="cx"> unsigned short button, PassRefPtr<EventTarget> relatedTarget,
</span><del>- PassRefPtr<Clipboard> clipboard, bool isSimulated)
</del><ins>+ PassRefPtr<DataTransfer> dataTransfer, bool isSimulated)
</ins><span class="cx"> : MouseRelatedEvent(eventType, canBubble, cancelable, timestamp, view, detail, IntPoint(screenX, screenY),
</span><span class="cx"> IntPoint(pageX, pageY),
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> , m_button(button == (unsigned short)-1 ? 0 : button)
</span><span class="cx"> , m_buttonDown(button != (unsigned short)-1)
</span><span class="cx"> , m_relatedTarget(relatedTarget)
</span><del>- , m_clipboard(clipboard)
</del><ins>+ , m_dataTransfer(dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> , m_button(initializer.button == (unsigned short)-1 ? 0 : initializer.button)
</span><span class="cx"> , m_buttonDown(initializer.button != (unsigned short)-1)
</span><span class="cx"> , m_relatedTarget(initializer.relatedTarget)
</span><del>- , m_clipboard(0 /* clipboard */)
</del><ins>+ , m_dataTransfer(0 /* dataTransfer */)
</ins><span class="cx"> {
</span><span class="cx"> initCoordinates(IntPoint(initializer.clientX, initializer.clientY));
</span><span class="cx"> }
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> initCoordinates(IntPoint(clientX, clientY));
</span><span class="cx">
</span><span class="cx"> // FIXME: m_isSimulated is not set to false here.
</span><del>- // FIXME: m_clipboard is not set to 0 here.
</del><ins>+ // FIXME: m_dataTransfer is not set to 0 here.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventInterface MouseEvent::eventInterface() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MouseEvent.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MouseEvent.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/MouseEvent.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Clipboard;
</del><ins>+class DataTransfer;
</ins><span class="cx"> class PlatformMouseEvent;
</span><span class="cx">
</span><span class="cx"> struct MouseEventInit : public UIEventInit {
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> int movementX, int movementY,
</span><span class="cx"> #endif
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
</span><del>- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard>, bool isSimulated = false);
</del><ins>+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated = false);
</ins><span class="cx">
</span><span class="cx"> static PassRefPtr<MouseEvent> create(const AtomicString& eventType, PassRefPtr<AbstractView>, const PlatformMouseEvent&, int detail, PassRefPtr<Node> relatedTarget);
</span><span class="cx">
</span><span class="lines">@@ -87,12 +87,13 @@
</span><span class="cx"> virtual EventTarget* relatedTarget() const override final { return m_relatedTarget.get(); }
</span><span class="cx"> void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; }
</span><span class="cx">
</span><del>- Clipboard* clipboard() const override { return m_clipboard.get(); }
</del><span class="cx">
</span><span class="cx"> Node* toElement() const;
</span><span class="cx"> Node* fromElement() const;
</span><span class="cx">
</span><del>- Clipboard* dataTransfer() const { return isDragEvent() ? m_clipboard.get() : 0; }
</del><ins>+ // 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(); }
</ins><span class="cx">
</span><span class="cx"> virtual EventInterface eventInterface() const override;
</span><span class="cx">
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> int movementX, int movementY,
</span><span class="cx"> #endif
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button,
</span><del>- PassRefPtr<EventTarget> relatedTarget, PassRefPtr<Clipboard>, bool isSimulated);
</del><ins>+ PassRefPtr<EventTarget> relatedTarget, PassRefPtr<DataTransfer>, bool isSimulated);
</ins><span class="cx">
</span><span class="cx"> MouseEvent(const AtomicString& type, const MouseEventInit&);
</span><span class="cx">
</span><span class="lines">@@ -119,7 +120,7 @@
</span><span class="cx"> unsigned short m_button;
</span><span class="cx"> bool m_buttonDown;
</span><span class="cx"> RefPtr<EventTarget> m_relatedTarget;
</span><del>- RefPtr<Clipboard> m_clipboard;
</del><ins>+ RefPtr<DataTransfer> m_dataTransfer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SimulatedMouseEvent : public MouseEvent {
</span></span></pre></div>
<a id="trunkSourceWebCoredomMouseEventidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/MouseEvent.idl (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/MouseEvent.idl 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/MouseEvent.idl 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> readonly attribute Node toElement;
</span><span class="cx">
</span><span class="cx"> #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
</span><del>- readonly attribute Clipboard dataTransfer;
</del><ins>+ readonly attribute DataTransfer dataTransfer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomWheelEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WheelEvent.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WheelEvent.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -33,10 +33,10 @@
</span><span class="cx"> #include "CSSComputedStyleDeclaration.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><del>-#include "Clipboard.h"
</del><span class="cx"> #include "ClipboardEvent.h"
</span><span class="cx"> #include "CompositionEvent.h"
</span><span class="cx"> #include "CreateLinkCommand.h"
</span><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DeleteSelectionCommand.h"
</span><span class="cx"> #include "DictationAlternative.h"
</span><span class="cx"> #include "DictationCommand.h"
</span><span class="lines">@@ -302,17 +302,17 @@
</span><span class="cx">
</span><span class="cx"> bool Editor::canDHTMLCut()
</span><span class="cx"> {
</span><del>- return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, ClipboardNumb);
</del><ins>+ return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecutEvent, DataTransferAccessPolicy::Numb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::canDHTMLCopy()
</span><span class="cx"> {
</span><del>- return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, ClipboardNumb);
</del><ins>+ return !m_frame.selection().selection().isInPasswordField() && !dispatchCPPEvent(eventNames().beforecopyEvent, DataTransferAccessPolicy::Numb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::canDHTMLPaste()
</span><span class="cx"> {
</span><del>- return !dispatchCPPEvent(eventNames().beforepasteEvent, ClipboardNumb);
</del><ins>+ return !dispatchCPPEvent(eventNames().beforepasteEvent, DataTransferAccessPolicy::Numb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::canCut() const
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> if (m_frame.selection().selection().isInPasswordField())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return !dispatchCPPEvent(eventNames().copyEvent, ClipboardWritable);
</del><ins>+ return !dispatchCPPEvent(eventNames().copyEvent, DataTransferAccessPolicy::Writable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::tryDHTMLCut()
</span><span class="lines">@@ -742,12 +742,12 @@
</span><span class="cx"> if (m_frame.selection().selection().isInPasswordField())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return !dispatchCPPEvent(eventNames().cutEvent, ClipboardWritable);
</del><ins>+ return !dispatchCPPEvent(eventNames().cutEvent, DataTransferAccessPolicy::Writable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::tryDHTMLPaste()
</span><span class="cx"> {
</span><del>- return !dispatchCPPEvent(eventNames().pasteEvent, ClipboardReadable);
</del><ins>+ return !dispatchCPPEvent(eventNames().pasteEvent, DataTransferAccessPolicy::Readable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Editor::shouldInsertText(const String& text, Range* range, EditorInsertAction action) const
</span><span class="lines">@@ -915,25 +915,25 @@
</span><span class="cx">
</span><span class="cx"> // Returns whether caller should continue with "the default processing", which is the same as
</span><span class="cx"> // the event handler NOT setting the return value to false
</span><del>-bool Editor::dispatchCPPEvent(const AtomicString& eventType, ClipboardAccessPolicy policy)
</del><ins>+bool Editor::dispatchCPPEvent(const AtomicString& eventType, DataTransferAccessPolicy policy)
</ins><span class="cx"> {
</span><span class="cx"> Node* target = findEventTargetFromSelection();
</span><span class="cx"> if (!target)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- RefPtr<Clipboard> clipboard = Clipboard::createForCopyAndPaste(policy);
</del><ins>+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForCopyAndPaste(policy);
</ins><span class="cx">
</span><del>- RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, clipboard);
</del><ins>+ RefPtr<Event> event = ClipboardEvent::create(eventType, true, true, dataTransfer);
</ins><span class="cx"> target->dispatchEvent(event, IGNORE_EXCEPTION);
</span><span class="cx"> bool noDefaultProcessing = event->defaultPrevented();
</span><del>- if (noDefaultProcessing && policy == ClipboardWritable) {
</del><ins>+ if (noDefaultProcessing && policy == DataTransferAccessPolicy::Writable) {
</ins><span class="cx"> OwnPtr<Pasteboard> pasteboard = Pasteboard::createForCopyAndPaste();
</span><span class="cx"> pasteboard->clear();
</span><del>- pasteboard->writePasteboard(clipboard->pasteboard());
</del><ins>+ pasteboard->writePasteboard(dataTransfer->pasteboard());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // invalidate clipboard here for security
- clipboard->setAccessPolicy(ClipboardNumb);
</del><ins>+ // invalidate dataTransfer here for security
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb);
</ins><span class="cx">
</span><span class="cx"> return !noDefaultProcessing;
</span><span class="cx"> }
</span><span class="lines">@@ -1313,7 +1313,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (enclosingTextFormControl(m_frame.selection().selection().start()))
</span><del>- Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForClipboard(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
</del><ins>+ Pasteboard::createForCopyAndPaste()->writePlainText(selectedTextForDataTransfer(), canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace : Pasteboard::CannotSmartReplace);
</ins><span class="cx"> else {
</span><span class="cx"> HTMLImageElement* imageElement = nullptr;
</span><span class="cx"> if (action == CopyAction)
</span><span class="lines">@@ -1330,7 +1330,7 @@
</span><span class="cx"> writeSelectionToPasteboard(*Pasteboard::createForCopyAndPaste());
</span><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><del>- Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForClipboard);
</del><ins>+ Pasteboard::createForCopyAndPaste()->writeSelection(*selection, canSmartCopyOrDelete(), m_frame, IncludeImageAltTextForDataTransfer);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2957,7 +2957,7 @@
</span><span class="cx"> return selectedText(TextIteratorDefaultBehavior);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String Editor::selectedTextForClipboard() const
</del><ins>+String Editor::selectedTextForDataTransfer() const
</ins><span class="cx"> {
</span><span class="cx"> if (m_frame.settings().selectionIncludesAltImageText())
</span><span class="cx"> return selectedText(TextIteratorEmitsImageAltText);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/editing/Editor.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #ifndef Editor_h
</span><span class="cx"> #define Editor_h
</span><span class="cx">
</span><del>-#include "ClipboardAccessPolicy.h"
</del><span class="cx"> #include "Color.h"
</span><ins>+#include "DataTransferAccessPolicy.h"
</ins><span class="cx"> #include "DictationAlternative.h"
</span><span class="cx"> #include "DocumentMarker.h"
</span><span class="cx"> #include "EditAction.h"
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class AlternativeTextController;
</span><span class="cx"> class ArchiveResource;
</span><del>-class Clipboard;
</del><ins>+class DataTransfer;
</ins><span class="cx"> class CompositeEditCommand;
</span><span class="cx"> class DeleteButtonController;
</span><span class="cx"> class EditCommand;
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> void removeUnchangeableStyles();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool dispatchCPPEvent(const AtomicString&, ClipboardAccessPolicy);
</del><ins>+ bool dispatchCPPEvent(const AtomicString&, DataTransferAccessPolicy);
</ins><span class="cx">
</span><span class="cx"> void applyStyle(StyleProperties*, EditAction = EditActionUnspecified);
</span><span class="cx"> void applyParagraphStyle(StyleProperties*, EditAction = EditActionUnspecified);
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> Node* findEventTargetFrom(const VisibleSelection& selection) const;
</span><span class="cx">
</span><span class="cx"> String selectedText() const;
</span><del>- String selectedTextForClipboard() const;
</del><ins>+ String selectedTextForDataTransfer() const;
</ins><span class="cx"> bool findString(const String&, FindOptions);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> rangeOfString(const String&, Range*, FindOptions);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ios/EditorIOS.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ios/EditorIOS.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/editing/ios/EditorIOS.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -27,10 +27,10 @@
</span><span class="cx"> #include "Editor.h"
</span><span class="cx">
</span><span class="cx"> #include "CachedImage.h"
</span><del>-#include "Clipboard.h"
</del><span class="cx"> #include "CSSComputedStyleDeclaration.h"
</span><span class="cx"> #include "CSSPrimitiveValueMappings.h"
</span><span class="cx"> #include "DOMRangeInternal.h"
</span><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "EditorClient.h"
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">
</span><span class="cx"> String Editor::stringSelectionForPasteboardWithImageAltText()
</span><span class="cx"> {
</span><del>- String text = selectedTextForClipboard();
</del><ins>+ String text = selectedTextForDataTransfer();
</ins><span class="cx"> text.replace(noBreakSpace, ' ');
</span><span class="cx"> return text;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #import "Editor.h"
</span><span class="cx">
</span><span class="cx"> #import "CachedResourceLoader.h"
</span><del>-#import "Clipboard.h"
</del><span class="cx"> #import "ColorMac.h"
</span><span class="cx"> #import "DOMRangeInternal.h"
</span><ins>+#import "DataTransfer.h"
</ins><span class="cx"> #import "DocumentFragment.h"
</span><span class="cx"> #import "DocumentLoader.h"
</span><span class="cx"> #import "Editor.h"
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> Vector<String> types;
</span><span class="cx"> types.append(String(NSStringPboardType));
</span><span class="cx"> platformStrategies()->pasteboardStrategy()->setTypes(types, NSFindPboard);
</span><del>- platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForClipboard()), NSStringPboardType, NSFindPboard);
</del><ins>+ platformStrategies()->pasteboardStrategy()->setStringForType(m_frame.displayStringModifiedByEncoding(selectedTextForDataTransfer()), NSStringPboardType, NSFindPboard);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::readSelectionFromPasteboard(const String& pasteboardName)
</span><span class="lines">@@ -265,8 +265,8 @@
</span><span class="cx"> pasteAsPlainTextWithPasteboard(pasteboard);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// 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.
</del><ins>+// 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.
</ins><span class="cx"> String Editor::stringSelectionForPasteboard()
</span><span class="cx"> {
</span><span class="cx"> if (!canCopy())
</span><span class="lines">@@ -280,7 +280,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!canCopy())
</span><span class="cx"> return "";
</span><del>- String text = selectedTextForClipboard();
</del><ins>+ String text = selectedTextForDataTransfer();
</ins><span class="cx"> text.replace(noBreakSpace, ' ');
</span><span class="cx"> return text;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -572,10 +572,10 @@
</span><span class="cx"> EmptyDragClient() { }
</span><span class="cx"> virtual ~EmptyDragClient() {}
</span><span class="cx"> virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) override { }
</span><del>- virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) override { }
</del><ins>+ virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) override { }
</ins><span class="cx"> virtual DragDestinationAction actionMaskForDrag(DragData&) override { return DragDestinationActionNone; }
</span><span class="cx"> virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint&) override { return DragSourceActionNone; }
</span><del>- virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool) override { }
</del><ins>+ virtual void startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool) override { }
</ins><span class="cx"> virtual void dragControllerDestroyed() override { }
</span><span class="cx"> };
</span><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragClient.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragClient.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/DragClient.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class Clipboard;
</del><ins>+class DataTransfer;
</ins><span class="cx"> class DragData;
</span><span class="cx"> class Element;
</span><span class="cx"> class Frame;
</span><span class="lines">@@ -44,11 +44,11 @@
</span><span class="cx"> virtual void dragControllerDestroyed() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void willPerformDragDestinationAction(DragDestinationAction, DragData&) = 0;
</span><del>- virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&) = 0;
</del><ins>+ virtual void willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&) = 0;
</ins><span class="cx"> virtual DragDestinationAction actionMaskForDrag(DragData&) = 0;
</span><span class="cx"> virtual DragSourceAction dragSourceActionMaskForPoint(const IntPoint& rootViewPoint) = 0;
</span><span class="cx">
</span><del>- virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard&, Frame&, bool linkDrag = false) = 0;
</del><ins>+ virtual void startDrag(DragImageRef, const IntPoint& dragImageOrigin, const IntPoint& eventPos, DataTransfer&, Frame&, bool linkDrag = false) = 0;
</ins><span class="cx"> virtual void dragEnded() { }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/DragController.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -29,9 +29,8 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include "CachedImage.h"
</span><del>-#include "Clipboard.h"
-#include "ClipboardAccessPolicy.h"
</del><span class="cx"> #include "CachedResourceLoader.h"
</span><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentFragment.h"
</span><span class="cx"> #include "DragActions.h"
</span><span class="lines">@@ -185,11 +184,11 @@
</span><span class="cx"> void DragController::dragExited(DragData& dragData)
</span><span class="cx"> {
</span><span class="cx"> if (RefPtr<FrameView> v = m_page.mainFrame().view()) {
</span><del>- 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
</del><ins>+ 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.
</ins><span class="cx"> }
</span><span class="cx"> mouseMovedIntoDocument(0);
</span><span class="cx"> if (m_fileInputElementUnderMouse)
</span><span class="lines">@@ -211,10 +210,10 @@
</span><span class="cx"> bool preventedDefault = false;
</span><span class="cx"> if (mainFrame->view()) {
</span><span class="cx"> // Sending an event can result in the destruction of the view and part.
</span><del>- 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
</del><ins>+ 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.
</ins><span class="cx"> }
</span><span class="cx"> if (preventedDefault) {
</span><span class="cx"> m_documentUnderMouse = 0;
</span><span class="lines">@@ -592,26 +591,26 @@
</span><span class="cx"> if (!viewProtector)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- ClipboardAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;
- RefPtr<Clipboard> clipboard = Clipboard::createForDragAndDrop(policy, dragData);
</del><ins>+ DataTransferAccessPolicy policy = m_documentUnderMouse->securityOrigin()->isLocal() ? DataTransferAccessPolicy::Readable : DataTransferAccessPolicy::TypesReadable;
+ RefPtr<DataTransfer> dataTransfer = DataTransfer::createForDragAndDrop(policy, dragData);
</ins><span class="cx"> DragOperation srcOpMask = dragData.draggingSourceOperationMask();
</span><del>- clipboard->setSourceOperation(srcOpMask);
</del><ins>+ dataTransfer->setSourceOperation(srcOpMask);
</ins><span class="cx">
</span><span class="cx"> PlatformMouseEvent event = createMouseEvent(dragData);
</span><del>- if (!mainFrame->eventHandler().updateDragAndDrop(event, clipboard.get())) {
- clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security
</del><ins>+ if (!mainFrame->eventHandler().updateDragAndDrop(event, dataTransfer.get())) {
+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- operation = clipboard->destinationOperation();
- if (clipboard->dropEffectIsUninitialized())
</del><ins>+ operation = dataTransfer->destinationOperation();
+ if (dataTransfer->dropEffectIsUninitialized())
</ins><span class="cx"> operation = defaultOperationForDrag(srcOpMask);
</span><span class="cx"> else if (!(srcOpMask & operation)) {
</span><span class="cx"> // The element picked an operation which is not supported by the source
</span><span class="cx"> operation = DragOperationNone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- clipboard->setAccessPolicy(ClipboardNumb); // invalidate clipboard here for security
</del><ins>+ dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb); // Invalidate dataTransfer here for security.
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -733,11 +732,11 @@
</span><span class="cx"> IntPoint dragLoc(0, 0);
</span><span class="cx"> IntPoint dragImageOffset(0, 0);
</span><span class="cx">
</span><del>- ASSERT(state.clipboard);
</del><ins>+ ASSERT(state.dataTransfer);
</ins><span class="cx">
</span><del>- Clipboard& clipboard = *state.clipboard;
</del><ins>+ DataTransfer& dataTransfer = *state.dataTransfer;
</ins><span class="cx"> if (state.type == DragSourceActionDHTML)
</span><del>- dragImage = clipboard.createDragImage(dragImageOffset);
</del><ins>+ dragImage = dataTransfer.createDragImage(dragImageOffset);
</ins><span class="cx"> if (state.type == DragSourceActionSelection || !imageURL.isEmpty() || !linkURL.isEmpty())
</span><span class="cx"> // Selection, image, and link drags receive a default set of allowed drag operations that
</span><span class="cx"> // follows from:
</span><span class="lines">@@ -758,7 +757,7 @@
</span><span class="cx">
</span><span class="cx"> Image* image = getImage(element);
</span><span class="cx"> if (state.type == DragSourceActionSelection) {
</span><del>- if (!clipboard.pasteboard().hasData()) {
</del><ins>+ if (!dataTransfer.pasteboard().hasData()) {
</ins><span class="cx"> // FIXME: This entire block is almost identical to the code in Editor::copy, and the code should be shared.
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> selectionRange = src.selection().toNormalizedRange();
</span><span class="lines">@@ -767,51 +766,52 @@
</span><span class="cx"> src.editor().willWriteSelectionToPasteboard(selectionRange.get());
</span><span class="cx">
</span><span class="cx"> if (enclosingTextFormControl(src.selection().selection().start()))
</span><del>- clipboard.pasteboard().writePlainText(src.editor().selectedTextForClipboard(), Pasteboard::CannotSmartReplace);
</del><ins>+ dataTransfer.pasteboard().writePlainText(src.editor().selectedTextForDataTransfer(), Pasteboard::CannotSmartReplace);
</ins><span class="cx"> else {
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(EFL)
</span><del>- src.editor().writeSelectionToPasteboard(clipboard.pasteboard());
</del><ins>+ src.editor().writeSelectionToPasteboard(dataTransfer.pasteboard());
</ins><span class="cx"> #else
</span><span class="cx"> // FIXME: Convert all other platforms to match Mac and delete this.
</span><del>- clipboard.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForClipboard);
</del><ins>+ dataTransfer.pasteboard().writeSelection(*selectionRange, src.editor().canSmartCopyOrDelete(), src, IncludeImageAltTextForDataTransfer);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> src.editor().didWriteSelectionToPasteboard();
</span><span class="cx"> }
</span><del>- m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, clipboard);
</del><ins>+ m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, dataTransfer);
</ins><span class="cx"> if (!dragImage) {
</span><span class="cx"> dragImage = dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha);
</span><span class="cx"> dragLoc = dragLocForSelectionDrag(src);
</span><span class="cx"> m_dragOffset = IntPoint(dragOrigin.x() - dragLoc.x(), dragOrigin.y() - dragLoc.y());
</span><span class="cx"> }
</span><del>- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
</del><ins>+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
</ins><span class="cx"> } else if (!imageURL.isEmpty() && image && !image->isNull() && (m_dragSourceAction & DragSourceActionImage)) {
</span><span class="cx"> // We shouldn't be starting a drag for an image that can't provide an extension.
</span><span class="cx"> // This is an early detection for problems encountered later upon drop.
</span><span class="cx"> ASSERT(!image->filenameExtension().isEmpty());
</span><del>- if (!clipboard.pasteboard().hasData()) {
</del><ins>+ if (!dataTransfer.pasteboard().hasData()) {
</ins><span class="cx"> m_draggingImageURL = imageURL;
</span><span class="cx"> if (element.isContentRichlyEditable())
</span><span class="cx"> selectElement(element);
</span><del>- declareAndWriteDragImage(clipboard, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString());
</del><ins>+ declareAndWriteDragImage(dataTransfer, element, !linkURL.isEmpty() ? linkURL : imageURL, hitTestResult.altDisplayString());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, clipboard);
</del><ins>+ m_client.willPerformDragSourceAction(DragSourceActionImage, dragOrigin, dataTransfer);
</ins><span class="cx">
</span><span class="cx"> if (!dragImage) {
</span><span class="cx"> IntRect imageRect = hitTestResult.imageRect();
</span><span class="cx"> imageRect.setLocation(m_page.mainFrame().view()->rootViewToContents(src.view()->contentsToRootView(imageRect.location())));
</span><del>- doImageDrag(element, dragOrigin, hitTestResult.imageRect(), clipboard, src, m_dragOffset);
</del><ins>+ doImageDrag(element, dragOrigin, hitTestResult.imageRect(), dataTransfer, src, m_dragOffset);
</ins><span class="cx"> } else {
</span><span class="cx"> // DHTML defined drag image
</span><del>- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
</del><ins>+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
</span><del>- if (!clipboard.pasteboard().hasData())
- // Simplify whitespace so the title put on the clipboard resembles what the user sees
</del><ins>+ if (!dataTransfer.pasteboard().hasData()) {
+ // Simplify whitespace so the title put on the dataTransfer resembles what the user sees
</ins><span class="cx"> // on the web page. This includes replacing newlines with spaces.
</span><del>- src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), clipboard.pasteboard());
</del><ins>+ src.editor().copyURL(linkURL, hitTestResult.textContent().simplifyWhiteSpace(), dataTransfer.pasteboard());
+ }
</ins><span class="cx">
</span><span class="cx"> const VisibleSelection& sourceSelection = src.selection().selection();
</span><span class="cx"> if (sourceSelection.isCaret() && sourceSelection.isContentEditable()) {
</span><span class="lines">@@ -824,7 +824,7 @@
</span><span class="cx"> src.selection().setSelection(VisibleSelection::selectionFromContentsOfNode(node));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, clipboard);
</del><ins>+ m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, dataTransfer);
</ins><span class="cx"> if (!dragImage) {
</span><span class="cx"> dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src.settings().fontRenderingMode());
</span><span class="cx"> IntSize size = dragImageSize(dragImage);
</span><span class="lines">@@ -833,12 +833,12 @@
</span><span class="cx"> // Later code expects the drag image to be scaled by device's scale factor.
</span><span class="cx"> dragImage = scaleDragImage(dragImage, FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor()));
</span><span class="cx"> }
</span><del>- doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, clipboard, src, true);
</del><ins>+ doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, dataTransfer, src, true);
</ins><span class="cx"> } else if (state.type == DragSourceActionDHTML) {
</span><span class="cx"> if (dragImage) {
</span><span class="cx"> ASSERT(m_dragSourceAction & DragSourceActionDHTML);
</span><del>- m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, clipboard);
- doSystemDrag(dragImage, dragLoc, dragOrigin, clipboard, src, false);
</del><ins>+ m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer);
+ doSystemDrag(dragImage, dragLoc, dragOrigin, dataTransfer, src, false);
</ins><span class="cx"> } else
</span><span class="cx"> startedDrag = false;
</span><span class="cx"> } else {
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> return startedDrag;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, Clipboard& clipboard, Frame& frame, IntPoint& dragImageOffset)
</del><ins>+void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, DataTransfer& dataTransfer, Frame& frame, IntPoint& dragImageOffset)
</ins><span class="cx"> {
</span><span class="cx"> IntPoint mouseDownPoint = dragOrigin;
</span><span class="cx"> DragImageRef dragImage = nullptr;
</span><span class="lines">@@ -895,12 +895,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> dragImageOffset = mouseDownPoint + scaledOrigin;
</span><del>- doSystemDrag(dragImage, dragImageOffset, dragOrigin, clipboard, frame, false);
</del><ins>+ doSystemDrag(dragImage, dragImageOffset, dragOrigin, dataTransfer, frame, false);
</ins><span class="cx">
</span><span class="cx"> deleteDragImage(dragImage);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool forLink)
</del><ins>+void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool forLink)
</ins><span class="cx"> {
</span><span class="cx"> m_didInitiateDrag = true;
</span><span class="cx"> m_dragInitiator = frame.document();
</span><span class="lines">@@ -908,7 +908,7 @@
</span><span class="cx"> Ref<MainFrame> frameProtector(m_page.mainFrame());
</span><span class="cx"> RefPtr<FrameView> viewProtector = frameProtector->view();
</span><span class="cx"> m_client.startDrag(image, viewProtector->rootViewToContents(frame.view()->contentsToRootView(dragLoc)),
</span><del>- viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), clipboard, frameProtector.get(), forLink);
</del><ins>+ viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), dataTransfer, frameProtector.get(), forLink);
</ins><span class="cx"> // DragClient::startDrag can cause our Page to dispear, deallocating |this|.
</span><span class="cx"> if (!frameProtector->page())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/DragController.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class Clipboard;
</del><ins>+ class DataTransfer;
</ins><span class="cx"> class Document;
</span><span class="cx"> class DragClient;
</span><span class="cx"> class DragData;
</span><span class="lines">@@ -106,10 +106,10 @@
</span><span class="cx">
</span><span class="cx"> void mouseMovedIntoDocument(Document*);
</span><span class="cx">
</span><del>- void doImageDrag(Element&, const IntPoint&, const IntRect&, Clipboard&, Frame&, IntPoint&);
- void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool forLink);
</del><ins>+ void doImageDrag(Element&, const IntPoint&, const IntRect&, DataTransfer&, Frame&, IntPoint&);
+ void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool forLink);
</ins><span class="cx"> void cleanupAfterSystemDrag();
</span><del>- void declareAndWriteDragImage(Clipboard&, Element&, const URL&, const String& label);
</del><ins>+ void declareAndWriteDragImage(DataTransfer&, Element&, const URL&, const String& label);
</ins><span class="cx">
</span><span class="cx"> Page& m_page;
</span><span class="cx"> DragClient& m_client;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragState.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragState.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/DragState.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #ifndef DragState_h
</span><span class="cx"> #define DragState_h
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DragActions.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> RefPtr<Element> source; // Element that may be a drag source, for the current mouse gesture.
</span><span class="cx"> bool shouldDispatchEvents;
</span><span class="cx"> DragSourceAction type;
</span><del>- RefPtr<Clipboard> clipboard; // Used on only the source side of dragging.
</del><ins>+ RefPtr<DataTransfer> dataTransfer; // Used on only the source side of dragging.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -2012,7 +2012,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, Clipboard* clipboard)
</del><ins>+bool EventHandler::dispatchDragEvent(const AtomicString& eventType, Element& dragTarget, const PlatformMouseEvent& event, DataTransfer* dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> FrameView* view = m_frame.view();
</span><span class="cx">
</span><span class="lines">@@ -2028,7 +2028,7 @@
</span><span class="cx"> event.movementDelta().x(), event.movementDelta().y(),
</span><span class="cx"> #endif
</span><span class="cx"> event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(),
</span><del>- 0, 0, clipboard);
</del><ins>+ 0, 0, dataTransfer);
</ins><span class="cx">
</span><span class="cx"> dragTarget.dispatchEvent(me.get(), IGNORE_EXCEPTION);
</span><span class="cx"> return me->defaultPrevented();
</span><span class="lines">@@ -2072,9 +2072,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool hasFileOfType(Clipboard& clipboard, const String& type)
</del><ins>+static inline bool hasFileOfType(DataTransfer& dataTransfer, const String& type)
</ins><span class="cx"> {
</span><del>- RefPtr<FileList> fileList = clipboard.files();
</del><ins>+ RefPtr<FileList> fileList = dataTransfer.files();
</ins><span class="cx"> for (unsigned i = 0; i < fileList->length(); i++) {
</span><span class="cx"> if (equalIgnoringCase(fileList->item(i)->type(), type))
</span><span class="cx"> return true;
</span><span class="lines">@@ -2082,23 +2082,23 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool hasStringOfType(Clipboard& clipboard, const String& type)
</del><ins>+static inline bool hasStringOfType(DataTransfer& dataTransfer, const String& type)
</ins><span class="cx"> {
</span><del>- return !type.isNull() && clipboard.types().contains(type);
</del><ins>+ return !type.isNull() && dataTransfer.types().contains(type);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static bool hasDropZoneType(Clipboard& clipboard, const String& keyword)
</del><ins>+static bool hasDropZoneType(DataTransfer& dataTransfer, const String& keyword)
</ins><span class="cx"> {
</span><span class="cx"> if (keyword.startsWith("file:"))
</span><del>- return hasFileOfType(clipboard, keyword.substring(5));
</del><ins>+ return hasFileOfType(dataTransfer, keyword.substring(5));
</ins><span class="cx">
</span><span class="cx"> if (keyword.startsWith("string:"))
</span><del>- return hasStringOfType(clipboard, keyword.substring(7));
</del><ins>+ return hasStringOfType(dataTransfer, keyword.substring(7));
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool findDropZone(Node* target, Clipboard* clipboard)
</del><ins>+static bool findDropZone(Node* target, DataTransfer* dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = target->isElementNode() ? toElement(target) : target->parentElement();
</span><span class="cx"> for (; element; element = element->parentElement()) {
</span><span class="lines">@@ -2121,20 +2121,20 @@
</span><span class="cx"> if (dragOperation == DragOperationNone)
</span><span class="cx"> dragOperation = op;
</span><span class="cx"> } else
</span><del>- matched = matched || hasDropZoneType(*clipboard, keywords[i].string());
</del><ins>+ matched = matched || hasDropZoneType(*dataTransfer, keywords[i].string());
</ins><span class="cx">
</span><span class="cx"> if (matched && dragOperation != DragOperationNone)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (matched) {
</span><del>- clipboard->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation));
</del><ins>+ dataTransfer->setDropEffect(convertDragOperationToDropZoneOperation(dragOperation));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
</del><ins>+bool EventHandler::updateDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> bool accept = false;
</span><span class="cx">
</span><span class="lines">@@ -2164,23 +2164,23 @@
</span><span class="cx"> Frame* targetFrame;
</span><span class="cx"> if (targetIsFrame(newTarget.get(), targetFrame)) {
</span><span class="cx"> if (targetFrame)
</span><del>- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
</del><ins>+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
</ins><span class="cx"> } else if (newTarget) {
</span><span class="cx"> // 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.
</span><span class="cx"> if (dragState().source && dragState().shouldDispatchEvents) {
</span><span class="cx"> // for now we don't care if event handler cancels default behavior, since there is none
</span><span class="cx"> dispatchDragSrcEvent(eventNames().dragEvent, event);
</span><span class="cx"> }
</span><del>- accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, clipboard);
</del><ins>+ accept = dispatchDragEvent(eventNames().dragenterEvent, *newTarget, event, dataTransfer);
</ins><span class="cx"> if (!accept)
</span><del>- accept = findDropZone(newTarget.get(), clipboard);
</del><ins>+ accept = findDropZone(newTarget.get(), dataTransfer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
</span><span class="cx"> if (targetFrame)
</span><del>- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
</del><ins>+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
</ins><span class="cx"> } else if (m_dragTarget)
</span><del>- dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
</del><ins>+ dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer);
</ins><span class="cx">
</span><span class="cx"> if (newTarget) {
</span><span class="cx"> // We do not explicitly call dispatchDragEvent here because it could ultimately result in the appearance that
</span><span class="lines">@@ -2191,16 +2191,16 @@
</span><span class="cx"> Frame* targetFrame;
</span><span class="cx"> if (targetIsFrame(newTarget.get(), targetFrame)) {
</span><span class="cx"> if (targetFrame)
</span><del>- accept = targetFrame->eventHandler().updateDragAndDrop(event, clipboard);
</del><ins>+ accept = targetFrame->eventHandler().updateDragAndDrop(event, dataTransfer);
</ins><span class="cx"> } else if (newTarget) {
</span><span class="cx"> // Note, when dealing with sub-frames, we may need to fire only a dragover event as a drag event may have been fired earlier.
</span><span class="cx"> if (!m_shouldOnlyFireDragOverEvent && dragState().source && dragState().shouldDispatchEvents) {
</span><span class="cx"> // for now we don't care if event handler cancels default behavior, since there is none
</span><span class="cx"> dispatchDragSrcEvent(eventNames().dragEvent, event);
</span><span class="cx"> }
</span><del>- accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, clipboard);
</del><ins>+ accept = dispatchDragEvent(eventNames().dragoverEvent, *newTarget, event, dataTransfer);
</ins><span class="cx"> if (!accept)
</span><del>- accept = findDropZone(newTarget.get(), clipboard);
</del><ins>+ accept = findDropZone(newTarget.get(), dataTransfer);
</ins><span class="cx"> m_shouldOnlyFireDragOverEvent = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2208,29 +2208,29 @@
</span><span class="cx"> return accept;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
</del><ins>+void EventHandler::cancelDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> Frame* targetFrame;
</span><span class="cx"> if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
</span><span class="cx"> if (targetFrame)
</span><del>- targetFrame->eventHandler().cancelDragAndDrop(event, clipboard);
</del><ins>+ targetFrame->eventHandler().cancelDragAndDrop(event, dataTransfer);
</ins><span class="cx"> } else if (m_dragTarget) {
</span><span class="cx"> if (dragState().source && dragState().shouldDispatchEvents)
</span><span class="cx"> dispatchDragSrcEvent(eventNames().dragEvent, event);
</span><del>- dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, clipboard);
</del><ins>+ dispatchDragEvent(eventNames().dragleaveEvent, *m_dragTarget, event, dataTransfer);
</ins><span class="cx"> }
</span><span class="cx"> clearDragState();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, Clipboard* clipboard)
</del><ins>+bool EventHandler::performDragAndDrop(const PlatformMouseEvent& event, DataTransfer* dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> Frame* targetFrame;
</span><span class="cx"> bool preventedDefault = false;
</span><span class="cx"> if (targetIsFrame(m_dragTarget.get(), targetFrame)) {
</span><span class="cx"> if (targetFrame)
</span><del>- preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, clipboard);
</del><ins>+ preventedDefault = targetFrame->eventHandler().performDragAndDrop(event, dataTransfer);
</ins><span class="cx"> } else if (m_dragTarget)
</span><del>- preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, clipboard);
</del><ins>+ preventedDefault = dispatchDragEvent(eventNames().dropEvent, *m_dragTarget, event, dataTransfer);
</ins><span class="cx"> clearDragState();
</span><span class="cx"> return preventedDefault;
</span><span class="cx"> }
</span><span class="lines">@@ -3165,12 +3165,12 @@
</span><span class="cx"> return abs(delta.width()) >= threshold || abs(delta.height()) >= threshold;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void EventHandler::freeClipboard()
</del><ins>+void EventHandler::freeDataTransfer()
</ins><span class="cx"> {
</span><del>- if (!dragState().clipboard)
</del><ins>+ if (!dragState().dataTransfer)
</ins><span class="cx"> return;
</span><del>- dragState().clipboard->setAccessPolicy(ClipboardNumb);
- dragState().clipboard = 0;
</del><ins>+ dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::Numb);
+ dragState().dataTransfer = 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventHandler::dragSourceEndedAt(const PlatformMouseEvent& event, DragOperation operation)
</span><span class="lines">@@ -3180,11 +3180,11 @@
</span><span class="cx"> prepareMouseEvent(request, event);
</span><span class="cx">
</span><span class="cx"> if (dragState().source && dragState().shouldDispatchEvents) {
</span><del>- dragState().clipboard->setDestinationOperation(operation);
</del><ins>+ dragState().dataTransfer->setDestinationOperation(operation);
</ins><span class="cx"> // For now we don't care if event handler cancels default behavior, since there is no default behavior.
</span><span class="cx"> dispatchDragSrcEvent(eventNames().dragendEvent, event);
</span><span class="cx"> }
</span><del>- freeClipboard();
</del><ins>+ freeDataTransfer();
</ins><span class="cx"> dragState().source = 0;
</span><span class="cx"> // In case the drag was ended due to an escape key press we need to ensure
</span><span class="cx"> // that consecutive mousemove events don't reinitiate the drag and drop.
</span><span class="lines">@@ -3201,7 +3201,7 @@
</span><span class="cx"> // Return value indicates if we should continue "default processing", i.e., whether event handler canceled.
</span><span class="cx"> bool EventHandler::dispatchDragSrcEvent(const AtomicString& eventType, const PlatformMouseEvent& event)
</span><span class="cx"> {
</span><del>- return !dispatchDragEvent(eventType, *dragState().source, event, dragState().clipboard.get());
</del><ins>+ return !dispatchDragEvent(eventType, *dragState().source, event, dragState().dataTransfer.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool ExactlyOneBitSet(DragSourceAction n)
</span><span class="lines">@@ -3290,10 +3290,10 @@
</span><span class="cx">
</span><span class="cx"> DragOperation srcOp = DragOperationNone;
</span><span class="cx">
</span><del>- // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old clipboard gets numbed.
- freeClipboard();
</del><ins>+ // This does work only if we missed a dragEnd. Do it anyway, just to make sure the old dataTransfer gets numbed.
+ freeDataTransfer();
</ins><span class="cx">
</span><del>- dragState().clipboard = createDraggingClipboard();
</del><ins>+ dragState().dataTransfer = createDraggingDataTransfer();
</ins><span class="cx">
</span><span class="cx"> if (dragState().shouldDispatchEvents) {
</span><span class="cx"> // Check to see if the is a DOM based drag. If it is, get the DOM specified drag image and offset.
</span><span class="lines">@@ -3302,7 +3302,7 @@
</span><span class="cx"> // FIXME: This doesn't work correctly with transforms.
</span><span class="cx"> FloatPoint absPos = renderer->localToAbsolute();
</span><span class="cx"> IntSize delta = m_mouseDownPos - roundedIntPoint(absPos);
</span><del>- dragState().clipboard->setDragImage(dragState().source.get(), delta.width(), delta.height());
</del><ins>+ dragState().dataTransfer->setDragImage(dragState().source.get(), delta.width(), delta.height());
</ins><span class="cx"> } else {
</span><span class="cx"> // The renderer has disappeared, this can happen if the onStartDrag handler has hidden
</span><span class="cx"> // the element in some way. In this case we just kill the drag.
</span><span class="lines">@@ -3314,18 +3314,18 @@
</span><span class="cx"> m_mouseDownMayStartDrag = dispatchDragSrcEvent(eventNames().dragstartEvent, m_mouseDown)
</span><span class="cx"> && !m_frame.selection().selection().isInPasswordField();
</span><span class="cx">
</span><del>- // Invalidate clipboard here against anymore pasteboard writing for security. The drag
</del><ins>+ // Invalidate dataTransfer here against anymore pasteboard writing for security. The drag
</ins><span class="cx"> // image can still be changed as we drag, but not the pasteboard data.
</span><del>- dragState().clipboard->setAccessPolicy(ClipboardImageWritable);
</del><ins>+ dragState().dataTransfer->setAccessPolicy(DataTransferAccessPolicy::ImageWritable);
</ins><span class="cx">
</span><span class="cx"> if (m_mouseDownMayStartDrag) {
</span><span class="cx"> // Gather values from DHTML element, if it set any.
</span><del>- srcOp = dragState().clipboard->sourceOperation();
</del><ins>+ srcOp = dragState().dataTransfer->sourceOperation();
</ins><span class="cx">
</span><span class="cx"> // Yuck, a draggedImage:moveTo: message can be fired as a result of kicking off the
</span><span class="cx"> // drag with dragImage! Because of that dumb reentrancy, we may think we've not
</span><span class="cx"> // started the drag when that happens. So we have to assume it's started before we kick it off.
</span><del>- dragState().clipboard->setDragHasStarted();
</del><ins>+ dragState().dataTransfer->setDragHasStarted();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3348,7 +3348,7 @@
</span><span class="cx"> cleanupDrag:
</span><span class="cx"> if (!m_mouseDownMayStartDrag) {
</span><span class="cx"> // Something failed to start the drag, clean up.
</span><del>- freeClipboard();
</del><ins>+ freeDataTransfer();
</ins><span class="cx"> dragState().source = 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/EventHandler.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AutoscrollController;
</span><del>-class Clipboard;
</del><span class="cx"> class ContainerNode;
</span><ins>+class DataTransfer;
</ins><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><span class="cx"> class Event;
</span><span class="lines">@@ -159,9 +159,9 @@
</span><span class="cx"> void setCapturingMouseEventsElement(PassRefPtr<Element>); // A caller is responsible for resetting capturing element to 0.
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- bool updateDragAndDrop(const PlatformMouseEvent&, Clipboard*);
- void cancelDragAndDrop(const PlatformMouseEvent&, Clipboard*);
- bool performDragAndDrop(const PlatformMouseEvent&, Clipboard*);
</del><ins>+ bool updateDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
+ void cancelDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
+ bool performDragAndDrop(const PlatformMouseEvent&, DataTransfer*);
</ins><span class="cx"> void updateDragStateAfterEditDragIfNeeded(Element* rootEditableElement);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> static DragState& dragState();
</span><span class="cx"> static const double TextDragDelay;
</span><span class="cx">
</span><del>- PassRefPtr<Clipboard> createDraggingClipboard() const;
</del><ins>+ PassRefPtr<DataTransfer> createDraggingDataTransfer() const;
</ins><span class="cx"> #endif // ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> bool eventActivatedView(const PlatformMouseEvent&) const;
</span><span class="lines">@@ -365,9 +365,9 @@
</span><span class="cx">
</span><span class="cx"> bool dispatchMouseEvent(const AtomicString& eventType, Node* target, bool cancelable, int clickCount, const PlatformMouseEvent&, bool setUnder);
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, Clipboard*);
</del><ins>+ bool dispatchDragEvent(const AtomicString& eventType, Element& target, const PlatformMouseEvent&, DataTransfer*);
</ins><span class="cx">
</span><del>- void freeClipboard();
</del><ins>+ void freeDataTransfer();
</ins><span class="cx">
</span><span class="cx"> bool handleDrag(const MouseEventWithHitTestResults&, CheckDragHysteresis);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageeflEventHandlerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/efl/EventHandlerEfl.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
</del><ins>+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
</ins><span class="cx"> {
</span><del>- return Clipboard::createForDragAndDrop();
</del><ins>+ return DataTransfer::createForDragAndDrop();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagegtkDragControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/gtk/DragControllerGtk.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DragController.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DragData.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
</del><ins>+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
</ins><span class="cx"> {
</span><del>- clipboard.pasteboard().writeImage(element, url, label);
</del><ins>+ dataTransfer.pasteboard().writeImage(element, url, label);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagegtkEventHandlerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/gtk/EventHandlerGtk.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="cx"> #include "Frame.h"
</span><span class="lines">@@ -97,9 +97,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
</del><ins>+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
</ins><span class="cx"> {
</span><del>- return Clipboard::createForDragAndDrop();
</del><ins>+ return DataTransfer::createForDragAndDrop();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacDragControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/DragControllerMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/DragControllerMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/mac/DragControllerMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-#import "Clipboard.h"
</del><ins>+#import "DataTransfer.h"
</ins><span class="cx"> #import "DragClient.h"
</span><span class="cx"> #import "DragData.h"
</span><span class="cx"> #import "Element.h"
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> dragEnded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
</del><ins>+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
</ins><span class="cx"> {
</span><del>- m_client.declareAndWriteDragImage(clipboard.pasteboard().name(), element, url, label, element.document().frame());
</del><ins>+ m_client.declareAndWriteDragImage(dataTransfer.pasteboard().name(), element, url, label, element.document().frame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "BlockExceptions.h"
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DragController.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="lines">@@ -680,13 +680,13 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><del>-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
</del><ins>+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
</ins><span class="cx"> {
</span><span class="cx"> // Must be done before ondragstart adds types and data to the pboard,
</span><span class="cx"> // also done for security, as it erases data from the last drag.
</span><span class="cx"> OwnPtr<Pasteboard> pasteboard = Pasteboard::create(NSDragPboard);
</span><span class="cx"> pasteboard->clear();
</span><del>- return Clipboard::createForDragAndDrop();
</del><ins>+ return DataTransfer::createForDragAndDrop();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagewinDragControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/win/DragControllerWin.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/win/DragControllerWin.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/win/DragControllerWin.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DragController.h"
</span><span class="cx">
</span><del>-#include "Clipboard.h"
</del><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "DragData.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="lines">@@ -69,9 +69,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::declareAndWriteDragImage(Clipboard& clipboard, Element& element, const URL& url, const String& label)
</del><ins>+void DragController::declareAndWriteDragImage(DataTransfer& dataTransfer, Element& element, const URL& url, const String& label)
</ins><span class="cx"> {
</span><del>- Pasteboard& pasteboard = clipboard.pasteboard();
</del><ins>+ Pasteboard& pasteboard = dataTransfer.pasteboard();
</ins><span class="cx">
</span><span class="cx"> // FIXME: Do we really need this check?
</span><span class="cx"> if (!pasteboard.writableDataObject())
</span></span></pre></div>
<a id="trunkSourceWebCorepagewinEventHandlerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/win/EventHandlerWin.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/win/EventHandlerWin.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/page/win/EventHandlerWin.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> #include "EventHandler.h"
</span><span class="cx">
</span><span class="cx"> #include "COMPtr.h"
</span><del>-#include "Clipboard.h"
</del><span class="cx"> #include "Cursor.h"
</span><ins>+#include "DataTransfer.h"
</ins><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -92,12 +92,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
</del><ins>+PassRefPtr<DataTransfer> EventHandler::createDraggingDataTransfer() const
</ins><span class="cx"> {
</span><span class="cx"> #if OS(WINCE)
</span><span class="cx"> return 0;
</span><span class="cx"> #else
</span><del>- return Clipboard::createForDragAndDrop();
</del><ins>+ return DataTransfer::createForDragAndDrop();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> class Range;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><del>-enum ShouldSerializeSelectedTextForClipboard { DefaultSelectedTextType, IncludeImageAltTextForClipboard };
</del><ins>+enum ShouldSerializeSelectedTextForDataTransfer { DefaultSelectedTextType, IncludeImageAltTextForDataTransfer };
</ins><span class="cx">
</span><span class="cx"> // For writing to the pasteboard. Generally sorted with the richest formats on top.
</span><span class="cx">
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(WIN)
</span><span class="cx"> PassRefPtr<DocumentFragment> documentFragment(Frame&, Range&, bool allowPlainText, bool& chosePlainText); // FIXME: Layering violation.
</span><span class="cx"> void writeImage(Element&, const URL&, const String& title); // FIXME: Layering violation.
</span><del>- void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextForClipboard = DefaultSelectedTextType); // FIXME: Layering violation.
</del><ins>+ void writeSelection(Range&, bool canSmartCopyOrDelete, Frame&, ShouldSerializeSelectedTextForDataTransfer = DefaultSelectedTextType); // FIXME: Layering violation.
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -158,10 +158,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
</del><ins>+void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> m_dataObject->clearAll();
</span><del>- m_dataObject->setText(shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText());
</del><ins>+ m_dataObject->setText(shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText());
</ins><span class="cx"> m_dataObject->setMarkup(createMarkup(selectedRange, 0, AnnotateForInterchange, false, ResolveNonLocalURLs));
</span><span class="cx">
</span><span class="cx"> if (m_gtkClipboard)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #import "Pasteboard.h"
</span><span class="cx">
</span><span class="cx"> #import "CachedImage.h"
</span><del>-#import "Clipboard.h"
</del><span class="cx"> #import "DOMRangeInternal.h"
</span><span class="cx"> #import "Document.h"
</span><span class="cx"> #import "DocumentFragment.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> if (medium.hGlobal && FAILED(m_writableDataObject->SetData(htmlFormat(), &medium, TRUE)))
</span><span class="cx"> ::GlobalFree(medium.hGlobal);
</span><span class="cx">
</span><del>- String str = frame.editor().selectedTextForClipboard();
</del><ins>+ String str = frame.editor().selectedTextForDataTransfer();
</ins><span class="cx"> replaceNewlinesWithWindowsStyleNewlines(str);
</span><span class="cx"> replaceNBSPWithSpace(str);
</span><span class="cx"> medium.hGlobal = createGlobalData(str);
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> m_writableDataObject->SetData(smartPasteFormat(), &medium, TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
</del><ins>+void Pasteboard::writeSelection(Range& selectedRange, bool canSmartCopyOrDelete, Frame& frame, ShouldSerializeSelectedTextForDataTransfer shouldSerializeSelectedTextForDataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> clear();
</span><span class="cx">
</span><span class="lines">@@ -466,7 +466,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Put plain string on the pasteboard. CF_UNICODETEXT covers CF_TEXT as well
</span><del>- String str = shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame.editor().selectedTextForClipboard() : frame.editor().selectedText();
</del><ins>+ String str = shouldSerializeSelectedTextForDataTransfer == IncludeImageAltTextForDataTransfer ? frame.editor().selectedTextForDataTransfer() : frame.editor().selectedText();
</ins><span class="cx"> replaceNewlinesWithWindowsStyleNewlines(str);
</span><span class="cx"> replaceNBSPWithSpace(str);
</span><span class="cx"> if (::OpenClipboard(m_owner)) {
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-02 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Remove the legacy string drawing code
</span></span></pre></div>
<a id="trunkSourceWebKitiosWebViewWebPDFViewPlaceholdermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #import <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #import <JavaScriptCore/JSStringRefCF.h>
</span><span class="cx"> #import <UIKit/UIKit.h>
</span><del>-#import <WebCore/Clipboard.h>
</del><ins>+#import <WebCore/DataTransfer.h>
</ins><span class="cx"> #import <WebCore/EventHandler.h>
</span><span class="cx"> #import <WebCore/EventNames.h>
</span><span class="cx"> #import <WebCore/FormState.h>
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-04-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit part of [Cocoa] Add WKFormDelegate
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -33,11 +33,11 @@
</span><span class="cx"> public:
</span><span class="cx"> WebDragClient(WebView*);
</span><span class="cx"> virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override;
</span><del>- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&) override;
</del><ins>+ virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override;
</ins><span class="cx"> virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override;
</span><span class="cx"> virtual void dragControllerDestroyed() override;
</span><span class="cx"> virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override;
</span><del>- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag) override;
</del><ins>+ virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragPos, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag) override;
</ins><span class="cx"> virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
</span><span class="cx"> private:
</span><span class="cx"> WebView* m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebDragClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #import "WebUIDelegate.h"
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><del>-#import <WebCore/Clipboard.h>
</del><ins>+#import <WebCore/DataTransfer.h>
</ins><span class="cx"> #import <WebCore/DragData.h>
</span><span class="cx"> #import <WebCore/Editor.h>
</span><span class="cx"> #import <WebCore/EditorClient.h>
</span><span class="lines">@@ -84,12 +84,12 @@
</span><span class="cx"> return (DragSourceAction)[[m_webView _UIDelegateForwarder] webView:m_webView dragSourceActionMaskForPoint:viewPoint];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore::Clipboard& clipboard)
</del><ins>+void WebDragClient::willPerformDragSourceAction(WebCore::DragSourceAction action, const WebCore::IntPoint& mouseDownPoint, WebCore::DataTransfer& dataTransfer)
</ins><span class="cx"> {
</span><del>- [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName:clipboard.pasteboard().name()]];
</del><ins>+ [[m_webView _UIDelegateForwarder] webView:m_webView willPerformDragSourceAction:(WebDragSourceAction)action fromPoint:mouseDownPoint withPasteboard:[NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()]];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, Clipboard& clipboard, Frame& frame, bool linkDrag)
</del><ins>+void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& at, const IntPoint& eventPos, DataTransfer& dataTransfer, Frame& frame, bool linkDrag)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<WebHTMLView> htmlView = (WebHTMLView*)[[kit(&frame) frameView] documentView];
</span><span class="cx"> if (![htmlView.get() isKindOfClass:[WebHTMLView class]])
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> RetainPtr<WebHTMLView> topViewProtector = topHTMLView;
</span><span class="cx">
</span><span class="cx"> [topHTMLView _stopAutoscrollTimer];
</span><del>- NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:clipboard.pasteboard().name()];
</del><ins>+ NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:dataTransfer.pasteboard().name()];
</ins><span class="cx">
</span><span class="cx"> NSImage *dragNSImage = dragImage.get();
</span><span class="cx"> WebHTMLView *sourceHTMLView = htmlView.get();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPDFViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPDFView.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/mac/WebView/WebPDFView.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #import "WebView.h"
</span><span class="cx"> #import "WebViewInternal.h"
</span><span class="cx"> #import <PDFKit/PDFKit.h>
</span><del>-#import <WebCore/Clipboard.h>
</del><ins>+#import <WebCore/DataTransfer.h>
</ins><span class="cx"> #import <WebCore/EventNames.h>
</span><span class="cx"> #import <WebCore/FormState.h>
</span><span class="cx"> #import <WebCore/Frame.h>
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebDragClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "WebDropSource.h"
</span><span class="cx"> #include "WebKitGraphics.h"
</span><span class="cx"> #include "WebView.h"
</span><del>-#include <WebCore/Clipboard.h>
</del><ins>+#include <WebCore/DataTransfer.h>
</ins><span class="cx"> #include <WebCore/DragController.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="cx"> #include <WebCore/EventHandler.h>
</span><span class="lines">@@ -96,22 +96,22 @@
</span><span class="cx"> return (DragSourceAction)action;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, Clipboard& clipboard)
</del><ins>+void WebDragClient::willPerformDragSourceAction(DragSourceAction action, const IntPoint& intPoint, DataTransfer& dataTransfer)
</ins><span class="cx"> {
</span><span class="cx"> COMPtr<IWebUIDelegate> uiDelegate;
</span><span class="cx"> if (!SUCCEEDED(m_webView->uiDelegate(&uiDelegate)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> POINT point = intPoint;
</span><del>- COMPtr<IDataObject> dataObject = clipboard.pasteboard().dataObject();
</del><ins>+ COMPtr<IDataObject> dataObject = dataTransfer.pasteboard().dataObject();
</ins><span class="cx">
</span><span class="cx"> COMPtr<IDataObject> newDataObject;
</span><span class="cx"> HRESULT result = uiDelegate->willPerformDragSourceAction(m_webView, static_cast<WebDragSourceAction>(action), &point, dataObject.get(), &newDataObject);
</span><span class="cx"> if (result == S_OK && newDataObject != dataObject)
</span><del>- const_cast<Pasteboard&>(clipboard.pasteboard()).setExternalDataObject(newDataObject.get());
</del><ins>+ const_cast<Pasteboard&>(dataTransfer.pasteboard()).setExternalDataObject(newDataObject.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, Clipboard& clipboard, Frame& frame, bool isLink)
</del><ins>+void WebDragClient::startDrag(DragImageRef image, const IntPoint& imageOrigin, const IntPoint& dragPoint, DataTransfer& dataTransfer, Frame& frame, bool isLink)
</ins><span class="cx"> {
</span><span class="cx"> //FIXME: Allow UIDelegate to override behaviour <rdar://problem/5015953>
</span><span class="cx">
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> if (FAILED(WebDropSource::createInstance(m_webView, &source)))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- dataObject = clipboard.pasteboard().dataObject();
</del><ins>+ dataObject = dataTransfer.pasteboard().dataObject();
</ins><span class="cx"> if (source && (image || dataObject)) {
</span><span class="cx"> if (image) {
</span><span class="cx"> if(SUCCEEDED(CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER,
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebDragClient.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&);
</span><span class="cx"> virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint&);
</span><span class="cx"> virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&);
</span><del>- 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);
</del><ins>+ 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);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebView* m_webView;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -47,6 +47,20 @@
</span><span class="cx">
</span><span class="cx"> 2014-04-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> FlagsChanged events are not delivered to input methods when using async text input
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131383
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDragClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.cpp 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> m_page->mayPerformUploadDragDestinationAction(); // Upload can happen from a drop event handler, so we should prepare early.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, Clipboard&)
</del><ins>+void WebDragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint&, DataTransfer&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA) && !PLATFORM(GTK)
</span><del>-void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, Clipboard&, Frame&, bool)
</del><ins>+void WebDragClient::startDrag(DragImageRef, const IntPoint&, const IntPoint&, DataTransfer&, Frame&, bool)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDragClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDragClient.h 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -43,11 +43,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void willPerformDragDestinationAction(WebCore::DragDestinationAction, WebCore::DragData&) override;
</span><del>- virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::Clipboard&) override;
</del><ins>+ virtual void willPerformDragSourceAction(WebCore::DragSourceAction, const WebCore::IntPoint&, WebCore::DataTransfer&) override;
</ins><span class="cx"> virtual WebCore::DragDestinationAction actionMaskForDrag(WebCore::DragData&) override;
</span><span class="cx"> virtual WebCore::DragSourceAction dragSourceActionMaskForPoint(const WebCore::IntPoint& windowPoint) override;
</span><span class="cx">
</span><del>- virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::Clipboard&, WebCore::Frame&, bool linkDrag = false) override;
</del><ins>+ virtual void startDrag(WebCore::DragImageRef, const WebCore::IntPoint& dragImageOrigin, const WebCore::IntPoint& eventPos, WebCore::DataTransfer&, WebCore::Frame&, bool linkDrag = false) override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual void declareAndWriteDragImage(const String& pasteboardName, WebCore::Element&, const WebCore::URL&, const String&, WebCore::Frame*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (166964 => 166965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-04-08 21:41:02 UTC (rev 166964)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2014-04-08 22:06:16 UTC (rev 166965)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return bitmap.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, Clipboard&, Frame& frame, bool linkDrag)
</del><ins>+void WebDragClient::startDrag(RetainPtr<NSImage> image, const IntPoint& point, const IntPoint&, DataTransfer&, Frame& frame, bool linkDrag)
</ins><span class="cx"> {
</span><span class="cx"> IntSize bitmapSize([image size]);
</span><span class="cx"> RefPtr<ShareableBitmap> bitmap = convertImageToBitmap(image.get(), bitmapSize);
</span></span></pre>
</div>
</div>
</body>
</html>