[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
alex at webkit.org
alex at webkit.org
Fri Jan 21 15:16:02 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 9b49509651112f4326642de3ad5ef7a0772f56fb
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 10 19:29:39 2011 +0000
2011-01-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix gtk2 compilation for master
https://bugs.webkit.org/show_bug.cgi?id=51885
* platform/gtk/GtkVersioning.h: Replaced the 2.24.0 check with
2.23.0 to avoid using the old symbols in the 2.23 releases. Added
support for gdk_pixmap_get_size before the 2.23.4.
* platform/gtk/WidgetRenderingContextGtk2.cpp:
(WebCore::WidgetRenderingContext::WidgetRenderingContext):
Replaced the old gdk_drawable_get_size with gdk_pixmap_get_size.
2011-01-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix gtk2 compilation for master
https://bugs.webkit.org/show_bug.cgi?id=51885
* DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
(createBitmapContextFromWebView): Replaced the old
gdk_drawable_get_size with gdk_pixmap_get_size.
2011-01-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
[GTK] Fix gtk2 compilation for master
https://bugs.webkit.org/show_bug.cgi?id=51885
* webkit/webkitsoupauthdialog.c:
(show_auth_dialog): Removed the call to
gtk_dialog_set_has_separator API to remove a warning.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75397 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 562fc9c..133a499 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-10 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix gtk2 compilation for master
+ https://bugs.webkit.org/show_bug.cgi?id=51885
+
+ * platform/gtk/GtkVersioning.h: Replaced the 2.24.0 check with
+ 2.23.0 to avoid using the old symbols in the 2.23 releases. Added
+ support for gdk_pixmap_get_size before the 2.23.4.
+ * platform/gtk/WidgetRenderingContextGtk2.cpp:
+ (WebCore::WidgetRenderingContext::WidgetRenderingContext):
+ Replaced the old gdk_drawable_get_size with gdk_pixmap_get_size.
+
2011-01-10 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed; build fix for r75385.
diff --git a/Source/WebCore/platform/gtk/GtkVersioning.h b/Source/WebCore/platform/gtk/GtkVersioning.h
index 11d1f8a..7e9fcd1 100644
--- a/Source/WebCore/platform/gtk/GtkVersioning.h
+++ b/Source/WebCore/platform/gtk/GtkVersioning.h
@@ -37,12 +37,14 @@ GdkPixbuf* gdk_pixbuf_get_from_surface(cairo_surface_t* surface, int srcX, int s
int width, int height);
#endif
-#if !GTK_CHECK_VERSION(2, 24, 0)
+#if !GTK_CHECK_VERSION(2, 23, 4)
+#define gdk_pixmap_get_size gdk_drawable_get_size
+#endif // GTK_CHECK_VERSION(2, 23, 4)
+
+#if !GTK_CHECK_VERSION(2, 23, 0)
#define gdk_window_get_display(window) gdk_drawable_get_display(window)
-#ifdef GDK_DISABLE_DEPRECATED
#define gdk_window_get_visual gdk_drawable_get_visual
-#endif
-#endif // GTK_CHECK_VERSION(2, 24, 0)
+#endif // GTK_CHECK_VERSION(2, 23, 0)
#if !GTK_CHECK_VERSION(2, 21, 2)
#define gdk_visual_get_depth(visual) (visual)->depth
diff --git a/Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp b/Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp
index e85c570..6d1be31 100644
--- a/Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp
+++ b/Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp
@@ -32,6 +32,7 @@
#include "WidgetRenderingContext.h"
#include "GraphicsContext.h"
+#include "GtkVersioning.h"
#include "RefPtrCairo.h"
#include "RenderThemeGtk.h"
#include "Timer.h"
@@ -107,7 +108,7 @@ WidgetRenderingContext::WidgetRenderingContext(GraphicsContext* graphicsContext,
int scratchWidth = 0;
int scratchHeight = 0;
if (gScratchBuffer)
- gdk_drawable_get_size(gScratchBuffer, &scratchWidth, &scratchHeight);
+ gdk_pixmap_get_size(gScratchBuffer, &scratchWidth, &scratchHeight);
// We do not need to recreate the buffer if the current buffer is large enough.
if (!gScratchBuffer || scratchWidth < width || scratchHeight < height) {
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 686c4cf..6e51c08 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-10 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix gtk2 compilation for master
+ https://bugs.webkit.org/show_bug.cgi?id=51885
+
+ * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
+ (createBitmapContextFromWebView): Replaced the old
+ gdk_drawable_get_size with gdk_pixmap_get_size.
+
2011-01-10 Patrick Gansterer <paroga at webkit.org>
Reviewed by Laszlo Gombos.
diff --git a/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp b/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
index 4073403..32bc600 100644
--- a/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
+++ b/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
@@ -30,6 +30,7 @@
#include "config.h"
#include "DumpRenderTree.h"
+#include "GtkVersioning.h"
#include "PixelDumpSupportCairo.h"
#include <webkit/webkit.h>
@@ -39,7 +40,7 @@ PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool)
gint width, height;
#ifdef GTK_API_VERSION_2
GdkPixmap* pixmap = gtk_widget_get_snapshot(GTK_WIDGET(view), 0);
- gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &width, &height);
+ gdk_pixmap_get_size(pixmap, &width, &height);
#else
width = gtk_widget_get_allocated_width(GTK_WIDGET(view));
height = gtk_widget_get_allocated_height(GTK_WIDGET(view));
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b0a5552..69ab081 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-10 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Fix gtk2 compilation for master
+ https://bugs.webkit.org/show_bug.cgi?id=51885
+
+ * webkit/webkitsoupauthdialog.c:
+ (show_auth_dialog): Removed the call to
+ gtk_dialog_set_has_separator API to remove a warning.
+
2011-01-10 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/webkit/webkitsoupauthdialog.c b/WebKit/gtk/webkit/webkitsoupauthdialog.c
index 2eefcc5..c407e6a 100644
--- a/WebKit/gtk/webkit/webkitsoupauthdialog.c
+++ b/WebKit/gtk/webkit/webkitsoupauthdialog.c
@@ -226,9 +226,6 @@ static void show_auth_dialog(WebKitAuthData* authData, const char* login, const
NULL);
/* Set the dialog up with HIG properties */
-#ifdef GTK_API_VERSION_2
- gtk_dialog_set_has_separator(dialog, FALSE);
-#endif
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(dialog)), 2); /* 2 * 5 + 2 = 12 */
gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_action_area(dialog)), 5);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list