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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c191c73cd8086626008da8e382c55d648427f0d3
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 04:34:34 2010 +0000

    2010-11-01  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Daniel Bates.
    
            [GTK] PopupMenuGtk has a very confusing if-else block
            https://bugs.webkit.org/show_bug.cgi?id=48816
    
            Small code cleanup for PopupMenuGtk.
    
            * platform/gtk/PopupMenuGtk.cpp:
            (WebCore::PopupMenuGtk::show):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e35296..27cbfb0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-01  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Daniel Bates.
+
+        [GTK] PopupMenuGtk has a very confusing if-else block
+        https://bugs.webkit.org/show_bug.cgi?id=48816
+
+        Small code cleanup for PopupMenuGtk.
+
+        * platform/gtk/PopupMenuGtk.cpp:
+        (WebCore::PopupMenuGtk::show):
+
 2010-11-01  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/gtk/PopupMenuGtk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
index a679734..e7ff78e 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.cpp
+++ b/WebCore/platform/gtk/PopupMenuGtk.cpp
@@ -97,7 +97,7 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
 
     GList* children = gtk_container_get_children(GTK_CONTAINER(m_popup.get()));
     GList* p = children;
-    if (size)
+    if (size) {
         for (int i = 0; i < size; i++) {
             if (i > index)
               break;
@@ -112,9 +112,11 @@ void PopupMenuGtk::show(const IntRect& rect, FrameView* view, int index)
             m_menuPosition.setY(m_menuPosition.y() - itemRequisition.height);
 
             p = g_list_next(p);
-        } else
-            // Center vertically the empty popup in the combo box area
-            m_menuPosition.setY(m_menuPosition.y() - rect.height() / 2);
+        }
+    } else {
+        // Center vertically the empty popup in the combo box area
+        m_menuPosition.setY(m_menuPosition.y() - rect.height() / 2);
+    }
 
     g_list_free(children);
     gtk_menu_popup(m_popup.get(), 0, 0, reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, 0, gtk_get_current_event_time());

-- 
WebKit Debian packaging