<!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>[201230] branches/safari-602.1.32-branch</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/201230">201230</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-05-20 15:31:34 -0700 (Fri, 20 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/201227">r201227</a>. rdar://problem/24577706</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsChangeLog">branches/safari-602.1.32-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602132branchLayoutTestsplatformiossimulatorTestExpectations">branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#branchessafari602132branchLayoutTestsplatformmacwk2TestExpectations">branches/safari-602.1.32-branch/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#branchessafari602132branchSourceWebKitmacChangeLog">branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKitmacWebViewWebHTMLViewmm">branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2ChangeLog">branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602132branchSourceWebKit2UIProcessCocoaWebViewImplmm">branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602132branchLayoutTestsfasteventsdraggabledivcustomdataexpectedtxt">branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata-expected.txt</a></li>
<li><a href="#branchessafari602132branchLayoutTestsfasteventsdraggabledivcustomdatahtml">branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602132branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/ChangeLog (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r201227. rdar://problem/24577706
+
+ 2016-05-20 Enrica Casucci <enrica@apple.com>
+
+ Drag cannot start if no drag data or custom data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ * fast/events/draggable-div-customdata-expected.txt: Added.
+ * fast/events/draggable-div-customdata.html: Added.
+ * platform/ios-simulator/TestExpectations
+ * platform/mac-wk2/TestExpectations
+
</ins><span class="cx"> 2016-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201187. rdar://problem/25314776
</span></span></pre></div>
<a id="branchessafari602132branchLayoutTestsfasteventsdraggabledivcustomdataexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata-expected.txt (0 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata-expected.txt (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata-expected.txt 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This test checks that we drag a draggable element without setting data to transfer
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS TEST PASSED: square dropped
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari602132branchLayoutTestsfasteventsdraggabledivcustomdatahtml"></a>
<div class="addfile"><h4>Added: branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata.html (0 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata.html (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/events/draggable-div-customdata.html 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -0,0 +1,89 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+ #dropTarget, #dragMe { text-align: center; display: table-cell; vertical-align: middle }
+ #dropTarget {width: 256px; height: 256px; border: 1px dashed}
+ #dragMe {-webkit-user-drag: element; -webkit-user-select: none; background: #ff0000; width: 64px; height: 64px; color: white}
+</style>
+<script>
+ var dragMe;
+ var dropTarget;
+ var consoleElm;
+ var event;
+
+ window.onload = function()
+ {
+ dragMe = document.getElementById("dragMe");
+ dropTarget = document.getElementById("dropTarget");
+ consoleElm = document.getElementById("console");
+
+ if (!dragMe || !dropTarget || !consoleElm)
+ return;
+
+ dragMe.onstart = dragStart;
+ dropTarget.ondragover = dragOver;
+ dropTarget.ondrop = drop;
+
+ runTest();
+ }
+
+ function dragStart(event)
+ {
+ event.dataTransfer.items.add('hello world', 'custom-data');
+ }
+
+ function drop(event)
+ {
+ testPassed("TEST PASSED: square dropped");
+ event.preventDefault();
+ dragMe.parentNode.removeChild(dragMe);
+ event.target.appendChild(dragMe);
+ }
+
+ function dragOver(event)
+ {
+ event.preventDefault();
+ }
+
+ function runTest()
+ {
+ if (!window.eventSender)
+ return;
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var startX = dragMe.offsetLeft + 10;
+ var startY = dragMe.offsetTop + dragMe.offsetHeight / 2;
+ var endX = dropTarget.offsetLeft + 10;
+ var endY = dropTarget.offsetTop + dropTarget.offsetHeight / 2;
+
+ eventSender.mouseMoveTo(startX, startY);
+ eventSender.mouseDown();
+ eventSender.leapForward(1000);
+ eventSender.mouseMoveTo(endX, endY);
+ eventSender.mouseUp();
+
+ var testContainer = document.getElementById("test-container");
+ if (testContainer)
+ document.body.removeChild(testContainer);
+ debug('<br /><span class="pass">TEST COMPLETE</span>');
+ }
+</script>
+</head>
+<body>
+ <p id="description"></p>
+ <div id="test-container">
+ <div id="dropTarget">Drop the red square onto me.</div>
+ <hr/>
+ <p>Items that can be dragged to the drop target:</p>
+ <div id="dragMe" draggable="true">Square</div>
+ <hr/>
+ </div>
+ <div id="console"></div>
+ <script>
+ description("This test checks that we drag a draggable element without setting data to transfer");
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari602132branchLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator/TestExpectations (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -204,6 +204,7 @@
</span><span class="cx"> fast/events/drag-selects-image.html
</span><span class="cx"> fast/events/drag-to-navigate.html
</span><span class="cx"> fast/events/draggable-div-nodata.html
</span><ins>+fast/events/draggable-div-customdata.html
</ins><span class="cx"> fast/events/drop-handler-should-not-stop-navigate.html
</span><span class="cx"> fast/events/drop-with-file-paths.html
</span><span class="cx"> fast/events/dropzone-001.html
</span></span></pre></div>
<a id="branchessafari602132branchLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/LayoutTests/platform/mac-wk2/TestExpectations (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/LayoutTests/platform/mac-wk2/TestExpectations 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> fast/events/drag-in-frames.html
</span><span class="cx"> fast/events/drag-parent-node.html
</span><span class="cx"> fast/events/draggable-div-nodata.html
</span><ins>+fast/events/draggable-div-customdata.html
</ins><span class="cx"> fast/events/dropzone-001.html
</span><span class="cx"> fast/events/dropzone-002.html
</span><span class="cx"> fast/events/dropzone-003.html
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/ChangeLog 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r201227. rdar://problem/24577706
+
+ 2016-05-20 Enrica Casucci <enrica@apple.com>
+
+ Drag cannot start if no drag data or custom data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ We need to make sure there is always one item in common between source and target
+ of the drag and drop operation.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView dragImage:at:offset:event:pasteboard:source:slideBack:]):
+
</ins><span class="cx"> 2016-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201187. rdar://problem/25314776
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -4576,8 +4576,7 @@
</span><span class="cx"> slideBack:(BOOL)slideBack
</span><span class="cx"> {
</span><span class="cx"> ASSERT(self == [self _topHTMLView]);
</span><del>- if (![[pasteboard types] count])
- [pasteboard setString:@"" forType:[WebHTMLView _dummyPasteboardType]];
</del><ins>+ [pasteboard setString:@"" forType:[WebHTMLView _dummyPasteboardType]];
</ins><span class="cx">
</span><span class="cx"> [super dragImage:dragImage at:at offset:offset event:event pasteboard:pasteboard source:source slideBack:slideBack];
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-05-20 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r201227. rdar://problem/24577706
+
+ 2016-05-20 Enrica Casucci <enrica@apple.com>
+
+ Drag cannot start if no drag data or custom data is available in the Pasteboard.
+ https://bugs.webkit.org/show_bug.cgi?id=157911
+ rdar://problem/24577706
+
+ Reviewed by Tim Horton.
+
+ We need to make sure there is always one item in common between source and target
+ of the drag and drop operation.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::dragImageForView):
+
</ins><span class="cx"> 2016-05-19 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201187. rdar://problem/25314776
</span></span></pre></div>
<a id="branchessafari602132branchSourceWebKit2UIProcessCocoaWebViewImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (201229 => 201230)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-20 22:28:40 UTC (rev 201229)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-05-20 22:31:34 UTC (rev 201230)
</span><span class="lines">@@ -2931,8 +2931,7 @@
</span><span class="cx"> // The call below could release the view.
</span><span class="cx"> RetainPtr<NSView> protector(m_view);
</span><span class="cx"> NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName:NSDragPboard];
</span><del>- if (![[pasteboard types] count])
- [pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
</del><ins>+ [pasteboard setString:@"" forType:PasteboardTypes::WebDummyPboardType];
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx"> [view dragImage:image
</span></span></pre>
</div>
</div>
</body>
</html>