| 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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 [_trackAlphaAnimation.get() invalidate]; | 670 [_trackAlphaAnimation.get() invalidate]; |
| 671 [_uiStateTransitionAnimation.get() invalidate]; | 671 [_uiStateTransitionAnimation.get() invalidate]; |
| 672 [_expansionTransitionAnimation.get() invalidate]; | 672 [_expansionTransitionAnimation.get() invalidate]; |
| 673 END_BLOCK_OBJC_EXCEPTIONS; | 673 END_BLOCK_OBJC_EXCEPTIONS; |
| 674 } | 674 } |
| 675 | 675 |
| 676 @end | 676 @end |
| 677 | 677 |
| 678 namespace blink { | 678 namespace blink { |
| 679 | 679 |
| 680 PassOwnPtrWillBeRawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(Scrollable
Area* scrollableArea) | 680 RawPtr<ScrollAnimatorBase> ScrollAnimatorBase::create(ScrollableArea* scrollable
Area) |
| 681 { | 681 { |
| 682 return adoptPtrWillBeNoop(new ScrollAnimatorMac(scrollableArea)); | 682 return (new ScrollAnimatorMac(scrollableArea)); |
| 683 } | 683 } |
| 684 | 684 |
| 685 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) | 685 ScrollAnimatorMac::ScrollAnimatorMac(ScrollableArea* scrollableArea) |
| 686 : ScrollAnimatorBase(scrollableArea) | 686 : ScrollAnimatorBase(scrollableArea) |
| 687 , m_initialScrollbarPaintTimer(this, &ScrollAnimatorMac::initialScrollbarPai
ntTimerFired) | 687 , m_initialScrollbarPaintTimer(this, &ScrollAnimatorMac::initialScrollbarPai
ntTimerFired) |
| 688 , m_sendContentAreaScrolledTimer(this, &ScrollAnimatorMac::sendContentAreaSc
rolledTimerFired) | 688 , m_sendContentAreaScrolledTimer(this, &ScrollAnimatorMac::sendContentAreaSc
rolledTimerFired) |
| 689 , m_haveScrolledSincePageLoad(false) | 689 , m_haveScrolledSincePageLoad(false) |
| 690 , m_needsScrollerStyleUpdate(false) | 690 , m_needsScrollerStyleUpdate(false) |
| 691 { | 691 { |
| 692 #if ENABLE(OILPAN) | 692 #if ENABLE(OILPAN) |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 return; | 1181 return; |
| 1182 | 1182 |
| 1183 m_visibleScrollerThumbRect = rectInViewCoordinates; | 1183 m_visibleScrollerThumbRect = rectInViewCoordinates; |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { | 1186 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() { |
| 1187 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); | 1187 return ScrollbarThemeMacCommon::isOverlayAPIAvailable(); |
| 1188 } | 1188 } |
| 1189 | 1189 |
| 1190 } // namespace blink | 1190 } // namespace blink |
| OLD | NEW |