Title: [102288] branches/safari-534.53-branch/Source/WebCore
- Revision
- 102288
- Author
- lforsch...@apple.com
- Date
- 2011-12-07 17:19:47 -0800 (Wed, 07 Dec 2011)
Log Message
Fix a compiler error about implicit conversion from 64 to 32bit int.
Reviewed by Beth Dakin.
* platform/mac/ScrollAnimatorMac.mm:
(-[ScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebCore/ChangeLog (102287 => 102288)
--- branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-08 00:52:53 UTC (rev 102287)
+++ branches/safari-534.53-branch/Source/WebCore/ChangeLog 2011-12-08 01:19:47 UTC (rev 102288)
@@ -1,5 +1,14 @@
2011-12-07 Lucas Forschler <lforsch...@apple.com>
+ Fix a compiler error about implicit conversion from 64 to 32bit int.
+
+ Reviewed by Beth Dakin.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[ScrollbarPainterDelegate scrollerImp:animateUIStateTransitionWithDuration:]):
+
+2011-12-07 Lucas Forschler <lforsch...@apple.com>
+
Merge 99493
2011-11-07 Beth Dakin <bda...@apple.com>
Modified: branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (102287 => 102288)
--- branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-08 00:52:53 UTC (rev 102287)
+++ branches/safari-534.53-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-08 01:19:47 UTC (rev 102288)
@@ -513,14 +513,14 @@
animate:UIStateTransition
scrollAnimator:_animator
animateFrom:[scrollerPainter uiStateTransitionProgress]
- animateTo:1.0
+ animateTo:1.0f
duration:duration]);
[scrollbarPartAnimation.get() setAnimationBlockingMode:NSAnimationNonblocking];
} else {
// If we don't need to initialize the animation, just reset the values in case they have changed.
[scrollbarPartAnimation.get() setScrollbarPainter:scrollerPainter];
[scrollbarPartAnimation.get() setStartValue:[scrollerPainter uiStateTransitionProgress]];
- [scrollbarPartAnimation.get() setEndValue:1.0];
+ [scrollbarPartAnimation.get() setEndValue:1.0f];
[scrollbarPartAnimation.get() setDuration:duration];
}
[scrollbarPartAnimation.get() startAnimation];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
