<!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>[212170] 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/212170">212170</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-10 18:20:21 -0800 (Fri, 10 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/212154">r212154</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/212154">r212154</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/212156">r212156</a>.
https://bugs.webkit.org/show_bug.cgi?id=168156
broke internal builds (Requested by smfr on #webkit).
Reverted changesets:
"Add a DragImage class that wraps a DragImageRef"
https://bugs.webkit.org/show_bug.cgi?id=168131
http://trac.webkit.org/changeset/212154
"Add a DragImage class that wraps a DragImageRef"
https://bugs.webkit.org/show_bug.cgi?id=168131
http://trac.webkit.org/changeset/212154
"Try to fix the iOS and Windows builds."
http://trac.webkit.org/changeset/212156</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDataTransfercpp">trunk/Source/WebCore/dom/DataTransfer.cpp</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="#trunkSourceWebCoreplatformDragImagecpp">trunk/Source/WebCore/platform/DragImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDragImageh">trunk/Source/WebCore/platform/DragImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformStaticPasteboardh">trunk/Source/WebCore/platform/StaticPasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflPasteboardEflcpp">trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardGtkcpp">trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformiosDragImageIOSmm">trunk/Source/WebCore/platform/ios/DragImageIOS.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/ChangeLog 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r212154, r212154, and r212156.
+ https://bugs.webkit.org/show_bug.cgi?id=168156
+
+ broke internal builds (Requested by smfr on #webkit).
+
+ Reverted changesets:
+
+ "Add a DragImage class that wraps a DragImageRef"
+ https://bugs.webkit.org/show_bug.cgi?id=168131
+ http://trac.webkit.org/changeset/212154
+
+ "Add a DragImage class that wraps a DragImageRef"
+ https://bugs.webkit.org/show_bug.cgi?id=168131
+ http://trac.webkit.org/changeset/212154
+
+ "Try to fix the iOS and Windows builds."
+ http://trac.webkit.org/changeset/212156
+
</ins><span class="cx"> 2017-02-10 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the !ENABLE(WEBGL) build
</span></span></pre></div>
<a id="trunkSourceWebCoredomDataTransfercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -283,11 +283,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> IntPoint computedHotSpot;
</span><del>- auto computedImage = DragImage { createDragImage(computedHotSpot) };
</del><ins>+ DragImageRef computedImage = createDragImage(computedHotSpot);
</ins><span class="cx"> if (!computedImage)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_pasteboard->setDragImage(WTFMove(computedImage), computedHotSpot);
</del><ins>+ m_pasteboard->setDragImage(computedImage, computedHotSpot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCorepageDragControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DragController.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/page/DragController.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -772,13 +772,11 @@
</span><span class="cx"> else
</span><span class="cx"> sourceContainsHitNode = state.source->containsIncludingShadowDOM(hitTestResult.innerNode());
</span><span class="cx">
</span><del>- if (!sourceContainsHitNode) {
</del><ins>+ if (!sourceContainsHitNode)
</ins><span class="cx"> // The original node being dragged isn't under the drag origin anymore... maybe it was
</span><span class="cx"> // hidden or moved out from under the cursor. Regardless, we don't want to start a drag on
</span><span class="cx"> // something that's not actually under the drag origin.
</span><span class="cx"> return false;
</span><del>- }
-
</del><span class="cx"> URL linkURL = hitTestResult.absoluteLinkURL();
</span><span class="cx"> URL imageURL = hitTestResult.absoluteImageURL();
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="lines">@@ -791,7 +789,7 @@
</span><span class="cx"> m_draggingImageURL = URL();
</span><span class="cx"> m_sourceDragOperation = srcOp;
</span><span class="cx">
</span><del>- DragImage dragImage;
</del><ins>+ DragImageRef dragImage = nullptr;
</ins><span class="cx"> IntPoint dragLoc(0, 0);
</span><span class="cx"> IntPoint dragImageOffset(0, 0);
</span><span class="cx">
</span><span class="lines">@@ -799,7 +797,7 @@
</span><span class="cx">
</span><span class="cx"> DataTransfer& dataTransfer = *state.dataTransfer;
</span><span class="cx"> if (state.type == DragSourceActionDHTML)
</span><del>- dragImage = DragImage { dataTransfer.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">@@ -852,7 +850,7 @@
</span><span class="cx"> }
</span><span class="cx"> m_client.willPerformDragSourceAction(DragSourceActionSelection, dragOrigin, dataTransfer);
</span><span class="cx"> if (!dragImage) {
</span><del>- dragImage = DragImage { dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha) };
</del><ins>+ dragImage = dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha);
</ins><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><span class="lines">@@ -860,7 +858,7 @@
</span><span class="cx"> if (!dragImage)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, dragImageBounds, dataTransfer, src, false);
</del><ins>+ doSystemDrag(dragImage, dragLoc, dragOrigin, dragImageBounds, dataTransfer, src, false);
</ins><span class="cx"> } else if (!src.document()->securityOrigin().canDisplay(linkURL)) {
</span><span class="cx"> src.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Not allowed to drag local resource: " + linkURL.stringCenterEllipsizedToLength());
</span><span class="cx"> startedDrag = false;
</span><span class="lines">@@ -883,7 +881,7 @@
</span><span class="cx"> doImageDrag(element, dragOrigin, hitTestResult.imageRect(), dataTransfer, src, m_dragOffset);
</span><span class="cx"> } else {
</span><span class="cx"> // DHTML defined drag image
</span><del>- doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, 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><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="lines">@@ -912,14 +910,14 @@
</span><span class="cx">
</span><span class="cx"> m_client.willPerformDragSourceAction(DragSourceActionLink, dragOrigin, dataTransfer);
</span><span class="cx"> if (!dragImage) {
</span><del>- dragImage = DragImage { createDragImageForLink(linkURL, hitTestResult.textContent(), src.settings().fontRenderingMode()) };
- IntSize size = dragImageSize(dragImage.get());
</del><ins>+ dragImage = createDragImageForLink(linkURL, hitTestResult.textContent(), src.settings().fontRenderingMode());
+ IntSize size = dragImageSize(dragImage);
</ins><span class="cx"> m_dragOffset = IntPoint(-size.width() / 2, -LinkDragBorderInset);
</span><span class="cx"> dragLoc = IntPoint(mouseDraggedPoint.x() + m_dragOffset.x(), mouseDraggedPoint.y() + m_dragOffset.y());
</span><span class="cx"> // Later code expects the drag image to be scaled by device's scale factor.
</span><del>- dragImage = DragImage { scaleDragImage(dragImage.get(), FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor())) };
</del><ins>+ dragImage = scaleDragImage(dragImage, FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor()));
</ins><span class="cx"> }
</span><del>- doSystemDrag(WTFMove(dragImage), dragLoc, mouseDraggedPoint, { }, dataTransfer, src, true);
</del><ins>+ doSystemDrag(dragImage, dragLoc, mouseDraggedPoint, { }, dataTransfer, src, true);
</ins><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> } else if (!attachmentURL.isEmpty() && (m_dragSourceAction & DragSourceActionAttachment)) {
</span><span class="cx"> if (!dataTransfer.pasteboard().hasData()) {
</span><span class="lines">@@ -931,17 +929,17 @@
</span><span class="cx"> m_client.willPerformDragSourceAction(DragSourceActionAttachment, dragOrigin, dataTransfer);
</span><span class="cx">
</span><span class="cx"> if (!dragImage) {
</span><del>- dragImage = DragImage { dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha) };
</del><ins>+ dragImage = dissolveDragImageToFraction(createDragImageForSelection(src), DragImageAlpha);
</ins><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(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
</del><ins>+ doSystemDrag(dragImage, dragLoc, dragOrigin, { }, dataTransfer, src, false);
</ins><span class="cx"> #endif
</span><span class="cx"> } else if (state.type == DragSourceActionDHTML) {
</span><span class="cx"> if (dragImage) {
</span><span class="cx"> ASSERT(m_dragSourceAction & DragSourceActionDHTML);
</span><span class="cx"> m_client.willPerformDragSourceAction(DragSourceActionDHTML, dragOrigin, dataTransfer);
</span><del>- doSystemDrag(WTFMove(dragImage), dragLoc, dragOrigin, { }, dataTransfer, src, false);
</del><ins>+ 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">@@ -950,6 +948,8 @@
</span><span class="cx"> startedDrag = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (dragImage)
+ deleteDragImage(dragImage);
</ins><span class="cx"> return startedDrag;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx"> void DragController::doImageDrag(Element& element, const IntPoint& dragOrigin, const IntRect& layoutRect, DataTransfer& dataTransfer, Frame& frame, IntPoint& dragImageOffset)
</span><span class="cx"> {
</span><span class="cx"> IntPoint mouseDownPoint = dragOrigin;
</span><del>- DragImage dragImage;
</del><ins>+ DragImageRef dragImage = nullptr;
</ins><span class="cx"> IntPoint scaledOrigin;
</span><span class="cx">
</span><span class="cx"> if (!element.renderer())
</span><span class="lines">@@ -966,13 +966,13 @@
</span><span class="cx">
</span><span class="cx"> Image* image = getImage(element);
</span><span class="cx"> if (image && image->size().height() * image->size().width() <= MaxOriginalImageArea
</span><del>- && (dragImage = DragImage { createDragImageFromImage(image, element.renderer() ? orientationDescription : ImageOrientationDescription()) })) {
</del><ins>+ && (dragImage = createDragImageFromImage(image, element.renderer() ? orientationDescription : ImageOrientationDescription()))) {
</ins><span class="cx">
</span><del>- dragImage = DragImage { fitDragImageToMaxSize(dragImage.get(), layoutRect.size(), maxDragImageSize()) };
- IntSize fittedSize = dragImageSize(dragImage.get());
</del><ins>+ dragImage = fitDragImageToMaxSize(dragImage, layoutRect.size(), maxDragImageSize());
+ IntSize fittedSize = dragImageSize(dragImage);
</ins><span class="cx">
</span><del>- dragImage = DragImage { scaleDragImage(dragImage.get(), FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor())) };
- dragImage = DragImage { dissolveDragImageToFraction(dragImage.get(), DragImageAlpha) };
</del><ins>+ dragImage = scaleDragImage(dragImage, FloatSize(m_page.deviceScaleFactor(), m_page.deviceScaleFactor()));
+ dragImage = dissolveDragImageToFraction(dragImage, DragImageAlpha);
</ins><span class="cx">
</span><span class="cx"> // Properly orient the drag image and orient it differently if it's smaller than the original.
</span><span class="cx"> float scale = fittedSize.width() / (float)layoutRect.width();
</span><span class="lines">@@ -986,9 +986,9 @@
</span><span class="cx"> scaledOrigin = IntPoint((int)(dx + 0.5), (int)(dy + 0.5));
</span><span class="cx"> } else {
</span><span class="cx"> if (CachedImage* cachedImage = getCachedImage(element)) {
</span><del>- dragImage = DragImage { createDragImageIconForCachedImageFilename(cachedImage->response().suggestedFilename()) };
</del><ins>+ dragImage = createDragImageIconForCachedImageFilename(cachedImage->response().suggestedFilename());
</ins><span class="cx"> if (dragImage)
</span><del>- scaledOrigin = IntPoint(DragIconRightInset - dragImageSize(dragImage.get()).width(), DragIconBottomInset);
</del><ins>+ scaledOrigin = IntPoint(DragIconRightInset - dragImageSize(dragImage).width(), DragIconBottomInset);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -996,10 +996,12 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> dragImageOffset = mouseDownPoint + scaledOrigin;
</span><del>- doSystemDrag(WTFMove(dragImage), dragImageOffset, dragOrigin, element.boundsInRootViewSpace(), dataTransfer, frame, false);
</del><ins>+ doSystemDrag(dragImage, dragImageOffset, dragOrigin, element.boundsInRootViewSpace(), dataTransfer, frame, false);
+
+ deleteDragImage(dragImage);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void DragController::doSystemDrag(DragImage image, const IntPoint& dragLoc, const IntPoint& eventPos, const IntRect& dragImageBounds, DataTransfer& dataTransfer, Frame& frame, bool forLink)
</del><ins>+void DragController::doSystemDrag(DragImageRef image, const IntPoint& dragLoc, const IntPoint& eventPos, const IntRect& dragImageBounds, DataTransfer& dataTransfer, Frame& frame, bool forLink)
</ins><span class="cx"> {
</span><span class="cx"> FloatPoint dragImageAnchor = { 0.5, 0.5 };
</span><span class="cx"> if (!dragImageBounds.isEmpty()) {
</span><span class="lines">@@ -1012,7 +1014,7 @@
</span><span class="cx"> // Protect this frame and view, as a load may occur mid drag and attempt to unload this frame
</span><span class="cx"> Ref<MainFrame> frameProtector(m_page.mainFrame());
</span><span class="cx"> RefPtr<FrameView> viewProtector = frameProtector->view();
</span><del>- m_client.startDrag(image.get(), viewProtector->rootViewToContents(frame.view()->contentsToRootView(dragLoc)), viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), dragImageAnchor, dataTransfer, frameProtector.get(), forLink);
</del><ins>+ m_client.startDrag(image, viewProtector->rootViewToContents(frame.view()->contentsToRootView(dragLoc)), viewProtector->rootViewToContents(frame.view()->contentsToRootView(eventPos)), dragImageAnchor, 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 (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DragController.h 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/page/DragController.h 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> void mouseMovedIntoDocument(Document*);
</span><span class="cx">
</span><span class="cx"> void doImageDrag(Element&, const IntPoint&, const IntRect&, DataTransfer&, Frame&, IntPoint&);
</span><del>- void doSystemDrag(DragImage, const IntPoint&, const IntPoint&, const IntRect& dragImageBounds, DataTransfer&, Frame&, bool forLink);
</del><ins>+ void doSystemDrag(DragImageRef, const IntPoint&, const IntPoint&, const IntRect& dragImageBounds, DataTransfer&, Frame&, bool forLink);
</ins><span class="cx"> void cleanupAfterSystemDrag();
</span><span class="cx"> void declareAndWriteDragImage(DataTransfer&, Element&, const URL&, const String& label);
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/DragImage.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -217,36 +217,5 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-DragImage::DragImage()
- : m_dragImageRef { nullptr }
-{
-}
-
-DragImage::DragImage(DragImageRef dragImageRef)
- : m_dragImageRef { dragImageRef }
-{
-}
-
-DragImage::DragImage(DragImage&& other)
- : m_dragImageRef { std::exchange(other.m_dragImageRef, nullptr) }
-{
-}
-
-DragImage& DragImage::operator=(DragImage&& other)
-{
- if (m_dragImageRef)
- deleteDragImage(m_dragImageRef);
-
- m_dragImageRef = std::exchange(other.m_dragImageRef, nullptr);
-
- return *this;
-}
-
-DragImage::~DragImage()
-{
- if (m_dragImageRef)
- deleteDragImage(m_dragImageRef);
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDragImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DragImage.h (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DragImage.h 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/DragImage.h 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -90,20 +90,4 @@
</span><span class="cx"> DragImageRef createDragImageForLink(URL&, const String& label, FontRenderingMode);
</span><span class="cx"> void deleteDragImage(DragImageRef);
</span><span class="cx">
</span><del>-class DragImage final {
-public:
- DragImage();
- explicit DragImage(DragImageRef);
- DragImage(DragImage&&);
- ~DragImage();
-
- DragImage& operator=(DragImage&&);
-
- explicit operator bool() const { return !!m_dragImageRef; }
- DragImageRef get() const { return m_dragImageRef; }
-
-private:
- DragImageRef m_dragImageRef;
-};
-
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef Pasteboard_h
+#define Pasteboard_h
</ins><span class="cx">
</span><span class="cx"> #include "DragImage.h"
</span><span class="cx"> #include "URL.h"
</span><span class="lines">@@ -181,7 +182,7 @@
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop();
</span><span class="cx"> WEBCORE_EXPORT static std::unique_ptr<Pasteboard> createForDragAndDrop(const DragData&);
</span><span class="cx">
</span><del>- virtual void setDragImage(DragImage, const IntPoint& hotSpot);
</del><ins>+ virtual void setDragImage(DragImageRef, const IntPoint& hotSpot);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -261,3 +262,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // Pasteboard_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformStaticPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/StaticPasteboard.h (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/StaticPasteboard.h 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/StaticPasteboard.h 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> void writePasteboard(const Pasteboard&) final { }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>- void setDragImage(DragImage, const IntPoint&) final { }
</del><ins>+ void setDragImage(DragImageRef, const IntPoint&) final { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflPasteboardEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void Pasteboard::setDragImage(DragImage, const IntPoint&)
</del><ins>+void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/gtk/PasteboardGtk.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void Pasteboard::setDragImage(DragImage, const IntPoint&)
</del><ins>+void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosDragImageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -36,12 +36,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void deleteDragImage(RetainPtr<CGImageRef>)
-{
- // Since this is a RetainPtr, there's nothing additional we need to do to
- // delete it. It will be released when it falls out of scope.
-}
-
</del><span class="cx"> // FIXME: fix signature of dragImageSize() to avoid copying the argument.
</span><span class="cx"> IntSize dragImageSize(RetainPtr<CGImageRef> image)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPasteboardMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/PasteboardMac.mm (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/mac/PasteboardMac.mm 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void Pasteboard::setDragImage(DragImage image, const IntPoint& location)
</del><ins>+void Pasteboard::setDragImage(DragImageRef image, const IntPoint& location)
</ins><span class="cx"> {
</span><span class="cx"> // Don't allow setting the drag image if someone kept a pasteboard and is trying to set the image too late.
</span><span class="cx"> if (m_changeCount != platformStrategies()->pasteboardStrategy()->changeCount(m_pasteboardName))
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx">
</span><span class="cx"> // Dashboard wants to be able to set the drag image during dragging, but Cocoa does not allow this.
</span><span class="cx"> // Instead we must drop down to the CoreGraphics API.
</span><del>- wkSetDragImage(image.get().get(), location);
</del><ins>+ wkSetDragImage(image.get(), location);
</ins><span class="cx">
</span><span class="cx"> // Hack: We must post an event to wake up the NSDragManager, which is sitting in a nextEvent call
</span><span class="cx"> // up the stack from us because the CoreFoundation drag manager does not use the run loop by itself.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (212169 => 212170)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2017-02-11 01:27:21 UTC (rev 212169)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2017-02-11 02:20:21 UTC (rev 212170)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><del>-void Pasteboard::setDragImage(DragImage, const IntPoint&)
</del><ins>+void Pasteboard::setDragImage(DragImageRef, const IntPoint&)
</ins><span class="cx"> {
</span><span class="cx"> // Do nothing in Windows.
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>