<!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>[214556] 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/214556">214556</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 12:29:25 -0700 (Wed, 29 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Links with empty hrefs should not be drag sources
https://bugs.webkit.org/show_bug.cgi?id=170241
<rdar://problem/31305505>
Reviewed by Tim Horton.
Source/WebCore:
The m_dragSouceAction member of DragController represents the drag source actions that are available to the
document, rather than the available actions given the dragging element. Thus, it is not correct to only check
that (m_dragSourceAction & DragSourceActionAttachment) before proceeding down the attachment dragging codepath.
This should be additionally guarded with a check that the element being dragged is, in fact, an attachment
element.
New API test (see Tools/ChangeLog).
* page/DragController.cpp:
(WebCore::DragController::startDrag):
Tools:
Adds a new API test: DataInteractionTests.LinkWithEmptyHREF.
* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
(TestWebKitAPI::TEST):
* TestWebKitAPI/ios/DataInteractionSimulator.h:
Expose the current phase of the data interaction simulator for verifying behaviors in unit tests.
* TestWebKitAPI/ios/DataInteractionSimulator.mm:
(-[DataInteractionSimulator phase]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDragControllercpp">trunk/Source/WebCore/page/DragController.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsiosDataInteractionTestsmm">trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm</a></li>
<li><a href="#trunkToolsTestWebKitAPIiosDataInteractionSimulatorh">trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIiosDataInteractionSimulatormm">trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Source/WebCore/ChangeLog 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-29 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Links with empty hrefs should not be drag sources
+ https://bugs.webkit.org/show_bug.cgi?id=170241
+ <rdar://problem/31305505>
+
+ Reviewed by Tim Horton.
+
+ The m_dragSouceAction member of DragController represents the drag source actions that are available to the
+ document, rather than the available actions given the dragging element. Thus, it is not correct to only check
+ that (m_dragSourceAction & DragSourceActionAttachment) before proceeding down the attachment dragging codepath.
+ This should be additionally guarded with a check that the element being dragged is, in fact, an attachment
+ element.
+
+ New API test (see Tools/ChangeLog).
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
</ins><span class="cx"> 2017-03-29 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> WebVideoFullscreenInterfaceAVKit needs a strong self ref before dispatching to the main thread.
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -1013,7 +1013,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><del>- if (m_dragSourceAction & DragSourceActionAttachment) {
</del><ins>+ if (is<HTMLAttachmentElement>(element) && m_dragSourceAction & DragSourceActionAttachment) {
</ins><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="cx"> selectElement(element);
</span><span class="cx"> if (!attachmentURL.isEmpty()) {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Tools/ChangeLog 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-29 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Links with empty hrefs should not be drag sources
+ https://bugs.webkit.org/show_bug.cgi?id=170241
+ <rdar://problem/31305505>
+
+ Reviewed by Tim Horton.
+
+ Adds a new API test: DataInteractionTests.LinkWithEmptyHREF.
+
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/ios/DataInteractionSimulator.h:
+
+ Expose the current phase of the data interaction simulator for verifying behaviors in unit tests.
+
+ * TestWebKitAPI/ios/DataInteractionSimulator.mm:
+ (-[DataInteractionSimulator phase]):
+
</ins><span class="cx"> 2017-03-29 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Use TCP instead of FIFOs for Simulator/Device communication
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsiosDataInteractionTestsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -172,6 +172,7 @@
</span><span class="cx"> RetainPtr<DataInteractionSimulator> dataInteractionSimulator = adoptNS([[DataInteractionSimulator alloc] initWithWebView:webView.get()]);
</span><span class="cx"> [dataInteractionSimulator runFrom:CGPointMake(100, 50) to:CGPointMake(100, 300)];
</span><span class="cx">
</span><ins>+ EXPECT_EQ(DataInteractionCancelled, [dataInteractionSimulator phase]);
</ins><span class="cx"> EXPECT_FALSE([webView editorContainsImageElement]);
</span><span class="cx">
</span><span class="cx"> NSArray *observedEventNames = [dataInteractionSimulator observedEventNames];
</span><span class="lines">@@ -292,6 +293,19 @@
</span><span class="cx"> EXPECT_WK_STREQ("PASS", [webView stringByEvaluatingJavaScript:@"target.textContent"].UTF8String);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(DataInteractionTests, LinkWithEmptyHREF)
+{
+ RetainPtr<TestWKWebView> webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
+ [webView synchronouslyLoadTestPageNamed:@"link-and-input"];
+ [webView stringByEvaluatingJavaScript:@"document.querySelector('a').href = ''"];
+
+ RetainPtr<DataInteractionSimulator> dataInteractionSimulator = adoptNS([[DataInteractionSimulator alloc] initWithWebView:webView.get()]);
+ [dataInteractionSimulator runFrom:CGPointMake(100, 50) to:CGPointMake(100, 300)];
+
+ EXPECT_EQ(DataInteractionCancelled, [dataInteractionSimulator phase]);
+ EXPECT_WK_STREQ("", [webView editorValue].UTF8String);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DATA_INTERACTION)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIiosDataInteractionSimulatorh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.h 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> @property (nonatomic, strong) UIItemProvider *externalItemProvider;
</span><span class="cx"> @property (nonatomic, readonly) NSArray *observedEventNames;
</span><span class="cx"> @property (nonatomic, readonly) NSArray *finalSelectionRects;
</span><ins>+@property (nonatomic, readonly) DataInteractionPhase phase;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIiosDataInteractionSimulatormm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm (214555 => 214556)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-03-29 19:25:39 UTC (rev 214555)
+++ trunk/Tools/TestWebKitAPI/ios/DataInteractionSimulator.mm 2017-03-29 19:29:25 UTC (rev 214556)
</span><span class="lines">@@ -209,6 +209,11 @@
</span><span class="cx"> _externalItemProvider = externalItemProvider;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (DataInteractionPhase)phase
+{
+ return _phase;
+}
+
</ins><span class="cx"> #pragma mark - _WKTestingDelegate
</span><span class="cx">
</span><span class="cx"> - (void)webViewDidPerformDataInteractionControllerOperation:(WKWebView *)webView
</span></span></pre>
</div>
</div>
</body>
</html>