<!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>[215189] 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/215189">215189</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-04-10 10:58:58 -0700 (Mon, 10 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/214403">r214403</a>): fast/events/drag-to-navigate.html and fast/events/only-valid-drop-targets-receive-file-drop.html failing
https://bugs.webkit.org/show_bug.cgi?id=170677
<rdar://problem/31512633>
Reviewed by Tim Horton.
Tools:
Fixes two drag and drop LayoutTests by introducing and enabling a TestOptions switch (enableDragDestinationActionLoad)
to allow dropping URLs to trigger page navigation.
* DumpRenderTree/TestOptions.h:
* DumpRenderTree/TestOptions.mm:
(TestOptions::TestOptions):
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebViewToConsistentStateBeforeTesting):
* DumpRenderTree/mac/UIDelegate.h:
* DumpRenderTree/mac/UIDelegate.mm:
(-[UIDelegate resetToConsistentStateBeforeTesting:]):
(-[UIDelegate webView:dragDestinationActionMaskForDraggingInfo:]):
LayoutTests:
Turn enableDragDestinationActionLoad on in these two LayoutTests via WKTR options.
* fast/events/drag-to-navigate.html:
* fast/events/only-valid-drop-targets-receive-file-drop.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasteventsdragtonavigatehtml">trunk/LayoutTests/fast/events/drag-to-navigate.html</a></li>
<li><a href="#trunkLayoutTestsfasteventsonlyvaliddroptargetsreceivefiledrophtml">trunk/LayoutTests/fast/events/only-valid-drop-targets-receive-file-drop.html</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsh">trunk/Tools/DumpRenderTree/TestOptions.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsmm">trunk/Tools/DumpRenderTree/TestOptions.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacUIDelegateh">trunk/Tools/DumpRenderTree/mac/UIDelegate.h</a></li>
<li><a href="#trunkToolsDumpRenderTreemacUIDelegatemm">trunk/Tools/DumpRenderTree/mac/UIDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/LayoutTests/ChangeLog 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-04-10 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ REGRESSION (r214403): fast/events/drag-to-navigate.html and fast/events/only-valid-drop-targets-receive-file-drop.html failing
+ https://bugs.webkit.org/show_bug.cgi?id=170677
+ <rdar://problem/31512633>
+
+ Reviewed by Tim Horton.
+
+ Turn enableDragDestinationActionLoad on in these two LayoutTests via WKTR options.
+
+ * fast/events/drag-to-navigate.html:
+ * fast/events/only-valid-drop-targets-receive-file-drop.html:
+
</ins><span class="cx"> 2017-04-10 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/modern-media-controls/volume-up-support/volume-up-support.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsdragtonavigatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/drag-to-navigate.html (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/drag-to-navigate.html 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/LayoutTests/fast/events/drag-to-navigate.html 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+<!-- webkit-test-runner [ enableDragDestinationActionLoad=true ] -->
</ins><span class="cx"> <div>FAIL</div>
</span><span class="cx"> <script>
</span><span class="cx"> function doTest() {
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventsonlyvaliddroptargetsreceivefiledrophtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/only-valid-drop-targets-receive-file-drop.html (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/only-valid-drop-targets-receive-file-drop.html 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/LayoutTests/fast/events/only-valid-drop-targets-receive-file-drop.html 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+<!-- webkit-test-runner [ enableDragDestinationActionLoad=true ] -->
</ins><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/ChangeLog 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-04-10 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ REGRESSION (r214403): fast/events/drag-to-navigate.html and fast/events/only-valid-drop-targets-receive-file-drop.html failing
+ https://bugs.webkit.org/show_bug.cgi?id=170677
+ <rdar://problem/31512633>
+
+ Reviewed by Tim Horton.
+
+ Fixes two drag and drop LayoutTests by introducing and enabling a TestOptions switch (enableDragDestinationActionLoad)
+ to allow dropping URLs to trigger page navigation.
+
+ * DumpRenderTree/TestOptions.h:
+ * DumpRenderTree/TestOptions.mm:
+ (TestOptions::TestOptions):
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebViewToConsistentStateBeforeTesting):
+ * DumpRenderTree/mac/UIDelegate.h:
+ * DumpRenderTree/mac/UIDelegate.mm:
+ (-[UIDelegate resetToConsistentStateBeforeTesting:]):
+ (-[UIDelegate webView:dragDestinationActionMaskForDraggingInfo:]):
+
</ins><span class="cx"> 2017-04-10 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> update-webkit-dependency should report $response->message for diagnose
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.h (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.h 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> bool enableModernMediaControls { true };
</span><span class="cx"> bool enablePointerLock { false };
</span><span class="cx"> bool enableCredentialManagement { false };
</span><ins>+ bool enableDragDestinationActionLoad { false };
</ins><span class="cx">
</span><span class="cx"> TestOptions(NSURL*, const TestCommand&);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.mm (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.mm 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/DumpRenderTree/TestOptions.mm 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -88,6 +88,8 @@
</span><span class="cx"> this->enablePointerLock = parseBooleanTestHeaderValue(value);
</span><span class="cx"> else if (key == "enableCredentialManagement")
</span><span class="cx"> this->enableCredentialManagement = parseBooleanTestHeaderValue(value);
</span><ins>+ else if (key == "enableDragDestinationActionLoad")
+ this->enableDragDestinationActionLoad = parseBooleanTestHeaderValue(value);
</ins><span class="cx"> pairStart = pairEnd + 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -1795,6 +1795,7 @@
</span><span class="cx"> [webView setPolicyDelegate:defaultPolicyDelegate];
</span><span class="cx"> [policyDelegate setPermissive:NO];
</span><span class="cx"> [policyDelegate setControllerToNotifyDone:0];
</span><ins>+ [uiDelegate resetToConsistentStateBeforeTesting:options];
</ins><span class="cx"> [frameLoadDelegate resetToConsistentState];
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [webView _setDashboardBehavior:WebDashboardBehaviorUseBackwardCompatibilityMode to:NO];
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/UIDelegate.h (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/UIDelegate.h 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/DumpRenderTree/mac/UIDelegate.h 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><ins>+
+#import "TestOptions.h"
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #import <Cocoa/Cocoa.h>
</span><span class="lines">@@ -39,10 +41,12 @@
</span><span class="cx"> NSPoint windowOrigin;
</span><span class="cx"> NSMutableSet *m_pendingGeolocationPermissionListeners;
</span><span class="cx"> NSTimer *m_timer;
</span><ins>+ BOOL m_enableDragDestinationActionLoad;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)resetWindowOrigin;
</span><span class="cx"> - (void)didSetMockGeolocationPermission;
</span><span class="cx"> - (int)numberOfPendingGeolocationPermissionRequests;
</span><ins>+- (void)resetToConsistentStateBeforeTesting:(const TestOptions&)options;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/UIDelegate.mm (215188 => 215189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/UIDelegate.mm 2017-04-10 17:55:50 UTC (rev 215188)
+++ trunk/Tools/DumpRenderTree/mac/UIDelegate.mm 2017-04-10 17:58:58 UTC (rev 215189)
</span><span class="lines">@@ -57,6 +57,11 @@
</span><span class="cx"> windowOrigin = NSZeroPoint;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)resetToConsistentStateBeforeTesting:(const TestOptions&)options
+{
+ m_enableDragDestinationActionLoad = options.enableDragDestinationActionLoad;
+}
+
</ins><span class="cx"> - (void)webView:(WebView *)sender setFrame:(NSRect)frame
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Do we need to resize an NSWindow too?
</span><span class="lines">@@ -388,6 +393,18 @@
</span><span class="cx"> [resultListener chooseFilename:[filePaths firstObject]];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+
+- (NSUInteger)webView:(WebView *)webView dragDestinationActionMaskForDraggingInfo:(id <NSDraggingInfo>)draggingInfo
+{
+ WebDragDestinationAction actions = WebDragDestinationActionAny;
+ if (!m_enableDragDestinationActionLoad)
+ actions &= ~WebDragDestinationActionLoad;
+ return actions;
+}
+
+#endif
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>