[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
alex at webkit.org
alex at webkit.org
Wed Dec 22 13:27:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 27009a900e17863d4e990565bc23f721f076eea4
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 16 12:47:59 2010 +0000
2010-09-16 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
GTK+ 3.x. updates, gtk_widget_size_request is deprecated and
"activate-slider" style property for scrollbars is gone.
* platform/gtk/PopupMenuGtk.cpp:
(WebCore::PopupMenuGtk::show):
* platform/gtk/gtk2drawing.c:
(moz_gtk_scrollbar_thumb_paint):
(moz_gtk_combo_box_paint):
2010-09-16 Alejandro G. Castro <alex at igalia.com>
Reviewed by Xan Lopez.
GTK+ 3.x. updates, gtk_widget_size_request is deprecated and
"activate-slider" style property for scrollbars is gone.
* webkit/webkitwebview.cpp:
(PopupMenuPositionFunc):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 13da8c8..c6b1b7c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-16 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ GTK+ 3.x. updates, gtk_widget_size_request is deprecated and
+ "activate-slider" style property for scrollbars is gone.
+
+ * platform/gtk/PopupMenuGtk.cpp:
+ (WebCore::PopupMenuGtk::show):
+ * platform/gtk/gtk2drawing.c:
+ (moz_gtk_scrollbar_thumb_paint):
+ (moz_gtk_combo_box_paint):
+
2010-09-16 Diego Gonzalez <diegohcg at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/platform/gtk/PopupMenuGtk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
index ca067d9..d3e933d 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.cpp
+++ b/WebCore/platform/gtk/PopupMenuGtk.cpp
@@ -87,7 +87,12 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
// The size calls are directly copied from gtkcombobox.c which is LGPL
GtkRequisition requisition;
gtk_widget_set_size_request(GTK_WIDGET(m_popup.get()), -1, -1);
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(GTK_WIDGET(m_popup.get()), &requisition);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(m_popup.get()), &requisition, NULL);
+#endif
+
gtk_widget_set_size_request(GTK_WIDGET(m_popup.get()), std::max(rect.width(), requisition.width), -1);
GList* children = gtk_container_get_children(GTK_CONTAINER(m_popup.get()));
@@ -99,7 +104,11 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
GtkWidget* item = reinterpret_cast<GtkWidget*>(p->data);
GtkRequisition itemRequisition;
+#ifdef GTK_API_VERSION_2
gtk_widget_get_child_requisition(item, &itemRequisition);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(item), &itemRequisition, NULL);
+#endif
m_menuPosition.setY(m_menuPosition.y() - itemRequisition.height);
p = g_list_next(p);
diff --git a/WebCore/platform/gtk/gtk2drawing.c b/WebCore/platform/gtk/gtk2drawing.c
index ba69cdc..fd770d2 100644
--- a/WebCore/platform/gtk/gtk2drawing.c
+++ b/WebCore/platform/gtk/gtk2drawing.c
@@ -1265,7 +1265,9 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget,
GtkStyle* style;
GtkScrollbar *scrollbar;
GtkAdjustment *adj;
+#ifdef GTK_API_VERSION_2
gboolean activate_slider;
+#endif
ensure_scrollbar_widget();
@@ -1317,6 +1319,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget,
style = gtk_widget_get_style(GTK_WIDGET(scrollbar));
+#ifdef GTK_API_VERSION_2
gtk_widget_style_get(GTK_WIDGET(scrollbar), "activate-slider",
&activate_slider, NULL);
@@ -1324,6 +1327,7 @@ moz_gtk_scrollbar_thumb_paint(GtkThemeWidgetType widget,
shadow_type = GTK_SHADOW_IN;
state_type = GTK_STATE_ACTIVE;
}
+#endif
TSOffsetStyleGCs(style, rect->x, rect->y);
@@ -1812,7 +1816,11 @@ moz_gtk_combo_box_paint(GdkDrawable* drawable, GdkRectangle* rect,
rect, &arrow_rect, direction, ishtml);
/* Now arrow_rect contains the inner rect ; we want to correct the width
* to what the arrow needs (see gtk_combo_box_size_allocate) */
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(gParts->comboBoxArrowWidget, &arrow_req);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(gParts->comboBoxArrowWidget), &arrow_req, NULL);
+#endif
if (direction == GTK_TEXT_DIR_LTR)
arrow_rect.x += arrow_rect.width - arrow_req.width;
arrow_rect.width = arrow_req.width;
@@ -2783,8 +2791,11 @@ moz_gtk_get_widget_border(GtkThemeWidgetType widget, gint* left, gint* top,
XTHICKNESS(style);
}
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(gParts->comboBoxArrowWidget, &arrow_req);
-
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(gParts->comboBoxArrowWidget), &arrow_req, NULL);
+#endif
if (direction == GTK_TEXT_DIR_RTL)
*left += separator_width + arrow_req.width;
else
@@ -2948,7 +2959,12 @@ moz_gtk_get_combo_box_entry_button_size(gint* width, gint* height)
GtkRequisition requisition;
ensure_combo_box_entry_widgets();
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(gParts->comboBoxEntryButtonWidget, &requisition);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(gParts->comboBoxEntryButtonWidget), &requisition, NULL);
+#endif
+
*width = requisition.width;
*height = requisition.height;
@@ -2976,7 +2992,12 @@ moz_gtk_get_downarrow_size(gint* width, gint* height)
GtkRequisition requisition;
ensure_button_arrow_widget();
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(gParts->buttonArrowWidget, &requisition);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(gParts->buttonArrowWidget), &requisition, NULL);
+#endif
+
*width = requisition.width;
*height = requisition.height;
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 560a06d..40403ae 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-16 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ GTK+ 3.x. updates, gtk_widget_size_request is deprecated and
+ "activate-slider" style property for scrollbars is gone.
+
+ * webkit/webkitwebview.cpp:
+ (PopupMenuPositionFunc):
+
2010-09-15 Martin Robinson <mrobinson at igalia.com>
Reviewed by David Levin.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 815a6f9..0938ccf 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -220,7 +220,11 @@ static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pus
GdkScreen* screen = gtk_widget_get_screen(GTK_WIDGET(view));
GtkRequisition menuSize;
+#ifdef GTK_API_VERSION_2
gtk_widget_size_request(GTK_WIDGET(menu), &menuSize);
+#else
+ gtk_size_request_get_size(GTK_SIZE_REQUEST(menu), &menuSize, NULL);
+#endif
*x = priv->lastPopupXPosition;
if ((*x + menuSize.width) >= gdk_screen_get_width(screen))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list