<!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>[182384] releases/WebKitGTK/webkit-2.6/Source</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/182384">182384</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-06 01:43:57 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182175">r182175</a> - [GTK] DnD icon/widget has odd background
https://bugs.webkit.org/show_bug.cgi?id=143217
Reviewed by Martin Robinson.
Source/WebCore:
Remove DragIcon class since it's no longer needed with GTK+3 and
the GTK+2 code there is unused. GTK+ knows what to do with a cairo
surface, I guess we migrated the GTK+2 code to GTK+3 without
realizing that using the surface was enough.
* PlatformGTK.cmake:
* platform/gtk/DragIcon.cpp: Removed.
* platform/gtk/DragIcon.h: Removed.
Source/WebKit2:
Use gtk_drag_set_icon_surface() to set the drag icon image,
instead of DragIcon class.
* UIProcess/API/gtk/WebKitWebView.cpp:
* UIProcess/gtk/DragAndDropHandler.cpp:
(WebKit::DragAndDropHandler::startDrag):
* UIProcess/gtk/DragAndDropHandler.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkDragAndDropHandlercpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkDragAndDropHandlerh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkDragIconcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkDragIconh">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] DnD icon/widget has odd background
+ https://bugs.webkit.org/show_bug.cgi?id=143217
+
+ Reviewed by Martin Robinson.
+
+ Remove DragIcon class since it's no longer needed with GTK+3 and
+ the GTK+2 code there is unused. GTK+ knows what to do with a cairo
+ surface, I guess we migrated the GTK+2 code to GTK+3 without
+ realizing that using the surface was enough.
+
+ * PlatformGTK.cmake:
+ * platform/gtk/DragIcon.cpp: Removed.
+ * platform/gtk/DragIcon.h: Removed.
+
</ins><span class="cx"> 2015-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] GMutexLocker build issue
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/PlatformGTK.cmake 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -218,7 +218,6 @@
</span><span class="cx"> platform/gtk/CursorGtk.cpp
</span><span class="cx"> platform/gtk/DataObjectGtk.cpp
</span><span class="cx"> platform/gtk/DragDataGtk.cpp
</span><del>- platform/gtk/DragIcon.cpp
</del><span class="cx"> platform/gtk/DragImageGtk.cpp
</span><span class="cx"> platform/gtk/GRefPtrGtk.cpp
</span><span class="cx"> platform/gtk/GtkClickCounter.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkDragIconcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.cpp (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.cpp 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.cpp 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -1,130 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "DragIcon.h"
-#include "GdkCairoUtilities.h"
-
-#include <gtk/gtk.h>
-
-namespace WebCore {
-
-#ifdef GTK_API_VERSION_2
-static gboolean dragIconWindowDrawEventCallback(GtkWidget*, GdkEventExpose* event, DragIcon* icon)
-{
- RefPtr<cairo_t> context = adoptRef(gdk_cairo_create(event->window));
- icon->draw(context.get());
- return TRUE;
-}
-#else
-static gboolean dragIconWindowDrawEventCallback(GtkWidget*, cairo_t* context, DragIcon* icon)
-{
- if (!gdk_cairo_get_clip_rectangle(context, 0))
- return FALSE;
- icon->draw(context);
- return TRUE;
-}
-#endif // GTK_API_VERSION_2
-
-DragIcon::DragIcon()
- : isComposited(gdk_screen_is_composited(gdk_screen_get_default()))
- , m_window(0)
-{
- if (!isComposited)
- return;
-
- m_window = gtk_window_new(GTK_WINDOW_POPUP);
-#ifdef GTK_API_VERSION_2
- g_signal_connect(m_window, "expose-event", G_CALLBACK(dragIconWindowDrawEventCallback), this);
-#else
- g_signal_connect(m_window, "draw", G_CALLBACK(dragIconWindowDrawEventCallback), this);
-#endif
-
- // This strategy originally comes from Chromium: src/chrome/browser/gtk/tab_contents_drag_source.cc
- GdkScreen* screen = gtk_widget_get_screen(m_window);
-#ifdef GTK_API_VERSION_2
- GdkColormap* rgba = gdk_screen_get_rgba_colormap(screen);
- if (rgba)
- gtk_widget_set_colormap(m_window, rgba);
-#else
- GdkVisual* visual = gdk_screen_get_rgba_visual(screen);
- if (!visual)
- visual = gdk_screen_get_system_visual(screen);
- gtk_widget_set_visual(m_window, visual);
-#endif // GTK_API_VERSION_2
-}
-
-DragIcon::~DragIcon()
-{
- if (m_window)
- gtk_widget_destroy(m_window);
-}
-
-void DragIcon::draw(cairo_t* context)
-{
- cairo_rectangle(context, 0, 0,
- cairo_image_surface_get_width(m_image.get()),
- cairo_image_surface_get_height(m_image.get()));
- cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
- cairo_set_source_surface(context, m_image.get(), 0, 0);
- cairo_fill(context);
-}
-
-void DragIcon::setImage(cairo_surface_t* image)
-{
- ASSERT(image);
- m_image = image;
- m_imageSize = IntSize(cairo_image_surface_get_width(image), cairo_image_surface_get_height(image));
- if (isComposited) {
- gtk_window_resize(GTK_WINDOW(m_window), m_imageSize.width(), m_imageSize.height());
- return;
- }
-
-#ifdef GTK_API_VERSION_2
- m_pixbuf = adoptGRef(cairoSurfaceToGdkPixbuf(image));
-#endif
-}
-
-void DragIcon::useForDrag(GdkDragContext* context)
-{
- IntPoint hotspot(m_imageSize);
- hotspot.scale(0.5, 0.5);
- useForDrag(context, hotspot);
-}
-
-void DragIcon::useForDrag(GdkDragContext* context, const IntPoint& hotspot)
-{
- if (isComposited) {
- gtk_drag_set_icon_widget(context, m_window, hotspot.x(), hotspot.y());
- return;
- }
-#ifdef GTK_API_VERSION_2
- gtk_drag_set_icon_pixbuf(context, m_pixbuf.get(), hotspot.x(), hotspot.y());
-#else
- gtk_drag_set_icon_surface(context, m_image.get());
-#endif
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkDragIconh"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.h (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.h 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/DragIcon.h 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DragIcon_h
-#define DragIcon_h
-
-#include "IntPoint.h"
-#include <RefPtrCairo.h>
-#include <wtf/gobject/GRefPtr.h>
-
-namespace WebCore {
-
-class DragIcon {
-public:
- DragIcon();
- virtual ~DragIcon();
-
- void draw(cairo_t*);
- void setImage(cairo_surface_t*);
- void useForDrag(GdkDragContext*);
- void useForDrag(GdkDragContext*, const IntPoint& hotspot);
-
-private:
- bool isComposited;
- GtkWidget* m_window;
- RefPtr<cairo_surface_t> m_image;
- IntSize m_imageSize;
-#ifdef GTK_API_VERSION_2
- GRefPtr<GdkPixbuf> m_pixbuf;
-#endif
-};
-
-}
-
-#endif // DragIcon_h
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] DnD icon/widget has odd background
+ https://bugs.webkit.org/show_bug.cgi?id=143217
+
+ Reviewed by Martin Robinson.
+
+ Use gtk_drag_set_icon_surface() to set the drag icon image,
+ instead of DragIcon class.
+
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ (WebKit::DragAndDropHandler::startDrag):
+ * UIProcess/gtk/DragAndDropHandler.h:
+
</ins><span class="cx"> 2015-04-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix typo in API doc comment.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> #include "WebKitWindowPropertiesPrivate.h"
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><del>-#include <WebCore/DragIcon.h>
</del><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> #include <WebCore/GUniquePtrSoup.h>
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><del>-#include <WebCore/DragIcon.h>
</del><span class="cx"> #include <WebCore/GRefPtrGtk.h>
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/PasteboardHelper.h>
</span><span class="lines">@@ -121,8 +120,9 @@
</span><span class="cx">
</span><span class="cx"> if (dragImage) {
</span><span class="cx"> RefPtr<cairo_surface_t> image(dragImage->createCairoSurface());
</span><del>- m_dragIcon.setImage(image.get());
- m_dragIcon.useForDrag(context);
</del><ins>+ // Use the center of the drag image as hotspot.
+ cairo_surface_set_device_offset(image.get(), -cairo_image_surface_get_width(image.get()) / 2, -cairo_image_surface_get_height(image.get()) / 2);
+ gtk_drag_set_icon_surface(context, image.get());
</ins><span class="cx"> } else
</span><span class="cx"> gtk_drag_set_icon_default(context);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessgtkDragAndDropHandlerh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h (182383 => 182384)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2015-04-06 08:37:35 UTC (rev 182383)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.h 2015-04-06 08:43:57 UTC (rev 182384)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx">
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><del>-#include <WebCore/DragIcon.h>
</del><ins>+#include <WebCore/IntPoint.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">@@ -38,7 +38,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class DragData;
</span><del>-class IntPoint;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -75,7 +74,6 @@
</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><del>- WebCore::DragIcon m_dragIcon;
</del><span class="cx"> HashMap<GdkDragContext*, std::unique_ptr<DroppingContext>> m_droppingContexts;
</span><span class="cx"> HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk>> m_draggingDataObjects;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>