<!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>[195812] releases/WebKitGTK/webkit-2.10/Source/WebKit2</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/195812">195812</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-29 08:53:29 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195811">r195811</a> - [GTK] WebProcess crashes when quickly attempting many DnD operations
https://bugs.webkit.org/show_bug.cgi?id=138468
Reviewed by Michael Catanzaro.
Guard all the new DnD-related code under GTK_CHECK_VERSION #if's to
make sure we don't bump the required version of GTK+ up to 3.16, and
it's buildable again with GTK+ >= 3.6.
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::DragAndDropHandler):
(WebKit::DragAndDropHandler::startDrag):
(WebKit::DragAndDropHandler::fillDragData):
(WebKit::DragAndDropHandler::finishDrag):
* UIProcess/gtk/DragAndDropHandler.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkDragAndDropHandlercpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkDragAndDropHandlerh">releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (195811 => 195812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2016-01-29 16:26:23 UTC (rev 195811)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2016-01-29 16:53:29 UTC (rev 195812)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-29 Mario Sanchez Prada <mario@endlessm.com>
+
+ [GTK] WebProcess crashes when quickly attempting many DnD operations
+ https://bugs.webkit.org/show_bug.cgi?id=138468
+
+ Reviewed by Michael Catanzaro.
+
+ Guard all the new DnD-related code under GTK_CHECK_VERSION #if's to
+ make sure we don't bump the required version of GTK+ up to 3.16, and
+ it's buildable again with GTK+ >= 3.6.
+
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::DragAndDropHandler):
+ (WebKit::DragAndDropHandler::startDrag):
+ (WebKit::DragAndDropHandler::fillDragData):
+ (WebKit::DragAndDropHandler::finishDrag):
+ * UIProcess/gtk/DragAndDropHandler.h:
+
</ins><span class="cx"> 2016-01-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.10.6 release.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (195811 => 195812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-01-29 16:26:23 UTC (rev 195811)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2016-01-29 16:53:29 UTC (rev 195812)
</span><span class="lines">@@ -44,7 +44,9 @@
</span><span class="cx">
</span><span class="cx"> DragAndDropHandler::DragAndDropHandler(WebPageProxy& page)
</span><span class="cx"> : m_page(page)
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> , m_dragContext(nullptr)
</span><ins>+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,20 +113,30 @@
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::startDrag(const DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</span><span class="cx"> {
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> m_draggingDataObject = adoptRef(dragData.platformData());
</span><ins>+ GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(m_draggingDataObject.get()));
+#else
+ RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
+ GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(dataObject.get()));
+#endif
</ins><span class="cx">
</span><del>- GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::singleton().targetListForDataObject(m_draggingDataObject.get()));
</del><span class="cx"> GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</span><del>-
</del><span class="cx"> GdkDragContext* context = gtk_drag_begin(m_page.viewWidget(), targetList.get(), dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
</span><span class="cx"> GDK_BUTTON_PRIMARY, currentEvent.get());
</span><span class="cx">
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> // WebCore::EventHandler does not support more than one DnD operation at the same time for
</span><span class="cx"> // a given page, so we should cancel any previous operation whose context we might have
</span><span class="cx"> // stored, should we receive a new startDrag event before finishing a previous DnD operation.
</span><span class="cx"> if (m_dragContext)
</span><span class="cx"> gtk_drag_cancel(m_dragContext.get());
</span><span class="cx"> m_dragContext = context;
</span><ins>+#else
+ // We don't have gtk_drag_cancel() in GTK+ < 3.16, so we use the old code.
+ // See https://bugs.webkit.org/show_bug.cgi?id=138468
+ m_draggingDataObjects.set(context, dataObject.get());
+#endif
</ins><span class="cx">
</span><span class="cx"> if (dragImage) {
</span><span class="cx"> RefPtr<cairo_surface_t> image(dragImage->createCairoSurface());
</span><span class="lines">@@ -137,6 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::fillDragData(GdkDragContext* context, GtkSelectionData* selectionData, unsigned info)
</span><span class="cx"> {
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> // This can happen when attempting to call finish drag from webkitWebViewBaseDragDataGet()
</span><span class="cx"> // for a obsolete DnD operation that got previously cancelled in startDrag().
</span><span class="cx"> if (m_dragContext.get() != context)
</span><span class="lines">@@ -144,10 +157,15 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_draggingDataObject);
</span><span class="cx"> PasteboardHelper::singleton().fillSelectionData(selectionData, info, m_draggingDataObject.get());
</span><ins>+#else
+ if (DataObjectGtk* dataObject = m_draggingDataObjects.get(context))
+ PasteboardHelper::singleton().fillSelectionData(selectionData, info, dataObject);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DragAndDropHandler::finishDrag(GdkDragContext* context)
</span><span class="cx"> {
</span><ins>+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> // This can happen when attempting to call finish drag from webkitWebViewBaseDragEnd()
</span><span class="cx"> // for a obsolete DnD operation that got previously cancelled in startDrag().
</span><span class="cx"> if (m_dragContext.get() != context)
</span><span class="lines">@@ -158,6 +176,10 @@
</span><span class="cx">
</span><span class="cx"> m_dragContext = nullptr;
</span><span class="cx"> m_draggingDataObject = nullptr;
</span><ins>+#else
+ if (!m_draggingDataObjects.remove(context))
+ return;
+#endif
</ins><span class="cx">
</span><span class="cx"> GdkDevice* device = gdk_drag_context_get_device(context);
</span><span class="cx"> int x = 0, y = 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2UIProcessgtkDragAndDropHandlerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h (195811 => 195812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-01-29 16:26:23 UTC (rev 195811)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2016-01-29 16:53:29 UTC (rev 195812)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><span class="cx"> #include <WebCore/IntPoint.h>
</span><ins>+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><span class="lines">@@ -74,9 +75,16 @@
</span><span class="cx"> WebCore::DataObjectGtk* requestDragData(GdkDragContext*, const WebCore::IntPoint& position, unsigned time);
</span><span class="cx">
</span><span class="cx"> WebPageProxy& m_page;
</span><ins>+ HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
+
+#if GTK_CHECK_VERSION(3, 16, 0)
</ins><span class="cx"> GRefPtr<GdkDragContext> m_dragContext;
</span><span class="cx"> RefPtr<WebCore::DataObjectGtk> m_draggingDataObject;
</span><del>- HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
</del><ins>+#else
+ // We don't have gtk_drag_cancel() in GTK+ < 3.16, so we use the old code.
+ // See https://bugs.webkit.org/show_bug.cgi?id=138468
+ HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk>> m_draggingDataObjects;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>