Merge r174058 - [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. Canonical link: https://commits.webkit.org/154760.73@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@174573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Oct 10, 2014 · eaef746 · eaef746
1 parent 287392f
commit eaef746
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 100 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+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):
+
 2014-09-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed. Move sources not using GTK+ from WebCorePlatformGTK_SOURCES to WebCore_SOURCES.

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
@@ -212,8 +212,6 @@ list(APPEND WebCorePlatformGTK_SOURCES
     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

diff --git a/Source/WebCore/platform/graphics/IntPoint.h b/Source/WebCore/platform/graphics/IntPoint.h
@@ -47,8 +47,6 @@ typedef struct _NSPoint NSPoint;
 #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 @@ class IntPoint {
     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;

diff --git a/Source/WebCore/platform/graphics/IntRect.h b/Source/WebCore/platform/graphics/IntRect.h
@@ -49,10 +49,6 @@ typedef struct _NSRect NSRect;
 
 #if PLATFORM(WIN)
 typedef struct tagRECT RECT;
-#elif PLATFORM(GTK)
-#ifdef GTK_API_VERSION_2
-typedef struct _GdkRectangle GdkRectangle;
-#endif
 #endif
 
 #if USE(CAIRO)
@@ -171,11 +167,6 @@ class IntRect {
 #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;

diff --git a/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp b/Source/WebCore/platform/graphics/gtk/IntPointGtk.cpp
diff --git a/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp b/Source/WebCore/platform/graphics/gtk/IntRectGtk.cpp
diff --git a/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp b/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp
@@ -90,7 +90,7 @@ void GtkInputMethodFilter::setCursorRect(const IntRect& cursorRect)
     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);
 }
 

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+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.
+
 2014-10-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Race condition with WebKitWebView:is-loading after starting page load

diff --git a/Tools/TestWebKitAPI/PlatformGTK.cmake b/Tools/TestWebKitAPI/PlatformGTK.cmake
@@ -116,7 +116,6 @@ set(TestWebCoreGtk_SOURCES
     ${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