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 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 [m_scrollbarPainterController.get() setDelegate:nil]; | 584 [m_scrollbarPainterController.get() setDelegate:nil]; |
585 [m_horizontalScrollbarPainterDelegate.get() invalidate]; | 585 [m_horizontalScrollbarPainterDelegate.get() invalidate]; |
586 [m_verticalScrollbarPainterDelegate.get() invalidate]; | 586 [m_verticalScrollbarPainterDelegate.get() invalidate]; |
587 [m_scrollAnimationHelperDelegate.get() invalidate]; | 587 [m_scrollAnimationHelperDelegate.get() invalidate]; |
588 END_BLOCK_OBJC_EXCEPTIONS; | 588 END_BLOCK_OBJC_EXCEPTIONS; |
589 } | 589 } |
590 } | 590 } |
591 | 591 |
592 static bool scrollAnimationEnabledForSystem() | 592 static bool scrollAnimationEnabledForSystem() |
593 { | 593 { |
594 #if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION) | 594 #if defined(BUILDING_ON_SNOW_LEOPARD) || defined(BUILDING_ON_LION) || PLATFORM(C
HROMIUM) |
595 return [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimat
ionEnabled"]; | 595 return [[NSUserDefaults standardUserDefaults] boolForKey:@"AppleScrollAnimat
ionEnabled"]; |
596 #else | 596 #else |
597 return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimation
Enabled"]; | 597 return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSScrollAnimation
Enabled"]; |
598 #endif | 598 #endif |
599 } | 599 } |
600 | 600 |
601 bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranulari
ty granularity, float step, float multiplier) | 601 bool ScrollAnimatorMac::scroll(ScrollbarOrientation orientation, ScrollGranulari
ty granularity, float step, float multiplier) |
602 { | 602 { |
603 m_haveScrolledSincePageLoad = true; | 603 m_haveScrolledSincePageLoad = true; |
604 | 604 |
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1194 if (rectInViewCoordinates == m_visibleScrollerThumbRect) | 1194 if (rectInViewCoordinates == m_visibleScrollerThumbRect) |
1195 return; | 1195 return; |
1196 | 1196 |
1197 m_scrollableArea->setVisibleScrollerThumbRect(rectInViewCoordinates); | 1197 m_scrollableArea->setVisibleScrollerThumbRect(rectInViewCoordinates); |
1198 m_visibleScrollerThumbRect = rectInViewCoordinates; | 1198 m_visibleScrollerThumbRect = rectInViewCoordinates; |
1199 } | 1199 } |
1200 | 1200 |
1201 } // namespace WebCore | 1201 } // namespace WebCore |
1202 | 1202 |
1203 #endif // ENABLE(SMOOTH_SCROLLING) | 1203 #endif // ENABLE(SMOOTH_SCROLLING) |
OLD | NEW |