[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a726db2df6b7e0614c4cefd991b6721a0dc12248
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 23:56:16 2011 +0000

    2011-01-03  Carlos Garcia Campos  <cgarcia at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Move paintMenuListButton() to RenderThemeGtk.cpp
            https://bugs.webkit.org/show_bug.cgi?id=51832
    
            Method paintMenuListButton() contains code common to both gtk 2
            and 3, so it can be moved to RenderThemeGtk.cpp instead of
            duplicating it.
    
            * platform/gtk/RenderThemeGtk.cpp:
            (WebCore::RenderThemeGtk::paintMenuListButton):
            * platform/gtk/RenderThemeGtk2.cpp:
            * platform/gtk/RenderThemeGtk3.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74945 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4c4fbc1..92f7b38 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-03  Carlos Garcia Campos  <cgarcia at igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Move paintMenuListButton() to RenderThemeGtk.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=51832
+
+        Method paintMenuListButton() contains code common to both gtk 2
+        and 3, so it can be moved to RenderThemeGtk.cpp instead of
+        duplicating it.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintMenuListButton):
+        * platform/gtk/RenderThemeGtk2.cpp:
+        * platform/gtk/RenderThemeGtk3.cpp:
+
 2011-01-03  Pratik Solanki  <psolanki at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index 6013eb2..3f7d752 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -273,6 +273,11 @@ void RenderThemeGtk::adjustMenuListButtonStyle(CSSStyleSelector* selector, Rende
     adjustMenuListStyle(selector, style, e);
 }
 
+bool RenderThemeGtk::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
+{
+    return paintMenuList(object, info, rect);
+}
+
 void RenderThemeGtk::adjustTextFieldStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
 {
     RenderThemeGtk::setTextInputBorders(style);
diff --git a/WebCore/platform/gtk/RenderThemeGtk2.cpp b/WebCore/platform/gtk/RenderThemeGtk2.cpp
index 576ec41..572cc25 100644
--- a/WebCore/platform/gtk/RenderThemeGtk2.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk2.cpp
@@ -233,11 +233,6 @@ bool RenderThemeGtk::paintMenuList(RenderObject* object, const PaintInfo& info,
     return paintRenderObject(MOZ_GTK_DROPDOWN, object, info.context, rect);
 }
 
-bool RenderThemeGtk::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    return paintMenuList(object, info, rect);
-}
-
 void RenderThemeGtk::setTextInputBorders(RenderStyle* style)
 {
     // If this control isn't drawn using the native theme, we don't touch the borders.
diff --git a/WebCore/platform/gtk/RenderThemeGtk3.cpp b/WebCore/platform/gtk/RenderThemeGtk3.cpp
index 2361da9..eae94ce 100644
--- a/WebCore/platform/gtk/RenderThemeGtk3.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk3.cpp
@@ -224,11 +224,6 @@ bool RenderThemeGtk::paintMenuList(RenderObject* object, const PaintInfo& info,
     return paintRenderObject(MOZ_GTK_DROPDOWN, object, info.context, rect);
 }
 
-bool RenderThemeGtk::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
-{
-    return paintMenuList(object, info, rect);
-}
-
 void RenderThemeGtk::setTextInputBorders(RenderStyle* style)
 {
     // If this control isn't drawn using the native theme, we don't touch the borders.

-- 
WebKit Debian packaging