[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
weinig at apple.com
weinig at apple.com
Mon Feb 21 00:33:48 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 1e05f3d5eaca8544c78f8a034c0a210fb736cbfe
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 1 22:04:11 2011 +0000
Fix the build for Beth.
* platform/mac/ScrollAnimatorMac.mm:
(-[ScrollbarPainterControllerDelegate inLiveResizeForScrollerImpPair:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0d70b73..528cce3 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2011-02-01 Sam Weinig <sam at webkit.org>
+ Fix the build for Beth.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[ScrollbarPainterControllerDelegate inLiveResizeForScrollerImpPair:]):
+
+2011-02-01 Sam Weinig <sam at webkit.org>
+
Reviewed by Beth Dakin.
Part 2 for <rdar://problem/8492788>
diff --git a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
index 47ade6e..d9471e8 100644
--- a/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
+++ b/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
@@ -178,7 +178,7 @@ static NSSize abs(NSSize size)
- (BOOL)inLiveResizeForScrollerImpPair:(id)scrollerImpPair
{
UNUSED_PARAM(scrollerImpPair);
- return _animator->inLiveResize();
+ return _animator->scrollableArea()->inLiveResize();
}
- (NSPoint)mouseLocationInContentAreaForScrollerImpPair:(id)scrollerImpPair
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list