<!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>[174958] 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/174958">174958</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 07:22:52 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174328">r174328</a> - [GTK] Fix build when DRAG_SUPPORT is disabled
https://bugs.webkit.org/show_bug.cgi?id=137361
Patch by Lorenzo Tilve <ltilve@igalia.com> on 2014-10-05
Reviewed by Carlos Garcia Campos.
Flag out unbuildable code without DRAG_SUPPORT.
Source/WebCore:
* platform/gtk/GtkDragAndDropHelper.cpp:
* platform/gtk/GtkDragAndDropHelper.h:
Source/WebKit2:
* Shared/gtk/ArgumentCodersGtk.cpp:
* Shared/gtk/ArgumentCodersGtk.h:
* UIProcess/API/gtk/PageClientImpl.cpp:
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseConstructed):
* UIProcess/PageClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkDragAndDropHelpercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkDragAndDropHelperh">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2SharedgtkArgumentCodersGtkcpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2SharedgtkArgumentCodersGtkh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkPageClientImplcpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkPageClientImplh">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2UIProcessPageClienth">releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/PageClient.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 (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-10-05 Lorenzo Tilve <ltilve@igalia.com>
+
+ [GTK] Fix build when DRAG_SUPPORT is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=137361
+
+ Reviewed by Carlos Garcia Campos.
+
+ Flag out unbuildable code without DRAG_SUPPORT.
+
+ * platform/gtk/GtkDragAndDropHelper.cpp:
+ * platform/gtk/GtkDragAndDropHelper.h:
+
</ins><span class="cx"> 2014-10-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkDragAndDropHelpercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.cpp 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -19,6 +19,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GtkDragAndDropHelper.h"
</span><span class="cx">
</span><ins>+#if ENABLE(DRAG_SUPPORT)
+
</ins><span class="cx"> #include "ClipboardUtilitiesGtk.h"
</span><span class="cx"> #include "DragData.h"
</span><span class="cx"> #include "GtkUtilities.h"
</span><span class="lines">@@ -166,3 +168,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><ins>+
+#endif // ENABLE(DRAG_SUPPORT)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgtkGtkDragAndDropHelperh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/gtk/GtkDragAndDropHelper.h 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -19,6 +19,8 @@
</span><span class="cx"> #ifndef GtkDragAndDropHelper_h
</span><span class="cx"> #define GtkDragAndDropHelper_h
</span><span class="cx">
</span><ins>+#if ENABLE(DRAG_SUPPORT)
+
</ins><span class="cx"> #include "DataObjectGtk.h"
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="lines">@@ -57,4 +59,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // ENABLE(DRAG_SUPPORT)
+
</ins><span class="cx"> #endif // DataObjectGtk_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-05 Lorenzo Tilve <ltilve@igalia.com>
+
+ [GTK] Fix build when DRAG_SUPPORT is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=137361
+
+ Reviewed by Carlos Garcia Campos.
+
+ Flag out unbuildable code without DRAG_SUPPORT.
+
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseConstructed):
+ * UIProcess/PageClient.h:
+
</ins><span class="cx"> 2014-10-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -187,6 +187,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> void ArgumentCoder<DragData>::encode(ArgumentEncoder& encoder, const DragData& dragData)
</span><span class="cx"> {
</span><span class="cx"> encoder << dragData.clientPosition();
</span><span class="lines">@@ -233,6 +234,7 @@
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(DRAG_SUPPORT)
</ins><span class="cx">
</span><span class="cx"> static void encodeGKeyFile(ArgumentEncoder& encoder, GKeyFile* keyFile)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2SharedgtkArgumentCodersGtkh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -39,10 +39,12 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> template<> struct ArgumentCoder<WebCore::DragData> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const WebCore::DragData&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::DragData&);
</span><span class="cx"> };
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void encode(ArgumentEncoder&, GtkPrintSettings*);
</span><span class="cx"> bool decode(ArgumentDecoder&, GRefPtr<GtkPrintSettings>&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -268,10 +268,12 @@
</span><span class="cx"> webkitWebViewBaseUpdateTextInputState(WEBKIT_WEB_VIEW_BASE(m_viewWidget));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</span><span class="cx"> {
</span><span class="cx"> webkitWebViewBaseStartDrag(WEBKIT_WEB_VIEW_BASE(m_viewWidget), dragData, dragImage);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void PageClientImpl::handleDownloadRequest(DownloadProxy* download)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -96,7 +96,9 @@
</span><span class="cx"> virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) override;
</span><span class="cx"> virtual void getEditorCommandsForKeyEvent(const NativeWebKeyboardEvent&, const AtomicString&, Vector<WTF::String>&) override;
</span><span class="cx"> virtual void updateTextInputState() override;
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) override;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> virtual void enterAcceleratedCompositingMode(const LayerTreeContext&) override;
</span><span class="cx"> virtual void exitAcceleratedCompositingMode() override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -101,7 +101,9 @@
</span><span class="cx"> GtkClickCounter clickCounter;
</span><span class="cx"> CString tooltipText;
</span><span class="cx"> IntRect tooltipArea;
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> GtkDragAndDropHelper dragAndDropHelper;
</span><ins>+#endif
</ins><span class="cx"> DragIcon dragIcon;
</span><span class="cx"> #if !GTK_CHECK_VERSION(3, 13, 4)
</span><span class="cx"> IntSize resizerSize;
</span><span class="lines">@@ -423,7 +425,9 @@
</span><span class="cx">
</span><span class="cx"> WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(object)->priv;
</span><span class="cx"> priv->pageClient = PageClientImpl::create(viewWidget);
</span><ins>+#if ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> priv->dragAndDropHelper.setWidget(viewWidget);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && PLATFORM(X11)
</span><span class="cx"> GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/PageClient.h (174957 => 174958)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/PageClient.h 2014-10-21 14:18:02 UTC (rev 174957)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/PageClient.h 2014-10-21 14:22:52 UTC (rev 174958)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> virtual void didChangeContentSize(const WebCore::IntSize&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
</del><ins>+#if PLATFORM(GTK) && ENABLE(DRAG_SUPPORT)
</ins><span class="cx"> virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>