[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 12:51:57 UTC 2010 

The following commit has been merged in the debian/experimental branch:
commit f2f164560f23fd82238465cb7850c32b4169cc6d
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 21:23:16 2010 +0000

    2010-08-31  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Isolate all GTK+ typedefs into one file
            https://bugs.webkit.org/show_bug.cgi?id=44900
    
            * GNUmakefile.am: Add GtkTypedefs.h to the source lists.
            * wtf/Platform.h: #include GtkTypedefs.h for the GTK+ build.
            * wtf/ThreadingPrimitives.h: Remove GTK+ typedefs.
            * wtf/gobject/GOwnPtr.h: Ditto.
            * wtf/gobject/GRefPtr.h: Ditto.
            * wtf/gtk/GtkTypedefs.h: Added.
    2010-08-31  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Isolate all GTK+ typedefs into one file
            https://bugs.webkit.org/show_bug.cgi?id=44900
    
            * platform/graphics/gtk/CairoUtilities.h: Remove GTK+ typedefs.
            * platform/gtk/ClipboardGtk.h: Ditto.
            * platform/gtk/DataObjectGtk.h: Ditto.
            * platform/gtk/GOwnPtrGtk.h: Ditto.
            * platform/gtk/GRefPtrGtk.h: Ditto.
            * platform/gtk/PasteboardHelper.h: Ditto.
            * platform/gtk/PopupMenuGtk.h: Ditto.
            * platform/gtk/RenderThemeGtk.h: Ditto.
            * platform/gtk/ScrollbarGtk.h: Ditto.
            * platform/gtk/gtk2drawing.c: Remove unused Assertions.h.
    2010-08-31  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Isolate all GTK+ typedefs into one file
            https://bugs.webkit.org/show_bug.cgi?id=44900
    
            * WebCoreSupport/EditorClientGtk.h: Remove GTK+ typedefs.
            * WebCoreSupport/FullscreenVideoController.h: Ditto.
    2010-08-31  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] Isolate all GTK+ typedefs into one file
            https://bugs.webkit.org/show_bug.cgi?id=44900
    
            * DumpRenderTree/gtk/EventSender.h: Remove GTK+ typedefs.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66531 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 244e81b..123bdce 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Gustavo Noronha Silva.
 
+        [GTK] Isolate all GTK+ typedefs into one file
+        https://bugs.webkit.org/show_bug.cgi?id=44900
+
+        * GNUmakefile.am: Add GtkTypedefs.h to the source lists.
+        * wtf/Platform.h: #include GtkTypedefs.h for the GTK+ build.
+        * wtf/ThreadingPrimitives.h: Remove GTK+ typedefs.
+        * wtf/gobject/GOwnPtr.h: Ditto.
+        * wtf/gobject/GRefPtr.h: Ditto.
+        * wtf/gtk/GtkTypedefs.h: Added.
+
+2010-08-31  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
         [GTK] Fix 'make dist' in preparation of the 1.3.3 release
         https://bugs.webkit.org/show_bug.cgi?id=44978
 
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 27cdc9e..b4c658e 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -442,6 +442,7 @@ javascriptcore_sources += \
 	JavaScriptCore/wtf/gobject/GOwnPtr.h \
 	JavaScriptCore/wtf/gobject/GRefPtr.cpp \
 	JavaScriptCore/wtf/gobject/GRefPtr.h \
+	JavaScriptCore/wtf/gtk/GtkTypedefs.h \
 	JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \
 	JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \
 	JavaScriptCore/wtf/HashCountedSet.h \
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 7ead013..de00741 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1117,4 +1117,8 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define ENABLE_BRANCH_COMPACTION 1
 #endif
 
+#if PLATFORM(GTK)
+#include "GtkTypedefs.h"
+#endif
+
 #endif /* WTF_Platform_h */
diff --git a/JavaScriptCore/wtf/ThreadingPrimitives.h b/JavaScriptCore/wtf/ThreadingPrimitives.h
index 66801c0..c11a6cb 100644
--- a/JavaScriptCore/wtf/ThreadingPrimitives.h
+++ b/JavaScriptCore/wtf/ThreadingPrimitives.h
@@ -45,8 +45,6 @@
 #include <pthread.h>
 #elif PLATFORM(GTK)
 #include "GOwnPtr.h"
-typedef struct _GMutex GMutex;
-typedef struct _GCond GCond;
 #endif
 
 #if PLATFORM(QT)
diff --git a/JavaScriptCore/wtf/gobject/GOwnPtr.h b/JavaScriptCore/wtf/gobject/GOwnPtr.h
index 731326e..e04ee9d 100644
--- a/JavaScriptCore/wtf/gobject/GOwnPtr.h
+++ b/JavaScriptCore/wtf/gobject/GOwnPtr.h
@@ -26,15 +26,6 @@
 #include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
 
