Changeset 77970 in webkit

Timestamp:

Feb 8, 2011 2:11:34 PM (13 years ago)

Author:

Beth Dakin

Message:

Fix for <rdar://problem/8953365> CrashTracer: 14
crashes in WebProcess at com.apple.WebCore:
-[ScrollKnobAnimation setCurrentProgress:] + 258

Reviewed by Darin Adler.

This crash seems to happen when the animation is running
and a window is closed. If the ScrollAnimator is destroyed,
delegate calls for the animation can still run, so we have
to make sure we inform the delegates when the ScrollAnimator
is gone, and then we have to null-check it before we do
anything with it.

Remove scrollbarPainterDelegate() since it's not used anymore.

• platform/mac/ScrollAnimatorMac.h:
• platform/mac/ScrollAnimatorMac.mm:

Add null-checks for _animator
(-[ScrollbarPartAnimation setCurrentProgress:]):
(-[ScrollbarPartAnimation scrollAnimatorDestroyed]):
(-[ScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]):
(-[ScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]):
(-[ScrollbarPainterDelegate scrollerImp:overlayScrollerStateChangedTo:]):

New function to inform the delegates that the ScrollAnimator
is being destroyed.
(-[ScrollbarPainterDelegate scrollAnimatorDestroyed]):
(WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.h (modified) (1 diff)
• platform/mac/ScrollAnimatorMac.mm (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-08  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for <rdar://problem/8953365> CrashTracer: 14 
+        crashes in WebProcess at com.apple.WebCore: 
+        -[ScrollKnobAnimation setCurrentProgress:] + 258
+
+        This crash seems to happen when the animation is running
+        and a window is closed. If the ScrollAnimator is destroyed,
+        delegate calls for the animation can still run, so we have 
+        to make sure we inform the delegates when the ScrollAnimator 
+        is gone, and then we have to null-check it before we do 
+        anything with it.
+
+        Remove scrollbarPainterDelegate() since it's not used anymore.
+        * platform/mac/ScrollAnimatorMac.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        
+        Add null-checks for _animator
+        (-[ScrollbarPartAnimation setCurrentProgress:]):
+        (-[ScrollbarPartAnimation scrollAnimatorDestroyed]):
+        (-[ScrollbarPainterDelegate scrollerImp:animateKnobAlphaTo:duration:]):
+        (-[ScrollbarPainterDelegate scrollerImp:animateTrackAlphaTo:duration:]):
+        (-[ScrollbarPainterDelegate scrollerImp:overlayScrollerStateChangedTo:]):
+        
+        New function to inform the delegates that the ScrollAnimator
+        is being destroyed.
+        (-[ScrollbarPainterDelegate scrollAnimatorDestroyed]):
+        (WebCore::ScrollAnimatorMac::~ScrollAnimatorMac):
+
 2011-02-08  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h

@@ -71 +71 @@
     void immediateScrollByDeltaX(float deltaX);
     void immediateScrollByDeltaY(float deltaY);
-
-    id scrollbarPainterDelegate();
     
 private:

trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm

@@ -279 +279 @@
     [super setCurrentProgress:progress];
 
+    if (!_animator)
+        return;
+
     CGFloat currentAlpha;
     if (_initialAlpha > _newAlpha)
@@ -297 +300 @@
 }
 
+- (void)scrollAnimatorDestroyed
+{
+    _animator = 0;
+}
+
 @end
 
@@ -319 +327 @@
 - (void)scrollerImp:(id)scrollerImp animateTrackAlphaTo:(CGFloat)newTrackAlpha duration:(NSTimeInterval)duration;
 - (void)scrollerImp:(id)scrollerImp overlayScrollerStateChangedTo:(NSUInteger)newOverlayScrollerState;
+
+- (void)scrollAnimatorDestroyed;
 
 @end
@@ -368 +378 @@
 - (void)scrollerImp:(id)scrollerImp animateKnobAlphaTo:(CGFloat)newKnobAlpha duration:(NSTimeInterval)duration
 {
+    if (!_animator)
+        return;
+
     WKScrollbarPainterRef scrollerPainter = (WKScrollbarPainterRef)scrollerImp;
     if (newKnobAlpha == wkScrollbarPainterKnobAlpha(scrollerPainter))
@@ -380 +393 @@
 - (void)scrollerImp:(id)scrollerImp animateTrackAlphaTo:(CGFloat)newTrackAlpha duration:(NSTimeInterval)duration
 {
+    if (!_animator)
+        return;
+
     WKScrollbarPainterRef scrollerPainter = (WKScrollbarPainterRef)scrollerImp;
     if (newTrackAlpha == wkScrollbarPainterTrackAlpha(scrollerPainter))
@@ -392 +408 @@
 - (void)scrollerImp:(id)scrollerImp overlayScrollerStateChangedTo:(NSUInteger)newOverlayScrollerState
 {
+    if (!_animator)
+        return;
+
     WKScrollbarPainterRef scrollbarPainter = (WKScrollbarPainterRef)scrollerImp;
     wkScrollbarPainterSetOverlayState(scrollbarPainter, newOverlayScrollerState);
@@ -403 +422 @@
 
     }
+}
+
+- (void)scrollAnimatorDestroyed
+{
+    _animator = 0;
+    [_verticalKnobAnimation.get() scrollAnimatorDestroyed];
+    [_horizontalKnobAnimation.get() scrollAnimatorDestroyed];
+    [_verticalTrackAnimation.get() scrollAnimatorDestroyed];
+    [_horizontalTrackAnimation.get() scrollAnimatorDestroyed];
 }
 
@@ -440 +468 @@
 #if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
     [(id)m_scrollbarPainterController.get() setDelegate:nil];
-#endif
-}
-
-id ScrollAnimatorMac::scrollbarPainterDelegate()
-{
-#if defined(USE_WK_SCROLLBAR_PAINTER_AND_CONTROLLER)
-    return m_scrollbarPainterDelegate.get();
-#else
-    return nil;
+    [(id)m_scrollbarPainterDelegate.get() scrollAnimatorDestroyed];
 #endif
 }