[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 0ad48e40035f76e9513cb17049fe565ae3204e07
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 26 23:43:46 2010 +0000

    2010-08-26  Martin Robinson  <mrobinson at igalia.com>
    
            Build fix for GTK+, after a bad merge.
    
            * platform/gtk/RenderThemeGtk.cpp:
            (WebCore::RenderThemeGtk::paintMozillaGtkWidget):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9ab235..f3f29dd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-26  Martin Robinson  <mrobinson at igalia.com>
+
+        Build fix for GTK+, after a bad merge.
+
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::RenderThemeGtk::paintMozillaGtkWidget):
+
 2010-08-23  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/platform/gtk/RenderThemeGtk.cpp b/WebCore/platform/gtk/RenderThemeGtk.cpp
index f11e082..d9f477c 100644
--- a/WebCore/platform/gtk/RenderThemeGtk.cpp
+++ b/WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -289,17 +289,7 @@ bool RenderThemeGtk::paintMozillaGtkWidget(GtkThemeWidgetType type, GraphicsCont
     if (context->paintingDisabled())
         return false;
 
-    GtkWidgetState widgetState;
-    setMozillaState(theme, type, o, &widgetState);
-
-    // We might want to make setting flags the caller's job at some point rather than doing it here.
-    int flags = 0;
-    if (type == MOZ_GTK_BUTTON)
-        flags = GTK_RELIEF_NORMAL;
-    else if (type == MOZ_GTK_CHECKBUTTON || type == MOZ_GTK_RADIOBUTTON)
-        flags = theme->isChecked(o);
-
-    PlatformRefPtr<GdkDrawable> drawable(i.context->gdkDrawable());
+    PlatformRefPtr<GdkDrawable> drawable(context->gdkDrawable());
     GdkRectangle paintRect, clipRect;
     if (drawable) {
         AffineTransform ctm = context->getCTM();

-- 
WebKit Debian packaging