| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "platform/mac/BlockExceptions.h" | 34 #include "platform/mac/BlockExceptions.h" |
| 35 #include "platform/mac/NSScrollerImpDetails.h" | 35 #include "platform/mac/NSScrollerImpDetails.h" |
| 36 #include "platform/scroll/ScrollView.h" | 36 #include "platform/scroll/ScrollView.h" |
| 37 #include "platform/scroll/ScrollableArea.h" | 37 #include "platform/scroll/ScrollableArea.h" |
| 38 #include "platform/scroll/ScrollbarTheme.h" | 38 #include "platform/scroll/ScrollbarTheme.h" |
| 39 #include "platform/scroll/ScrollbarThemeMacCommon.h" | 39 #include "platform/scroll/ScrollbarThemeMacCommon.h" |
| 40 #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h" | 40 #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h" |
| 41 #include "wtf/MainThread.h" | 41 #include "wtf/MainThread.h" |
| 42 #include "wtf/PassOwnPtr.h" | 42 #include "wtf/PassOwnPtr.h" |
| 43 | 43 |
| 44 using namespace WebCore; | 44 using namespace blink; |
| 45 using namespace std; | 45 using namespace std; |
| 46 | 46 |
| 47 static bool supportsUIStateTransitionProgress() | 47 static bool supportsUIStateTransitionProgress() |
| 48 { | 48 { |
| 49 // FIXME: This is temporary until all platforms that support ScrollbarPainte
r support this part of the API. | 49 // FIXME: This is temporary until all platforms that support ScrollbarPainte
r support this part of the API. |
| 50 static bool globalSupportsUIStateTransitionProgress = [NSClassFromString(@"N
SScrollerImp") instancesRespondToSelector:@selector(mouseEnteredScroller)]; | 50 static bool globalSupportsUIStateTransitionProgress = [NSClassFromString(@"N
SScrollerImp") instancesRespondToSelector:@selector(mouseEnteredScroller)]; |
| 51 return globalSupportsUIStateTransitionProgress; | 51 return globalSupportsUIStateTransitionProgress; |
| 52 } | 52 } |
| 53 | 53 |
| 54 static bool supportsExpansionTransitionProgress() | 54 static bool supportsExpansionTransitionProgress() |
| (...skipping 26 matching lines...) Expand all Loading... |
| 81 @interface NSObject (ScrollAnimationHelperDetails) | 81 @interface NSObject (ScrollAnimationHelperDetails) |
| 82 - (id)initWithDelegate:(id)delegate; | 82 - (id)initWithDelegate:(id)delegate; |
| 83 - (void)_stopRun; | 83 - (void)_stopRun; |
| 84 - (BOOL)_isAnimating; | 84 - (BOOL)_isAnimating; |
| 85 - (NSPoint)targetOrigin; | 85 - (NSPoint)targetOrigin; |
| 86 - (CGFloat)_progress; | 86 - (CGFloat)_progress; |
| 87 @end | 87 @end |
| 88 | 88 |
| 89 @interface WebScrollAnimationHelperDelegate : NSObject | 89 @interface WebScrollAnimationHelperDelegate : NSObject |
| 90 { | 90 { |
| 91 WebCore::ScrollAnimatorMac* _animator; | 91 blink::ScrollAnimatorMac* _animator; |
| 92 } | 92 } |
| 93 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator; | 93 - (id)initWithScrollAnimator:(blink::ScrollAnimatorMac*)scrollAnimator; |
| 94 @end | 94 @end |
| 95 | 95 |
| 96 static NSSize abs(NSSize size) | 96 static NSSize abs(NSSize size) |
| 97 { | 97 { |
| 98 NSSize finalSize = size; | 98 NSSize finalSize = size; |
| 99 if (finalSize.width < 0) | 99 if (finalSize.width < 0) |
| 100 finalSize.width = -finalSize.width; | 100 finalSize.width = -finalSize.width; |
| 101 if (finalSize.height < 0) | 101 if (finalSize.height < 0) |
| 102 finalSize.height = -finalSize.height; | 102 finalSize.height = -finalSize.height; |
| 103 return finalSize; | 103 return finalSize; |
| 104 } | 104 } |
| 105 | 105 |
| 106 @implementation WebScrollAnimationHelperDelegate | 106 @implementation WebScrollAnimationHelperDelegate |
| 107 | 107 |
| 108 - (id)initWithScrollAnimator:(WebCore::ScrollAnimatorMac*)scrollAnimator | 108 - (id)initWithScrollAnimator:(blink::ScrollAnimatorMac*)scrollAnimator |
| 109 { | 109 { |
| 110 self = [super init]; | 110 self = [super init]; |
| 111 if (!self) | 111 if (!self) |
| 112 return nil; | 112 return nil; |
| 113 | 113 |
| 114 _animator = scrollAnimator; | 114 _animator = scrollAnimator; |
| 115 return self; | 115 return self; |
| 116 } | 116 } |
| 117 | 117 |
| 118 - (void)invalidate | 118 - (void)invalidate |
| 119 { | 119 { |
| 120 _animator = 0; | 120 _animator = 0; |
| 121 } | 121 } |
| 122 | 122 |
| 123 - (NSRect)bounds | 123 - (NSRect)bounds |
| 124 { | 124 { |
| 125 if (!_animator) | 125 if (!_animator) |
| 126 return NSZeroRect; | 126 return NSZeroRect; |
| 127 | 127 |
| 128 WebCore::FloatPoint currentPosition = _animator->currentPosition(); | 128 blink::FloatPoint currentPosition = _animator->currentPosition(); |
| 129 return NSMakeRect(currentPosition.x(), currentPosition.y(), 0, 0); | 129 return NSMakeRect(currentPosition.x(), currentPosition.y(), 0, 0); |
| 130 } | 130 } |
| 131 | 131 |
| 132 - (void)_immediateScrollToPoint:(NSPoint)newPosition | 132 - (void)_immediateScrollToPoint:(NSPoint)newPosition |
| 133 { | 133 { |
| 134 if (!_animator) | 134 if (!_animator) |
| 135 return; | 135 return; |
| 136 _animator->immediateScrollToPointForScrollAnimation(newPosition); | 136 _animator->immediateScrollToPointForScrollAnimation(newPosition); |
| 137 } | 137 } |
| 138 | 138 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 - (void)invalidate | 204 - (void)invalidate |
| 205 { | 205 { |
| 206 _scrollableArea = 0; | 206 _scrollableArea = 0; |
| 207 } | 207 } |
| 208 | 208 |
| 209 - (NSRect)contentAreaRectForScrollerImpPair:(id)scrollerImpPair | 209 - (NSRect)contentAreaRectForScrollerImpPair:(id)scrollerImpPair |
| 210 { | 210 { |
| 211 if (!_scrollableArea) | 211 if (!_scrollableArea) |
| 212 return NSZeroRect; | 212 return NSZeroRect; |
| 213 | 213 |
| 214 WebCore::IntSize contentsSize = _scrollableArea->contentsSize(); | 214 blink::IntSize contentsSize = _scrollableArea->contentsSize(); |
| 215 return NSMakeRect(0, 0, contentsSize.width(), contentsSize.height()); | 215 return NSMakeRect(0, 0, contentsSize.width(), contentsSize.height()); |
| 216 } | 216 } |
| 217 | 217 |
| 218 - (BOOL)inLiveResizeForScrollerImpPair:(id)scrollerImpPair | 218 - (BOOL)inLiveResizeForScrollerImpPair:(id)scrollerImpPair |
| 219 { | 219 { |
| 220 if (!_scrollableArea) | 220 if (!_scrollableArea) |
| 221 return NO; | 221 return NO; |
| 222 | 222 |
| 223 return _scrollableArea->inLiveResize(); | 223 return _scrollableArea->inLiveResize(); |
| 224 } | 224 } |
| 225 | 225 |
| 226 - (NSPoint)mouseLocationInContentAreaForScrollerImpPair:(id)scrollerImpPair | 226 - (NSPoint)mouseLocationInContentAreaForScrollerImpPair:(id)scrollerImpPair |
| 227 { | 227 { |
| 228 if (!_scrollableArea) | 228 if (!_scrollableArea) |
| 229 return NSZeroPoint; | 229 return NSZeroPoint; |
| 230 | 230 |
| 231 return _scrollableArea->lastKnownMousePosition(); | 231 return _scrollableArea->lastKnownMousePosition(); |
| 232 } | 232 } |
| 233 | 233 |
| 234 - (NSPoint)scrollerImpPair:(id)scrollerImpPair convertContentPoint:(NSPoint)poin
tInContentArea toScrollerImp:(id)scrollerImp | 234 - (NSPoint)scrollerImpPair:(id)scrollerImpPair convertContentPoint:(NSPoint)poin
tInContentArea toScrollerImp:(id)scrollerImp |
| 235 { | 235 { |
| 236 | 236 |
| 237 if (!_scrollableArea || !scrollerImp) | 237 if (!_scrollableArea || !scrollerImp) |
| 238 return NSZeroPoint; | 238 return NSZeroPoint; |
| 239 | 239 |
| 240 WebCore::Scrollbar* scrollbar = 0; | 240 blink::Scrollbar* scrollbar = 0; |
| 241 if ([scrollerImp isHorizontal]) | 241 if ([scrollerImp isHorizontal]) |
| 242 scrollbar = _scrollableArea->horizontalScrollbar(); | 242 scrollbar = _scrollableArea->horizontalScrollbar(); |
| 243 else | 243 else |
| 244 scrollbar = _scrollableArea->verticalScrollbar(); | 244 scrollbar = _scrollableArea->verticalScrollbar(); |
| 245 | 245 |
| 246 // It is possible to have a null scrollbar here since it is possible for thi
s delegate | 246 // It is possible to have a null scrollbar here since it is possible for thi
s delegate |
| 247 // method to be called between the moment when a scrollbar has been set to 0
and the | 247 // method to be called between the moment when a scrollbar has been set to 0
and the |
| 248 // moment when its destructor has been called. We should probably de-couple
some | 248 // moment when its destructor has been called. We should probably de-couple
some |
| 249 // of the clean-up work in ScrollbarThemeMac::unregisterScrollbar() to avoid
this | 249 // of the clean-up work in ScrollbarThemeMac::unregisterScrollbar() to avoid
this |
| 250 // issue. | 250 // issue. |
| 251 if (!scrollbar) | 251 if (!scrollbar) |
| 252 return NSZeroPoint; | 252 return NSZeroPoint; |
| 253 | 253 |
| 254 ASSERT(scrollerImp == scrollbarPainterForScrollbar(scrollbar)); | 254 ASSERT(scrollerImp == scrollbarPainterForScrollbar(scrollbar)); |
| 255 | 255 |
| 256 return scrollbar->convertFromContainingView(WebCore::IntPoint(pointInContent
Area)); | 256 return scrollbar->convertFromContainingView(blink::IntPoint(pointInContentAr
ea)); |
| 257 } | 257 } |
| 258 | 258 |
| 259 - (void)scrollerImpPair:(id)scrollerImpPair setContentAreaNeedsDisplayInRect:(NS
Rect)rect | 259 - (void)scrollerImpPair:(id)scrollerImpPair setContentAreaNeedsDisplayInRect:(NS
Rect)rect |
| 260 { | 260 { |
| 261 if (!_scrollableArea) | 261 if (!_scrollableArea) |
| 262 return; | 262 return; |
| 263 | 263 |
| 264 if (!_scrollableArea->scrollbarsCanBeActive()) | 264 if (!_scrollableArea->scrollbarsCanBeActive()) |
| 265 return; | 265 return; |
| 266 | 266 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 BEGIN_BLOCK_OBJC_EXCEPTIONS; | 376 BEGIN_BLOCK_OBJC_EXCEPTIONS; |
| 377 [self stopAnimation]; | 377 [self stopAnimation]; |
| 378 END_BLOCK_OBJC_EXCEPTIONS; | 378 END_BLOCK_OBJC_EXCEPTIONS; |
| 379 _scrollbar = 0; | 379 _scrollbar = 0; |
| 380 } | 380 } |
| 381 | 381 |
| 382 @end | 382 @end |
| 383 | 383 |
| 384 @interface WebScrollbarPainterDelegate : NSObject<NSAnimationDelegate> | 384 @interface WebScrollbarPainterDelegate : NSObject<NSAnimationDelegate> |
| 385 { | 385 { |
| 386 WebCore::Scrollbar* _scrollbar; | 386 blink::Scrollbar* _scrollbar; |
| 387 | 387 |
| 388 RetainPtr<WebScrollbarPartAnimation> _knobAlphaAnimation; | 388 RetainPtr<WebScrollbarPartAnimation> _knobAlphaAnimation; |
| 389 RetainPtr<WebScrollbarPartAnimation> _trackAlphaAnimation; | 389 RetainPtr<WebScrollbarPartAnimation> _trackAlphaAnimation; |
| 390 RetainPtr<WebScrollbarPartAnimation> _uiStateTransitionAnimation; | 390 RetainPtr<WebScrollbarPartAnimation> _uiStateTransitionAnimation; |
| 391 RetainPtr<WebScrollbarPartAnimation> _expansionTransitionAnimation; | 391 RetainPtr<WebScrollbarPartAnimation> _expansionTransitionAnimation; |
| 392 } | 392 } |
| 393 - (id)initWithScrollbar:(WebCore::Scrollbar*)scrollbar; | 393 - (id)initWithScrollbar:(blink::Scrollbar*)scrollbar; |
| 394 - (void)cancelAnimations; | 394 - (void)cancelAnimations; |
| 395 @end | 395 @end |
| 396 | 396 |
| 397 @implementation WebScrollbarPainterDelegate | 397 @implementation WebScrollbarPainterDelegate |
| 398 | 398 |
| 399 - (id)initWithScrollbar:(WebCore::Scrollbar*)scrollbar | 399 - (id)initWithScrollbar:(blink::Scrollbar*)scrollbar |
| 400 { | 400 { |
| 401 self = [super init]; | 401 self = [super init]; |
| 402 if (!self) | 402 if (!self) |
| 403 return nil; | 403 return nil; |
| 404 | 404 |
| 405 _scrollbar = scrollbar; | 405 _scrollbar = scrollbar; |
| 406 return self; | 406 return self; |
| 407 } | 407 } |
| 408 | 408 |
| 409 - (void)cancelAnimations | 409 - (void)cancelAnimations |
| (...skipping 24 matching lines...) Expand all Loading... |
| 434 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp | 434 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp |
| 435 { | 435 { |
| 436 if (!_scrollbar) | 436 if (!_scrollbar) |
| 437 return NSZeroPoint; | 437 return NSZeroPoint; |
| 438 | 438 |
| 439 ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(_scro
llbar)); | 439 ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(_scro
llbar)); |
| 440 | 440 |
| 441 return _scrollbar->convertFromContainingView(_scrollbar->scrollableArea()->l
astKnownMousePosition()); | 441 return _scrollbar->convertFromContainingView(_scrollbar->scrollableArea()->l
astKnownMousePosition()); |
| 442 } | 442 } |
| 443 | 443 |
| 444 - (void)setUpAlphaAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPart
Animation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(WebCore::Scrol
lbarPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration | 444 - (void)setUpAlphaAnimation:(RetainPtr<WebScrollbarPartAnimation>&)scrollbarPart
Animation scrollerPainter:(ScrollbarPainter)scrollerPainter part:(blink::Scrollb
arPart)part animateAlphaTo:(CGFloat)newAlpha duration:(NSTimeInterval)duration |
| 445 { | 445 { |
| 446 // If the user has scrolled the page, then the scrollbars must be animated h
ere. | 446 // If the user has scrolled the page, then the scrollbars must be animated h
ere. |
| 447 // This overrides the early returns. | 447 // This overrides the early returns. |
| 448 bool mustAnimate = [self scrollAnimator]->haveScrolledSincePageLoad(); | 448 bool mustAnimate = [self scrollAnimator]->haveScrolledSincePageLoad(); |
| 449 | 449 |
| 450 if ([self scrollAnimator]->scrollbarPaintTimerIsActive() && !mustAnimate) | 450 if ([self scrollAnimator]->scrollbarPaintTimerIsActive() && !mustAnimate) |
| 451 return; | 451 return; |
| 452 | 452 |
| 453 if (_scrollbar->scrollableArea()->shouldSuspendScrollAnimations() && !mustAn
imate) { | 453 if (_scrollbar->scrollableArea()->shouldSuspendScrollAnimations() && !mustAn
imate) { |
| 454 [self scrollAnimator]->startScrollbarPaintTimer(); | 454 [self scrollAnimator]->startScrollbarPaintTimer(); |
| 455 return; | 455 return; |
| 456 } | 456 } |
| 457 | 457 |
| 458 // At this point, we are definitely going to animate now, so stop the timer. | 458 // At this point, we are definitely going to animate now, so stop the timer. |
| 459 [self scrollAnimator]->stopScrollbarPaintTimer(); | 459 [self scrollAnimator]->stopScrollbarPaintTimer(); |
| 460 | 460 |
| 461 // If we are currently animating, stop | 461 // If we are currently animating, stop |
| 462 if (scrollbarPartAnimation) { | 462 if (scrollbarPartAnimation) { |
| 463 [scrollbarPartAnimation.get() stopAnimation]; | 463 [scrollbarPartAnimation.get() stopAnimation]; |
| 464 scrollbarPartAnimation = nil; | 464 scrollbarPartAnimation = nil; |
| 465 } | 465 } |
| 466 | 466 |
| 467 if (part == WebCore::ThumbPart && _scrollbar->orientation() == VerticalScrol
lbar) { | 467 if (part == blink::ThumbPart && _scrollbar->orientation() == VerticalScrollb
ar) { |
| 468 if (newAlpha == 1) { | 468 if (newAlpha == 1) { |
| 469 IntRect thumbRect = IntRect([scrollerPainter rectForPart:NSScrollerK
nob]); | 469 IntRect thumbRect = IntRect([scrollerPainter rectForPart:NSScrollerK
nob]); |
| 470 [self scrollAnimator]->setVisibleScrollerThumbRect(thumbRect); | 470 [self scrollAnimator]->setVisibleScrollerThumbRect(thumbRect); |
| 471 } else | 471 } else |
| 472 [self scrollAnimator]->setVisibleScrollerThumbRect(IntRect()); | 472 [self scrollAnimator]->setVisibleScrollerThumbRect(IntRect()); |
| 473 } | 473 } |
| 474 | 474 |
| 475 scrollbarPartAnimation.adoptNS([[WebScrollbarPartAnimation alloc] initWithSc
rollbar:_scrollbar | 475 scrollbarPartAnimation.adoptNS([[WebScrollbarPartAnimation alloc] initWithSc
rollbar:_scrollbar |
| 476 featureTo
Animate:part == ThumbPart ? ThumbAlpha : TrackAlpha | 476 featureTo
Animate:part == ThumbPart ? ThumbAlpha : TrackAlpha |
| 477 anim
ateFrom:part == ThumbPart ? [scrollerPainter knobAlpha] : [scrollerPainter track
Alpha] | 477 anim
ateFrom:part == ThumbPart ? [scrollerPainter knobAlpha] : [scrollerPainter track
Alpha] |
| 478 an
imateTo:newAlpha | 478 an
imateTo:newAlpha |
| 479 d
uration:duration]); | 479 d
uration:duration]); |
| 480 [scrollbarPartAnimation.get() startAnimation]; | 480 [scrollbarPartAnimation.get() startAnimation]; |
| 481 } | 481 } |
| 482 | 482 |
| 483 - (void)scrollerImp:(id)scrollerImp animateKnobAlphaTo:(CGFloat)newKnobAlpha dur
ation:(NSTimeInterval)duration | 483 - (void)scrollerImp:(id)scrollerImp animateKnobAlphaTo:(CGFloat)newKnobAlpha dur
ation:(NSTimeInterval)duration |
| 484 { | 484 { |
| 485 if (!_scrollbar) | 485 if (!_scrollbar) |
| 486 return; | 486 return; |
| 487 | 487 |
| 488 ASSERT(scrollerImp == scrollbarPainterForScrollbar(_scrollbar)); | 488 ASSERT(scrollerImp == scrollbarPainterForScrollbar(_scrollbar)); |
| 489 | 489 |
| 490 ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp; | 490 ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp; |
| 491 [self setUpAlphaAnimation:_knobAlphaAnimation scrollerPainter:scrollerPainte
r part:WebCore::ThumbPart animateAlphaTo:newKnobAlpha duration:duration]; | 491 [self setUpAlphaAnimation:_knobAlphaAnimation scrollerPainter:scrollerPainte
r part:blink::ThumbPart animateAlphaTo:newKnobAlpha duration:duration]; |
| 492 } | 492 } |
| 493 | 493 |
| 494 - (void)scrollerImp:(id)scrollerImp animateTrackAlphaTo:(CGFloat)newTrackAlpha d
uration:(NSTimeInterval)duration | 494 - (void)scrollerImp:(id)scrollerImp animateTrackAlphaTo:(CGFloat)newTrackAlpha d
uration:(NSTimeInterval)duration |
| 495 { | 495 { |
| 496 if (!_scrollbar) | 496 if (!_scrollbar) |
| 497 return; | 497 return; |
| 498 | 498 |
| 499 ASSERT(scrollerImp == scrollbarPainterForScrollbar(_scrollbar)); | 499 ASSERT(scrollerImp == scrollbarPainterForScrollbar(_scrollbar)); |
| 500 | 500 |
| 501 ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp; | 501 ScrollbarPainter scrollerPainter = (ScrollbarPainter)scrollerImp; |
| 502 [self setUpAlphaAnimation:_trackAlphaAnimation scrollerPainter:scrollerPaint
er part:WebCore::BackTrackPart animateAlphaTo:newTrackAlpha duration:duration]; | 502 [self setUpAlphaAnimation:_trackAlphaAnimation scrollerPainter:scrollerPaint
er part:blink::BackTrackPart animateAlphaTo:newTrackAlpha duration:duration]; |
| 503 } | 503 } |
| 504 | 504 |
| 505 - (void)scrollerImp:(id)scrollerImp animateUIStateTransitionWithDuration:(NSTime
Interval)duration | 505 - (void)scrollerImp:(id)scrollerImp animateUIStateTransitionWithDuration:(NSTime
Interval)duration |
| 506 { | 506 { |
| 507 if (!_scrollbar) | 507 if (!_scrollbar) |
| 508 return; | 508 return; |
| 509 | 509 |
| 510 if (!supportsUIStateTransitionProgress()) | 510 if (!supportsUIStateTransitionProgress()) |
| 511 return; | 511 return; |
| 512 | 512 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 BEGIN_BLOCK_OBJC_EXCEPTIONS; | 572 BEGIN_BLOCK_OBJC_EXCEPTIONS; |
| 573 [_knobAlphaAnimation.get() invalidate]; | 573 [_knobAlphaAnimation.get() invalidate]; |
| 574 [_trackAlphaAnimation.get() invalidate]; | 574 [_trackAlphaAnimation.get() invalidate]; |
| 575 [_uiStateTransitionAnimation.get() invalidate]; | 575 [_uiStateTransitionAnimation.get() invalidate]; |
| 576 [_expansionTransitionAnimation.get() invalidate]; | 576 [_expansionTransitionAnimation.get() invalidate]; |
| 577 END_BLOCK_OBJC_EXCEPTIONS; | 577 END_BLOCK_OBJC_EXCEPTIONS; |
| 578 } | 578 } |
| 579 | 579 |
| 580 @end | 580 @end |
| 581 | 581 |
| 582 namespace WebCore { | 582 namespace blink { |
| 583 | 583 |
| 584 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) | 584 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea
) |
| 585 { | 585 { |
| 586 return adoptPtr(new ScrollAnimatorMac(scrollableArea)); | 586 return adoptPtr(new ScrollAnimatorMac(scrollableArea)); |
| 587 } | 587 } |
| 588 | 588 |
| 589 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) | 589 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) |
| 590 : ScrollAnimator(scrollableArea) | 590 : ScrollAnimator(scrollableArea) |
| 591 , m_initialScrollbarPaintTimer(this, &ScrollAnimatorMac::initialScrollbarPai
ntTimerFired) | 591 , m_initialScrollbarPaintTimer(this, &ScrollAnimatorMac::initialScrollbarPai
ntTimerFired) |
| 592 , m_sendContentAreaScrolledTimer(this, &ScrollAnimatorMac::sendContentAreaSc
rolledTimerFired) | 592 , m_sendContentAreaScrolledTimer(this, &ScrollAnimatorMac::sendContentAreaSc
rolledTimerFired) |
| (...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1287 if (rectInViewCoordinates == m_visibleScrollerThumbRect) | 1287 if (rectInViewCoordinates == m_visibleScrollerThumbRect) |
| 1288 return; | 1288 return; |
| 1289 | 1289 |
| 1290 m_visibleScrollerThumbRect = rectInViewCoordinates; | 1290 m_visibleScrollerThumbRect = rectInViewCoordinates; |
| 1291 } | 1291 } |
| 1292 | 1292 |
| 1293 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { | 1293 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { |
| 1294 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); | 1294 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); |
| 1295 } | 1295 } |
| 1296 | 1296 |
| 1297 } // namespace WebCore | 1297 } // namespace blink |
| OLD | NEW |