Title: [102468] trunk/Source/WebCore
- Revision
- 102468
- Author
- ander...@apple.com
- Date
- 2011-12-09 13:16:46 -0800 (Fri, 09 Dec 2011)
Log Message
Rename scrollAnimatorDestroyed to invalidate
https://bugs.webkit.org/show_bug.cgi?id=74206
Reviewed by Sam Weinig.
Since these methods can be called when both scrollbars are destroyed and the scroll animator itself is
destroyed, rename it to something more neutral.
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollAnimationHelperDelegate invalidate]):
(-[WebScrollbarPartAnimation invalidate]):
(-[WebScrollbarPainterDelegate invalidate]):
(WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
(WebCore::ScrollAnimatorMac::willRemoveVerticalScrollbar):
(WebCore::ScrollAnimatorMac::willRemoveHorizontalScrollbar):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102467 => 102468)
--- trunk/Source/WebCore/ChangeLog 2011-12-09 21:08:10 UTC (rev 102467)
+++ trunk/Source/WebCore/ChangeLog 2011-12-09 21:16:46 UTC (rev 102468)
@@ -1,5 +1,23 @@
2011-12-09 Anders Carlsson <ander...@apple.com>
+ Rename scrollAnimatorDestroyed to invalidate
+ https://bugs.webkit.org/show_bug.cgi?id=74206
+
+ Reviewed by Sam Weinig.
+
+ Since these methods can be called when both scrollbars are destroyed and the scroll animator itself is
+ destroyed, rename it to something more neutral.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[WebScrollAnimationHelperDelegate invalidate]):
+ (-[WebScrollbarPartAnimation invalidate]):
+ (-[WebScrollbarPainterDelegate invalidate]):
+ (WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
+ (WebCore::ScrollAnimatorMac::willRemoveVerticalScrollbar):
+ (WebCore::ScrollAnimatorMac::willRemoveHorizontalScrollbar):
+
+2011-12-09 Anders Carlsson <ander...@apple.com>
+
WebScrollbarPainterControllerDelegate should know about the ScrollableArea, not the ScrollAnimatorMac
https://bugs.webkit.org/show_bug.cgi?id=74204
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (102467 => 102468)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-09 21:08:10 UTC (rev 102467)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-09 21:16:46 UTC (rev 102468)
@@ -105,7 +105,7 @@
return self;
}
-- (void)scrollAnimatorDestroyed
+- (void)invalidate
{
_animator = 0;
}
@@ -350,7 +350,7 @@
_scrollbar->invalidate();
}
-- (void)scrollAnimatorDestroyed
+- (void)invalidate
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
[self stopAnimation];
@@ -542,13 +542,13 @@
UNUSED_PARAM(newOverlayScrollerState);
}
-- (void)scrollAnimatorDestroyed
+- (void)invalidate
{
_scrollbar = 0;
BEGIN_BLOCK_OBJC_EXCEPTIONS;
- [_knobAlphaAnimation.get() scrollAnimatorDestroyed];
- [_trackAlphaAnimation.get() scrollAnimatorDestroyed];
- [_uiStateTransitionAnimation.get() scrollAnimatorDestroyed];
+ [_knobAlphaAnimation.get() invalidate];
+ [_trackAlphaAnimation.get() invalidate];
+ [_uiStateTransitionAnimation.get() invalidate];
END_BLOCK_OBJC_EXCEPTIONS;
}
@@ -593,9 +593,9 @@
BEGIN_BLOCK_OBJC_EXCEPTIONS;
[m_scrollbarPainterControllerDelegate.get() invalidate];
[m_scrollbarPainterController.get() setDelegate:nil];
- [m_horizontalScrollbarPainterDelegate.get() scrollAnimatorDestroyed];
- [m_verticalScrollbarPainterDelegate.get() scrollAnimatorDestroyed];
- [m_scrollAnimationHelperDelegate.get() scrollAnimatorDestroyed];
+ [m_horizontalScrollbarPainterDelegate.get() invalidate];
+ [m_verticalScrollbarPainterDelegate.get() invalidate];
+ [m_scrollAnimationHelperDelegate.get() invalidate];
END_BLOCK_OBJC_EXCEPTIONS;
#endif
}
@@ -874,7 +874,7 @@
return;
ASSERT(m_verticalScrollbarPainterDelegate);
- [m_verticalScrollbarPainterDelegate.get() scrollAnimatorDestroyed];
+ [m_verticalScrollbarPainterDelegate.get() invalidate];
m_verticalScrollbarPainterDelegate = nullptr;
[painter setDelegate:nil];
@@ -911,7 +911,7 @@
return;
ASSERT(m_horizontalScrollbarPainterDelegate);
- [m_horizontalScrollbarPainterDelegate.get() scrollAnimatorDestroyed];
+ [m_horizontalScrollbarPainterDelegate.get() invalidate];
m_horizontalScrollbarPainterDelegate = nullptr;
[painter setDelegate:nil];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
