[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a29361686c79d80e0097f16c0877055fdfd242ed
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 29 02:41:24 2010 +0000

    2010-01-28  Avi Drissman  <avi at chromium.org>
    
            Reviewed by David Levin.
    
            Unused variable in ThemeMac (followup to change 49103).
            https://bugs.webkit.org/show_bug.cgi?id=34274
    
            Covered by existing tests.
    
            * platform/mac/ThemeMac.mm:
            (WebCore::setupButtonCell):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54037 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4151743..d546d7c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-28  Avi Drissman  <avi at chromium.org>
+
+        Reviewed by David Levin.
+
+        Unused variable in ThemeMac (followup to change 49103).
+        https://bugs.webkit.org/show_bug.cgi?id=34274
+
+        Covered by existing tests.
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::setupButtonCell):
+
 2010-01-28  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/platform/mac/ThemeMac.mm b/WebCore/platform/mac/ThemeMac.mm
index a95fee4..2812607 100644
--- a/WebCore/platform/mac/ThemeMac.mm
+++ b/WebCore/platform/mac/ThemeMac.mm
@@ -355,7 +355,7 @@ static void setupButtonCell(NSButtonCell *&buttonCell, ControlPart part, Control
     } else if ([buttonCell bezelStyle] != NSRoundedBezelStyle)
         [buttonCell setBezelStyle:NSRoundedBezelStyle];
 
-    setControlSize(buttonCell, buttonSizes(), zoomedRect.size(), zoomFactor);
+    setControlSize(buttonCell, sizes, zoomedRect.size(), zoomFactor);
 
     // Update the various states we respond to.
     updateStates(buttonCell, states);

-- 
WebKit Debian packaging