<!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>[174058] trunk</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/174058">174058</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-29 04:54:52 -0700 (Mon, 29 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Remove IntPointGtk.cpp and IntRectGtk.cpp
https://bugs.webkit.org/show_bug.cgi?id=137209
Reviewed by Philippe Normand.
Source/WebCore:
IntPointGtk is unused and IntRectGtk is only required by GTK+2 and
only used when building with GTK+2 in GtkInputMethodFilter.cpp
that can be easily replaced.
* PlatformGTK.cmake:
* platform/graphics/IntPoint.h:
* platform/graphics/IntRect.h:
* platform/graphics/gtk/IntPointGtk.cpp: Removed.
* platform/graphics/gtk/IntRectGtk.cpp: Removed.
* platform/gtk/GtkInputMethodFilter.cpp:
(WebCore::GtkInputMethodFilter::setCursorRect):
Tools:
* TestWebKitAPI/PlatformGTK.cmake: Remove unneeded IntRectGtk.cpp
from the WebCore test sources.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointh">trunk/Source/WebCore/platform/graphics/IntPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkInputMethodFiltercpp">trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkIntPointGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkIntRectGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/ChangeLog 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Remove IntPointGtk.cpp and IntRectGtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=137209
+
+ Reviewed by Philippe Normand.
+
+ IntPointGtk is unused and IntRectGtk is only required by GTK+2 and
+ only used when building with GTK+2 in GtkInputMethodFilter.cpp
+ that can be easily replaced.
+
+ * PlatformGTK.cmake:
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/gtk/IntPointGtk.cpp: Removed.
+ * platform/graphics/gtk/IntRectGtk.cpp: Removed.
+ * platform/gtk/GtkInputMethodFilter.cpp:
+ (WebCore::GtkInputMethodFilter::setCursorRect):
+
</ins><span class="cx"> 2014-09-02 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Handle percentages of indefinite sizes in minmax() and grid-auto-*
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -212,8 +212,6 @@
</span><span class="cx"> platform/graphics/gtk/IconGtk.cpp
</span><span class="cx"> platform/graphics/gtk/ImageBufferGtk.cpp
</span><span class="cx"> platform/graphics/gtk/ImageGtk.cpp
</span><del>- platform/graphics/gtk/IntPointGtk.cpp
- platform/graphics/gtk/IntRectGtk.cpp
</del><span class="cx">
</span><span class="cx"> platform/gtk/ClipboardUtilitiesGtk.cpp
</span><span class="cx"> platform/gtk/ContextMenuGtk.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -47,8 +47,6 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagPOINT POINT;
</span><span class="cx"> typedef struct tagPOINTS POINTS;
</span><del>-#elif PLATFORM(GTK)
-typedef struct _GdkPoint GdkPoint;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -120,9 +118,6 @@
</span><span class="cx"> operator POINT() const;
</span><span class="cx"> IntPoint(const POINTS&);
</span><span class="cx"> operator POINTS() const;
</span><del>-#elif PLATFORM(GTK)
- IntPoint(const GdkPoint&);
- operator GdkPoint() const;
</del><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> explicit IntPoint(const Evas_Point&);
</span><span class="cx"> operator Evas_Point() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/IntRect.h 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -49,11 +49,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagRECT RECT;
</span><del>-#elif PLATFORM(GTK)
-#ifdef GTK_API_VERSION_2
-typedef struct _GdkRectangle GdkRectangle;
</del><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span><span class="cx"> typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
</span><span class="lines">@@ -171,11 +167,6 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> IntRect(const RECT&);
</span><span class="cx"> operator RECT() const;
</span><del>-#elif PLATFORM(GTK)
-#ifdef GTK_API_VERSION_2
- IntRect(const GdkRectangle&);
- operator GdkRectangle() const;
-#endif
</del><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> explicit IntRect(const Eina_Rectangle&);
</span><span class="cx"> operator Eina_Rectangle() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkIntPointGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "IntPoint.h"
-
-#include <gdk/gdk.h>
-
-namespace WebCore {
-
-IntPoint::IntPoint(const GdkPoint& p)
- : m_x(p.x)
- , m_y(p.y)
-{
-}
-
-IntPoint::operator GdkPoint() const
-{
- GdkPoint p = { x(), y() };
- return p;
-}
-
-}
-
-// vim: ts=4 sw=4 et
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkIntRectGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Alp Toker <alp@atoker.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "IntRect.h"
-
-#include <gdk/gdk.h>
-
-#ifdef GTK_API_VERSION_2
-namespace WebCore {
-
-IntRect::IntRect(const GdkRectangle& r)
- : m_location(IntPoint(r.x, r.y))
- , m_size(r.width, r.height)
-{
-}
-
-IntRect::operator GdkRectangle() const
-{
- GdkRectangle r = { x(), y(), width(), height() };
- return r;
-}
-
-}
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> gtk_widget_get_allocation(m_widget, &allocation);
</span><span class="cx"> translatedRect.move(allocation.x, allocation.y);
</span><span class="cx">
</span><del>- GdkRectangle gdkCursorRect = cursorRect;
</del><ins>+ GdkRectangle gdkCursorRect = { cursorRect.x(), cursorRect.y(), cursorRect.width(), cursorRect.height() };
</ins><span class="cx"> gtk_im_context_set_cursor_location(m_context.get(), &gdkCursorRect);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Tools/ChangeLog 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-29 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Remove IntPointGtk.cpp and IntRectGtk.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=137209
+
+ Reviewed by Philippe Normand.
+
+ * TestWebKitAPI/PlatformGTK.cmake: Remove unneeded IntRectGtk.cpp
+ from the WebCore test sources.
+
</ins><span class="cx"> 2014-09-28 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow webkit-patch upload to respect the --directory argument with git checkouts
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (174057 => 174058)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-09-29 11:54:52 UTC (rev 174058)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics/IntRect.cpp
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics/IntSize.cpp
</span><span class="cx"> ${WEBCORE_DIR}/platform/graphics/cairo/IntRectCairo.cpp
</span><del>- ${WEBCORE_DIR}/platform/graphics/gtk/IntRectGtk.cpp
</del><span class="cx"> ${WEBCORE_DIR}/platform/gtk/GtkInputMethodFilter.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/InputMethodFilter.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/UserAgentQuirks.cpp
</span></span></pre>
</div>
</div>
</body>
</html>