<!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>[212267] trunk/Source/WebCore</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/212267">212267</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2017-02-13 17:44:31 -0800 (Mon, 13 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify DragController::startDrag
https://bugs.webkit.org/show_bug.cgi?id=168240
Reviewed by Tim Horton.
Use early returns instead of assigning to a variable that's returned at the end of the function.
* page/DragController.cpp:
(WebCore::DragController::startDrag):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212266 => 212267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-14 01:32:37 UTC (rev 212266)
+++ trunk/Source/WebCore/ChangeLog 2017-02-14 01:44:31 UTC (rev 212267)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-13 Anders Carlsson <andersca@apple.com>
+
+ Simplify DragController::startDrag
+ https://bugs.webkit.org/show_bug.cgi?id=168240
+
+ Reviewed by Tim Horton.
+
+ Use early returns instead of assigning to a variable that's returned at the end of the function.
+
+ * page/DragController.cpp:
+ (WebCore::DragController::startDrag):
+
</ins><span class="cx"> 2017-02-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> The current frame of an image should not deleted if another frame is asynchronously being decoded
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (212266 => 212267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-02-14 01:32:37 UTC (rev 212266)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-14 01:44:31 UTC (rev 212267)
</span><span class="lines">@@ -813,8 +813,6 @@
</span><span class="cx"> m_dragOffset = dragImageOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool startedDrag = true; // optimism - we almost always manage to start the drag
-
</del><span class="cx"> ASSERT(state.source);
</span><span class="cx"> Element& element = *state.source;
</span><span class="cx">
</span><span class="lines">@@ -823,7 +821,6 @@
</span><span class="cx"> if (state.type == DragSourceActionSelection) {
</span><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="cx"> // FIXME: This entire block is almost identical to the code in Editor::copy, and the code should be shared.
</span><del>-
</del><span class="cx"> RefPtr<Range> selectionRange = src.selection().toNormalizedRange();
</span><span class="cx"> ASSERT(selectionRange);
</span><span class="cx">
</span><span class="lines">@@ -861,10 +858,15 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, dragImageBounds, dataTransfer, src, false);
</span><del>- } else if (!src.document()->securityOrigin().canDisplay(linkURL)) {
</del><ins>+ return true;
+ }
+
+ if (!src.document()->securityOrigin().canDisplay(linkURL)) {
</ins><span class="cx"> src.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Not allowed to drag local resource: " + linkURL.stringCenterEllipsizedToLength());
</span><del>- startedDrag = false;
- } else if (!imageURL.isEmpty() && image && !image->isNull() && (m_dragSourceAction & DragSourceActionImage)) {
</del><ins>+ return false;
+ }
+
+ if (!imageURL.isEmpty() && image && !image->isNull() && (m_dragSourceAction & DragSourceActionImage)) {
</ins><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><span class="lines">@@ -885,7 +887,10 @@
</span><span class="cx"> // DHTML defined drag image
</span><span class="cx"> doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
</span><span class="cx"> }
</span><del>- } else if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
</del><ins>+ return true;
+ }
+
+ if (!linkURL.isEmpty() && (m_dragSourceAction & DragSourceActionLink)) {
</ins><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="cx"> // Simplify whitespace so the title put on the dataTransfer resembles what the user sees
</span><span class="cx"> // on the web page. This includes replacing newlines with spaces.
</span><span class="lines">@@ -920,8 +925,12 @@
</span><span class="cx"> dragImage = DragImage { scaleDragImage(dragImage.get(), FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor())) };
</span><span class="cx"> }
</span><span class="cx"> doSystemDrag(WTFMove(dragImage), dragLoc, mouseDraggedPoint, { }, dataTransfer, src, true);
</span><ins>+
+ return true;
+ }
+
</ins><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><del>- } else if (!attachmentURL.isEmpty() && (m_dragSourceAction & DragSourceActionAttachment)) {
</del><ins>+ if (!attachmentURL.isEmpty() && (m_dragSourceAction & DragSourceActionAttachment)) {
</ins><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="cx"> m_draggingAttachmentURL = attachmentURL;
</span><span class="cx"> selectElement(element);
</span><span class="lines">@@ -936,21 +945,18 @@
</span><span class="cx"> m_dragOffset = IntPoint(dragOrigin.x() - dragLoc.x(), dragOrigin.y() - dragLoc.y());
</span><span class="cx"> }
</span><span class="cx"> doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
</span><ins>+ return true;
+ }
</ins><span class="cx"> #endif
</span><del>- } else if (state.type == DragSourceActionDHTML) {
- if (dragImage) {
- ASSERT(m_dragSourceAction & DragSourceActionDHTML);
- m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer);
- doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
- } else
- startedDrag = false;
- } else {
- // draggableElement() determined an image or link node was draggable, but it turns out the
- // image or link had no URL, so there is nothing to drag.
- startedDrag = false;
</del><ins>+
+ if (state.type == DragSourceActionDHTML && dragImage) {
+ ASSERT(m_dragSourceAction & DragSourceActionDHTML);
+ m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer);
+ doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return startedDrag;
</del><ins>+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, DataTransfer& dataTransfer, Frame& frame, IntPoint& dragImageOffset)
</span></span></pre>
</div>
</div>
</body>
</html>