[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[bdakin at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 6d07b562e9b1ca9a3737f0e50893ebd9644dc8ef
Author: bdakin at apple.com <bdakin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 02:05:59 2011 +0000

    32-bit build fix.
    
    * platform/mac/ScrollAnimatorMac.mm:
    (-[ScrollbarPainterControllerDelegate contentAreaRectForScrollerImpPair:]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77350 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5015aa7..81cedea 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-01  Beth Dakin  <bdakin at apple.com>
+
+        32-bit build fix.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (-[ScrollbarPainterControllerDelegate contentAreaRectForScrollerImpPair:]):
+
 2011-01-25  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
index d9471e8..b16f761 100644
--- a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
+++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
@@ -172,7 +172,7 @@ static NSSize abs(NSSize size)
 {
     UNUSED_PARAM(scrollerImpPair);
     WebCore::IntSize contentsSize = _animator->scrollableArea()->contentsSize();
-    return CGRectMake(0, 0, contentsSize.width(), contentsSize.height());
+    return NSMakeRect(0, 0, contentsSize.width(), contentsSize.height());
 }
 
 - (BOOL)inLiveResizeForScrollerImpPair:(id)scrollerImpPair

-- 
WebKit Debian packaging