[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:18:25 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b06361a6ea8b102599937df71a864434f9d3a83b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 6 16:40:43 2010 +0000
2010-10-06 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Xan Lopez.
[GTK] Port to gtk+3 (2.91.0)
https://bugs.webkit.org/show_bug.cgi?id=47249
Do not use GdkDrawable deprecated API
Some methods of GdkDrawable are deprecated in gtk2 and have been
remmoved in gtk3. Equivalent API has been added to GdkWindow.
* platform/gtk/GtkVersioning.c:
(getDefaultGDKPointerDevice):
* platform/gtk/GtkVersioning.h:
* platform/gtk/PlatformScreenGtk.cpp:
(WebCore::getVisual):
(WebCore::screenAvailableRect):
2010-10-06 Carlos Garcia Campos <cgarcia at igalia.com>
Reviewed by Xan Lopez.
Port to gtk+3 (2.91.0)
https://bugs.webkit.org/show_bug.cgi?id=47249
Do not use GdkDrawable deprecated API
Some methods of GdkDrawable are deprecated in gtk2 and have been
remmoved in gtk3. Equivalent API has been added to GdkWindow.
* tests/testcopyandpaste.c:
(runPasteTestCallback):
* webkit/webkitwebview.cpp:
(webkit_web_view_button_press_event):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9fc1628..73173d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-06 Carlos Garcia Campos <cgarcia at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Port to gtk+3 (2.91.0)
+ https://bugs.webkit.org/show_bug.cgi?id=47249
+
+ Do not use GdkDrawable deprecated API
+
+ Some methods of GdkDrawable are deprecated in gtk2 and have been
+ remmoved in gtk3. Equivalent API has been added to GdkWindow.
+
+ * platform/gtk/GtkVersioning.c:
+ (getDefaultGDKPointerDevice):
+ * platform/gtk/GtkVersioning.h:
+ * platform/gtk/PlatformScreenGtk.cpp:
+ (WebCore::getVisual):
+ (WebCore::screenAvailableRect):
+
2010-10-06 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Antonio Gomes.
diff --git a/WebCore/platform/gtk/GtkVersioning.c b/WebCore/platform/gtk/GtkVersioning.c
index f5466be..b5d0c25 100644
--- a/WebCore/platform/gtk/GtkVersioning.c
+++ b/WebCore/platform/gtk/GtkVersioning.c
@@ -52,7 +52,7 @@ void gtk_adjustment_configure(GtkAdjustment* adjustment, gdouble value, gdouble
GdkDevice *getDefaultGDKPointerDevice(GdkWindow* window)
{
#ifndef GTK_API_VERSION_2
- GdkDeviceManager *manager = gdk_display_get_device_manager(gdk_drawable_get_display(window));
+ GdkDeviceManager *manager = gdk_display_get_device_manager(gdk_window_get_display(window));
return gdk_device_manager_get_client_pointer(manager);
#else
return gdk_device_get_core_pointer();
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index a874e9e..02eeb00 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -34,6 +34,10 @@ G_BEGIN_DECLS
#define GDK_DISPLAY() (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))
#endif
+#if !GTK_CHECK_VERSION(2, 24, 0)
+#define gdk_window_get_display(window) gdk_drawable_get_display(window)
+#endif // GTK_CHECK_VERSION(2, 24, 0)
+
#if !GTK_CHECK_VERSION(2, 21, 2)
#define gdk_visual_get_depth(visual) (visual)->depth
#define gdk_visual_get_bits_per_rgb(visual) (visual)->bits_per_rgb
diff --git a/WebCore/platform/gtk/PlatformScreenGtk.cpp b/WebCore/platform/gtk/PlatformScreenGtk.cpp
index 6ace728..471adf9 100644
--- a/WebCore/platform/gtk/PlatformScreenGtk.cpp
+++ b/WebCore/platform/gtk/PlatformScreenGtk.cpp
@@ -64,7 +64,7 @@ static GdkVisual* getVisual(Widget* widget)
}
- return gdk_drawable_get_visual(GDK_DRAWABLE(gtk_widget_get_window(container)));
+ return gdk_window_get_visual(gtk_widget_get_window(container));
}
int screenDepth(Widget* widget)
@@ -123,7 +123,7 @@ FloatRect screenAvailableRect(Widget* widget)
return screenRect(widget);
GdkDrawable* rootWindow = GDK_DRAWABLE(gtk_widget_get_root_window(container));
- GdkDisplay* display = gdk_drawable_get_display(rootWindow);
+ GdkDisplay* display = gdk_window_get_display(rootWindow);
Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA");
Atom retType;
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index c602ac1..6a1b2a4 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-06 Carlos Garcia Campos <cgarcia at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ Port to gtk+3 (2.91.0)
+ https://bugs.webkit.org/show_bug.cgi?id=47249
+
+ Do not use GdkDrawable deprecated API
+
+ Some methods of GdkDrawable are deprecated in gtk2 and have been
+ remmoved in gtk3. Equivalent API has been added to GdkWindow.
+
+ * tests/testcopyandpaste.c:
+ (runPasteTestCallback):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_button_press_event):
+
2010-09-28 Jenn Braithwaite <jennb at chromium.org>
Reviewed by Dmitry Titov.
diff --git a/WebKit/gtk/tests/testcopyandpaste.c b/WebKit/gtk/tests/testcopyandpaste.c
index 5e3f5e7..f7889bd 100644
--- a/WebKit/gtk/tests/testcopyandpaste.c
+++ b/WebKit/gtk/tests/testcopyandpaste.c
@@ -133,7 +133,7 @@ static JSValueRef runPasteTestCallback(JSContextRef context, JSObjectRef functio
event->key.window = gtk_widget_get_window(GTK_WIDGET(currentFixture->webView));
g_object_ref(event->key.window);
#ifndef GTK_API_VERSION_2
- GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_drawable_get_display(event->key.window));
+ GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event->key.window));
gdk_event_set_device(event, gdk_device_manager_get_client_pointer(manager));
#endif
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 762888a..7f58c23 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -641,7 +641,7 @@ static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventBu
gint doubleClickDistance = 250;
gint doubleClickTime = 5;
- GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(gtk_widget_get_window(widget)));
+ GtkSettings* settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget));
g_object_get(settings,
"gtk-double-click-distance", &doubleClickDistance,
"gtk-double-click-time", &doubleClickTime, NULL);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list