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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 892d2e1b769a1cc48dcc7a1b9533b67fb6503b2d
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 09:55:48 2010 +0000

    2010-10-07  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Fix the build for GTK+ 3
            https://bugs.webkit.org/show_bug.cgi?id=47249
    
            Don't use gtk_size_request_get_size(). It has been removed,
            gtk_widget_get_preferred_size() should be used instead
    
            * platform/gtk/PopupMenuGtk.cpp:
            (WebCore::PopupMenuGtk::show):
    2010-10-07  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Fix the build for GTK+ 3
            https://bugs.webkit.org/show_bug.cgi?id=47249
    
            Don't use gtk_size_request_get_size(). It has been removed,
            gtk_widget_get_preferred_size() should be used instead
    
            * webkit/webkitwebview.cpp:
            (PopupMenuPositionFunc):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2325cee..418950e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-07  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix the build for GTK+ 3
+        https://bugs.webkit.org/show_bug.cgi?id=47249
+
+        Don't use gtk_size_request_get_size(). It has been removed,
+        gtk_widget_get_preferred_size() should be used instead
+
+        * platform/gtk/PopupMenuGtk.cpp:
+        (WebCore::PopupMenuGtk::show):
+
 2010-10-06  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/gtk/PopupMenuGtk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
index d3e933d..a679734 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.cpp
+++ b/WebCore/platform/gtk/PopupMenuGtk.cpp
@@ -90,7 +90,7 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
 #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);
+    gtk_widget_get_preferred_size(GTK_WIDGET(m_popup.get()), &requisition, 0);
 #endif
 
     gtk_widget_set_size_request(GTK_WIDGET(m_popup.get()), std::max(rect.width(), requisition.width), -1);
@@ -107,7 +107,7 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
 #ifdef GTK_API_VERSION_2
             gtk_widget_get_child_requisition(item, &itemRequisition);
 #else
-            gtk_size_request_get_size(GTK_SIZE_REQUEST(item), &itemRequisition, NULL);
+            gtk_widget_get_preferred_size(item, &itemRequisition, 0);
 #endif
             m_menuPosition.setY(m_menuPosition.y() - itemRequisition.height);
 
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index b2400a2..7656fe3 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-07  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Fix the build for GTK+ 3
+        https://bugs.webkit.org/show_bug.cgi?id=47249
+
+        Don't use gtk_size_request_get_size(). It has been removed,
+        gtk_widget_get_preferred_size() should be used instead
+
+        * webkit/webkitwebview.cpp:
+        (PopupMenuPositionFunc):
+
 2010-10-06  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r69201.
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 762888a..c2b095a 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -223,7 +223,7 @@ static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pus
 #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);
+    gtk_widget_get_preferred_size(GTK_WIDGET(menu), &menuSize, NULL);
 #endif
 
     *x = priv->lastPopupXPosition;

-- 
WebKit Debian packaging