Diff
Modified: trunk/Source/WebCore/ChangeLog (174057 => 174058)
--- 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)
@@ -1,3 +1,22 @@
+2014-09-29 Carlos Garcia Campos <[email protected]>
+
+ [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):
+
2014-09-02 Sergio Villar Senin <[email protected]>
[CSS Grid Layout] Handle percentages of indefinite sizes in minmax() and grid-auto-*
Modified: trunk/Source/WebCore/PlatformGTK.cmake (174057 => 174058)
--- 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)
@@ -212,8 +212,6 @@
platform/graphics/gtk/IconGtk.cpp
platform/graphics/gtk/ImageBufferGtk.cpp
platform/graphics/gtk/ImageGtk.cpp
- platform/graphics/gtk/IntPointGtk.cpp
- platform/graphics/gtk/IntRectGtk.cpp
platform/gtk/ClipboardUtilitiesGtk.cpp
platform/gtk/ContextMenuGtk.cpp
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (174057 => 174058)
--- 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)
@@ -47,8 +47,6 @@
#if PLATFORM(WIN)
typedef struct tagPOINT POINT;
typedef struct tagPOINTS POINTS;
-#elif PLATFORM(GTK)
-typedef struct _GdkPoint GdkPoint;
#endif
namespace WebCore {
@@ -120,9 +118,6 @@
operator POINT() const;
IntPoint(const POINTS&);
operator POINTS() const;
-#elif PLATFORM(GTK)
- IntPoint(const GdkPoint&);
- operator GdkPoint() const;
#elif PLATFORM(EFL)
explicit IntPoint(const Evas_Point&);
operator Evas_Point() const;
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (174057 => 174058)
--- 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)
@@ -49,11 +49,7 @@
#if PLATFORM(WIN)
typedef struct tagRECT RECT;
-#elif PLATFORM(GTK)
-#ifdef GTK_API_VERSION_2
-typedef struct _GdkRectangle GdkRectangle;
#endif
-#endif
#if USE(CAIRO)
typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
@@ -171,11 +167,6 @@
#if PLATFORM(WIN)
IntRect(const RECT&);
operator RECT() const;
-#elif PLATFORM(GTK)
-#ifdef GTK_API_VERSION_2
- IntRect(const GdkRectangle&);
- operator GdkRectangle() const;
-#endif
#elif PLATFORM(EFL)
explicit IntRect(const Eina_Rectangle&);
operator Eina_Rectangle() const;
Deleted: trunk/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp (174057 => 174058)
--- 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)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007 Alp Toker <[email protected]>
- *
- * 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
Deleted: trunk/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp (174057 => 174058)
--- 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)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2007 Alp Toker <[email protected]>
- *
- * 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
Modified: trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp (174057 => 174058)
--- 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)
@@ -90,7 +90,7 @@
gtk_widget_get_allocation(m_widget, &allocation);
translatedRect.move(allocation.x, allocation.y);
- GdkRectangle gdkCursorRect = cursorRect;
+ GdkRectangle gdkCursorRect = { cursorRect.x(), cursorRect.y(), cursorRect.width(), cursorRect.height() };
gtk_im_context_set_cursor_location(m_context.get(), &gdkCursorRect);
}
Modified: trunk/Tools/ChangeLog (174057 => 174058)
--- trunk/Tools/ChangeLog 2014-09-29 10:08:34 UTC (rev 174057)
+++ trunk/Tools/ChangeLog 2014-09-29 11:54:52 UTC (rev 174058)
@@ -1,3 +1,13 @@
+2014-09-29 Carlos Garcia Campos <[email protected]>
+
+ [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.
+
2014-09-28 Myles C. Maxfield <[email protected]>
Allow webkit-patch upload to respect the --directory argument with git checkouts
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (174057 => 174058)
--- 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)
@@ -116,7 +116,6 @@
${WEBCORE_DIR}/platform/graphics/IntRect.cpp
${WEBCORE_DIR}/platform/graphics/IntSize.cpp
${WEBCORE_DIR}/platform/graphics/cairo/IntRectCairo.cpp
- ${WEBCORE_DIR}/platform/graphics/gtk/IntRectGtk.cpp
${WEBCORE_DIR}/platform/gtk/GtkInputMethodFilter.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/InputMethodFilter.cpp
${TESTWEBKITAPI_DIR}/Tests/WebCore/gtk/UserAgentQuirks.cpp