-// Forward delcarations at this point avoid the need to include GLib includes
-// in WTF headers.
-typedef struct _GError GError;
-typedef struct _GList GList;
-typedef struct _GCond GCond;
-typedef struct _GMutex GMutex;
-typedef struct _GPatternSpec GPatternSpec;
-typedef struct _GDir GDir;
-typedef struct _GFile GFile;
 extern "C" void g_free(void*);
 
 namespace WTF {
diff --git a/JavaScriptCore/wtf/gobject/GRefPtr.h b/JavaScriptCore/wtf/gobject/GRefPtr.h
index 064c87e..1ca55ce 100644
--- a/JavaScriptCore/wtf/gobject/GRefPtr.h
+++ b/JavaScriptCore/wtf/gobject/GRefPtr.h
@@ -27,11 +27,8 @@
 #include "PlatformRefPtr.h"
 #include <algorithm>
 
-typedef struct _GHashTable GHashTable; 
-typedef struct _GVariant GVariant; 
-typedef void* gpointer; 
-extern "C" void g_object_unref(gpointer object); 
-extern "C" gpointer g_object_ref_sink(gpointer object); 
+extern "C" void g_object_unref(gpointer);
+extern "C" gpointer g_object_ref_sink(gpointer);
 
 namespace WTF {
 
diff --git a/JavaScriptCore/wtf/gtk/GtkTypedefs.h b/JavaScriptCore/wtf/gtk/GtkTypedefs.h
new file mode 100644
index 0000000..ee96f84
--- /dev/null
+++ b/JavaScriptCore/wtf/gtk/GtkTypedefs.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2010 Igalia, S.L.
+ *
+ *  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.
+ */
+
+#ifndef GtkTypedefs_h
+#define GtkTypedefs_h
+
+/* Vanilla C code does not seem to be able to handle forward-declaration typedefs. */
+#ifdef  __cplusplus
+
+typedef char gchar;
+typedef double gdouble;
+typedef float gfloat;
+typedef int gint;
+typedef gint gboolean;
+typedef long glong;
+typedef short gshort;
+typedef unsigned char guchar;
+typedef unsigned int guint;
+typedef unsigned long gulong;
+typedef unsigned short gushort;
+typedef void* gpointer;
+
+typedef struct _cairo_surface cairo_surface_t;
+typedef struct _GCond GCond;
+typedef struct _GDir GDir;
+typedef struct _GdkAtom* GdkAtom;
+typedef struct _GdkCursor GdkCursor;
+typedef struct _GdkDragContext GdkDragContext;
+typedef struct _GdkDrawable GdkDrawable;
+typedef struct _GdkEventConfigure GdkEventConfigure;
+typedef struct _GdkPixbuf GdkPixbuf;
+typedef struct _GError GError;
+typedef struct _GFile GFile;
+typedef struct _GHashTable GHashTable;
+typedef struct _GList GList;
+typedef struct _GMutex GMutex;
+typedef struct _GPatternSpec GPatternSpec;
+typedef struct _GtkAction GtkAction;
+typedef struct _GtkAdjustment GtkAdjustment;
+typedef struct _GtkBorder GtkBorder;
+typedef struct _GtkClipboard GtkClipboard;
+typedef struct _GtkContainer GtkContainer;
+typedef struct _GtkIconInfo GtkIconInfo;
+typedef struct _GtkMenu GtkMenu;
+typedef struct _GtkMenuItem GtkMenuItem;
+typedef struct _GtkObject GtkObject;
+typedef struct _GtkSelectionData GtkSelectionData;
+typedef struct _GtkStyle GtkStyle;
+typedef struct _GtkTargetList GtkTargetList;
+typedef struct _GtkThemeParts GtkThemeParts;
+typedef struct _GtkWidget GtkWidget;
+typedef struct _GVariant GVariant;
+typedef union _GdkEvent GdkEvent;
+
+#ifdef GTK_API_VERSION_2
+typedef struct _GdkRectangle GdkRectangle;
+#else
+typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
+typedef cairo_rectangle_int_t GdkRectangle;
+#endif
+
+#endif
+
+#endif /* GtkTypedefs_h */
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d6bc33..acba090 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-31  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Isolate all GTK+ typedefs into one file
+        https://bugs.webkit.org/show_bug.cgi?id=44900
+
+        * platform/graphics/gtk/CairoUtilities.h: Remove GTK+ typedefs.
+        * platform/gtk/ClipboardGtk.h: Ditto.
+        * platform/gtk/DataObjectGtk.h: Ditto.
+        * platform/gtk/GOwnPtrGtk.h: Ditto.
+        * platform/gtk/GRefPtrGtk.h: Ditto.
+        * platform/gtk/PasteboardHelper.h: Ditto.
+        * platform/gtk/PopupMenuGtk.h: Ditto.
+        * platform/gtk/RenderThemeGtk.h: Ditto.
+        * platform/gtk/ScrollbarGtk.h: Ditto.
+        * platform/gtk/gtk2drawing.c: Remove unused Assertions.h.
+
 2010-08-31  Tony Chang  <tony at chromium.org>
 
         Unreviewed, fix chromium compile.
diff --git a/WebCore/platform/graphics/gtk/CairoUtilities.h b/WebCore/platform/graphics/gtk/CairoUtilities.h
index 89eb458..594abc0 100644
--- a/WebCore/platform/graphics/gtk/CairoUtilities.h
+++ b/WebCore/platform/graphics/gtk/CairoUtilities.h
@@ -26,8 +26,6 @@
 #ifndef CairoUtilities_h
 #define CairoUtilities_h
 
-typedef struct _cairo_surface cairo_surface_t;
-typedef struct _GdkPixbuf GdkPixbuf;
 GdkPixbuf* cairoImageSurfaceToGdkPixbuf(cairo_surface_t* surface);
 
 #endif // CairoUtilities_h
diff --git a/WebCore/platform/gtk/ClipboardGtk.h b/WebCore/platform/gtk/ClipboardGtk.h
index 8b8ee38..f0af318 100644
--- a/WebCore/platform/gtk/ClipboardGtk.h
+++ b/WebCore/platform/gtk/ClipboardGtk.h
@@ -31,8 +31,6 @@
 #include "Clipboard.h"
 #include "DataObjectGtk.h"
 
-typedef struct _GtkClipboard GtkClipboard;
-
 namespace WebCore {
     class CachedImage;
     class Frame;
diff --git a/WebCore/platform/gtk/DataObjectGtk.h b/WebCore/platform/gtk/DataObjectGtk.h
index 6f7149c..e6095da 100644
--- a/WebCore/platform/gtk/DataObjectGtk.h
+++ b/WebCore/platform/gtk/DataObjectGtk.h
@@ -27,10 +27,6 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
-typedef struct _GdkPixbuf GdkPixbuf;
-typedef struct _GdkDragContext GdkDragContext;
-typedef struct _GtkClipboard GtkClipboard;
-
 namespace WebCore {
 
 class DataObjectGtk : public RefCounted<DataObjectGtk> {
diff --git a/WebCore/platform/gtk/GOwnPtrGtk.h b/WebCore/platform/gtk/GOwnPtrGtk.h
index 8341661..c5d9cdc 100644
--- a/WebCore/platform/gtk/GOwnPtrGtk.h
+++ b/WebCore/platform/gtk/GOwnPtrGtk.h
@@ -22,9 +22,6 @@
 
 #include "GOwnPtr.h"
 
-typedef union _GdkEvent GdkEvent;
-typedef struct _GtkIconInfo GtkIconInfo;
-
 namespace WTF {
 
 template <> void freeOwnedGPtr<GdkEvent>(GdkEvent*);
diff --git a/WebCore/platform/gtk/GRefPtrGtk.h b/WebCore/platform/gtk/GRefPtrGtk.h
index ea1b089..5e6ab78 100644
--- a/WebCore/platform/gtk/GRefPtrGtk.h
+++ b/WebCore/platform/gtk/GRefPtrGtk.h
@@ -23,9 +23,6 @@
 
 #include "GRefPtr.h"
 
-typedef struct _GtkTargetList GtkTargetList;
-typedef struct _GdkCursor GdkCursor;
-
 namespace WTF {
 
 template <> GtkTargetList* refPlatformPtr(GtkTargetList* ptr);
diff --git a/WebCore/platform/gtk/PasteboardHelper.h b/WebCore/platform/gtk/PasteboardHelper.h
index 33be1a8..bb1b580 100644
--- a/WebCore/platform/gtk/PasteboardHelper.h
+++ b/WebCore/platform/gtk/PasteboardHelper.h
@@ -32,13 +32,6 @@
 
 #include "Frame.h"
 
-typedef struct _GtkClipboard GtkClipboard;
-typedef struct _GtkTargetList GtkTargetList;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkSelectionData GtkSelectionData;
-typedef struct _GdkDragContext GdkDragContext;
-typedef struct _GdkAtom* GdkAtom;
-
 namespace WebCore {
 
 class DataObjectGtk;
diff --git a/WebCore/platform/gtk/PopupMenuGtk.h b/WebCore/platform/gtk/PopupMenuGtk.h
index d63e6d9..8848e06 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.h
+++ b/WebCore/platform/gtk/PopupMenuGtk.h
@@ -29,10 +29,6 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
-typedef struct _GtkMenu GtkMenu;
-typedef struct _GtkMenuItem GtkMenuItem;
-typedef struct _GtkWidget GtkWidget;
-
 namespace WebCore {
 
 class FrameView;
diff --git a/WebCore/platform/gtk/RenderThemeGtk.h b/WebCore/platform/gtk/RenderThemeGtk.h
index d2e0d70..bdaa208 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.h
+++ b/WebCore/platform/gtk/RenderThemeGtk.h
@@ -32,19 +32,6 @@
 #include "gtkdrawing.h"
 #include "RenderTheme.h"
 
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkStyle GtkStyle;
-typedef struct _GtkContainer GtkContainer;
-#ifdef GTK_API_VERSION_2
-typedef struct _GdkRectangle GdkRectangle;
-#else
-typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
-typedef cairo_rectangle_int_t GdkRectangle;
-#endif
-typedef struct _GdkDrawable GdkDrawable;
-typedef struct _GtkBorder GtkBorder;
-typedef struct _GtkThemeParts GtkThemeParts;
-
 namespace WebCore {
 
 class RenderThemeGtk : public RenderTheme {
diff --git a/WebCore/platform/gtk/ScrollbarGtk.h b/WebCore/platform/gtk/ScrollbarGtk.h
index e02bb50..1a078c9 100644
--- a/WebCore/platform/gtk/ScrollbarGtk.h
+++ b/WebCore/platform/gtk/ScrollbarGtk.h
@@ -29,8 +29,6 @@
 #include "Scrollbar.h"
 #include <wtf/PassRefPtr.h>
 
-typedef struct _GtkAdjustment GtkAdjustment;
-
 namespace WebCore {
 
 class ScrollbarGtk : public Scrollbar {
diff --git a/WebCore/platform/gtk/gtk2drawing.c b/WebCore/platform/gtk/gtk2drawing.c
index 349bde0..b33fb1f 100644
--- a/WebCore/platform/gtk/gtk2drawing.c
+++ b/WebCore/platform/gtk/gtk2drawing.c
@@ -46,10 +46,7 @@
 
 #include <gdk/gdkprivate.h>
 #include "gtkdrawing.h"
-
-#include "Assertions.h"
 #include "GtkVersioning.h"
-
 #include <math.h>
 #include <string.h>
 
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 45755fb..3a0d780 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Isolate all GTK+ typedefs into one file
+        https://bugs.webkit.org/show_bug.cgi?id=44900
+
+        * WebCoreSupport/EditorClientGtk.h: Remove GTK+ typedefs.
+        * WebCoreSupport/FullscreenVideoController.h: Ditto.
+
 2010-08-31  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
index efb734f..f9ff82e 100644
--- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
+++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
@@ -39,8 +39,6 @@
 #include <wtf/gobject/GRefPtr.h>
 
 typedef struct _WebKitWebView WebKitWebView;
-typedef struct _GtkWidget GtkWidget;
-typedef char gchar;
 
 namespace WebCore {
 class Frame;
diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
index 1567d9b..9ff1e6a 100644
--- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
+++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.h
@@ -27,13 +27,6 @@
 #include "HTMLMediaElement.h"
 #include <wtf/RefPtr.h>
 
-typedef struct _GtkObject GtkObject;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkAction GtkAction;
-typedef struct _GdkCursor GdkCursor;
-typedef struct _GdkEventConfigure GdkEventConfigure;
-
-
 class FullscreenVideoController : public Noncopyable {
 public:
     FullscreenVideoController();
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1b83e1e..c5a7a36 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-31  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Isolate all GTK+ typedefs into one file
+        https://bugs.webkit.org/show_bug.cgi?id=44900
+
+        * DumpRenderTree/gtk/EventSender.h: Remove GTK+ typedefs.
+
 2010-08-31  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/gtk/EventSender.h b/WebKitTools/DumpRenderTree/gtk/EventSender.h
index e9b758d..f440f0d 100644
--- a/WebKitTools/DumpRenderTree/gtk/EventSender.h
+++ b/WebKitTools/DumpRenderTree/gtk/EventSender.h
@@ -32,10 +32,6 @@
 
 typedef const struct OpaqueJSContext* JSContextRef;
 typedef struct OpaqueJSValue* JSObjectRef;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GdkDragContext GdkDragContext;
-typedef void* gpointer;
-typedef int gboolean;
 
 JSObjectRef makeEventSender(JSContextRef context, bool isTopFrame);
 void replaySavedEvents();

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list