| 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 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 666 [_trackAlphaAnimation.get() invalidate]; | 666 [_trackAlphaAnimation.get() invalidate]; |
| 667 [_uiStateTransitionAnimation.get() invalidate]; | 667 [_uiStateTransitionAnimation.get() invalidate]; |
| 668 [_expansionTransitionAnimation.get() invalidate]; | 668 [_expansionTransitionAnimation.get() invalidate]; |
| 669 END_BLOCK_OBJC_EXCEPTIONS; | 669 END_BLOCK_OBJC_EXCEPTIONS; |
| 670 } | 670 } |
| 671 | 671 |
| 672 @end | 672 @end |
| 673 | 673 |
| 674 namespace blink { | 674 namespace blink { |
| 675 | 675 |
| 676 PassOwnPtrWillBeRawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(Scrollable
Area* scrollableArea) | 676 RawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(ScrollableArea* scrollable
Area) |
| 677 { | 677 { |
| 678 return adoptPtrWillBeNoop(new ScrollAnimatorMac(scrollableArea)); | 678 return new ScrollAnimatorMac(scrollableArea); |
| 679 } | 679 } |
| 680 | 680 |
| 681 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) | 681 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) |
| 682 : ScrollAnimatorBase(scrollableArea) | 682 : ScrollAnimatorBase(scrollableArea) |
| 683 , m_initialScrollbarPaintTaskFactory(CancellableTaskFactory::create(this, &S
crollAnimatorMac::initialScrollbarPaintTask)) | 683 , m_initialScrollbarPaintTaskFactory(CancellableTaskFactory::create(this, &S
crollAnimatorMac::initialScrollbarPaintTask)) |
| 684 , m_sendContentAreaScrolledTaskFactory(CancellableTaskFactory::create(this,
&ScrollAnimatorMac::sendContentAreaScrolledTask)) | 684 , m_sendContentAreaScrolledTaskFactory(CancellableTaskFactory::create(this,
&ScrollAnimatorMac::sendContentAreaScrolledTask)) |
| 685 , m_taskRunner(adoptPtr(Platform::current()->currentThread()->scheduler()->t
imerTaskRunner()->clone())) | 685 , m_taskRunner(adoptPtr(Platform::current()->currentThread()->scheduler()->t
imerTaskRunner()->clone())) |
| 686 , m_haveScrolledSincePageLoad(false) | 686 , m_haveScrolledSincePageLoad(false) |
| 687 , m_needsScrollerStyleUpdate(false) | 687 , m_needsScrollerStyleUpdate(false) |
| 688 { | 688 { |
| (...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1105 if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar()) | 1105 if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar()) |
| 1106 rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scr
ollerThumb); | 1106 rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scr
ollerThumb); |
| 1107 | 1107 |
| 1108 if (rectInViewCoordinates == m_visibleScrollerThumbRect) | 1108 if (rectInViewCoordinates == m_visibleScrollerThumbRect) |
| 1109 return; | 1109 return; |
| 1110 | 1110 |
| 1111 m_visibleScrollerThumbRect = rectInViewCoordinates; | 1111 m_visibleScrollerThumbRect = rectInViewCoordinates; |
| 1112 } | 1112 } |
| 1113 | 1113 |
| 1114 } // namespace blink | 1114 } // namespace blink |
| OLD | NEW |