| 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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' |
| 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, | 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, |
| 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS |
| 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF | 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF |
| 23 * THE POSSIBILITY OF SUCH DAMAGE. | 23 * THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "platform/mac/ScrollAnimatorMac.h" | 26 #include "platform/mac/ScrollAnimatorMac.h" |
| 27 | 27 |
| 28 #import <AppKit/AppKit.h> | 28 #import <AppKit/AppKit.h> |
| 29 | 29 |
| 30 #include <memory> |
| 30 #include "platform/Timer.h" | 31 #include "platform/Timer.h" |
| 31 #include "platform/animation/TimingFunction.h" | 32 #include "platform/animation/TimingFunction.h" |
| 32 #include "platform/geometry/FloatRect.h" | 33 #include "platform/geometry/FloatRect.h" |
| 33 #include "platform/geometry/IntRect.h" | 34 #include "platform/geometry/IntRect.h" |
| 34 #include "platform/mac/BlockExceptions.h" | 35 #include "platform/mac/BlockExceptions.h" |
| 35 #include "platform/mac/NSScrollerImpDetails.h" | 36 #include "platform/mac/NSScrollerImpDetails.h" |
| 36 #include "platform/scroll/ScrollableArea.h" | 37 #include "platform/scroll/ScrollableArea.h" |
| 37 #include "platform/scroll/ScrollbarTheme.h" | 38 #include "platform/scroll/ScrollbarTheme.h" |
| 38 #include "platform/scroll/ScrollbarThemeMac.h" | 39 #include "platform/scroll/ScrollbarThemeMac.h" |
| 40 #include "platform/wtf/MathExtras.h" |
| 41 #include "platform/wtf/PtrUtil.h" |
| 39 #include "public/platform/Platform.h" | 42 #include "public/platform/Platform.h" |
| 40 #include "public/platform/WebScheduler.h" | 43 #include "public/platform/WebScheduler.h" |
| 41 #include "wtf/MathExtras.h" | |
| 42 #include "wtf/PtrUtil.h" | |
| 43 #include <memory> | |
| 44 | 44 |
| 45 using namespace blink; | 45 using namespace blink; |
| 46 | 46 |
| 47 static bool supportsUIStateTransitionProgress() { | 47 static bool supportsUIStateTransitionProgress() { |
| 48 // FIXME: This is temporary until all platforms that support ScrollbarPainter | 48 // FIXME: This is temporary until all platforms that support ScrollbarPainter |
| 49 // support this part of the API. | 49 // support this part of the API. |
| 50 static bool globalSupportsUIStateTransitionProgress = | 50 static bool globalSupportsUIStateTransitionProgress = |
| 51 [NSClassFromString(@"NSScrollerImp") | 51 [NSClassFromString(@"NSScrollerImp") |
| 52 instancesRespondToSelector:@selector(mouseEnteredScroller)]; | 52 instancesRespondToSelector:@selector(mouseEnteredScroller)]; |
| 53 return globalSupportsUIStateTransitionProgress; | 53 return globalSupportsUIStateTransitionProgress; |
| (...skipping 1027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1081 rect_in_view_coordinates = | 1081 rect_in_view_coordinates = |
| 1082 vertical_scrollbar->ConvertToContainingFrameViewBase(scroller_thumb); | 1082 vertical_scrollbar->ConvertToContainingFrameViewBase(scroller_thumb); |
| 1083 | 1083 |
| 1084 if (rect_in_view_coordinates == visible_scroller_thumb_rect_) | 1084 if (rect_in_view_coordinates == visible_scroller_thumb_rect_) |
| 1085 return; | 1085 return; |
| 1086 | 1086 |
| 1087 visible_scroller_thumb_rect_ = rect_in_view_coordinates; | 1087 visible_scroller_thumb_rect_ = rect_in_view_coordinates; |
| 1088 } | 1088 } |
| 1089 | 1089 |
| 1090 } // namespace blink | 1090 } // namespace blink |
| OLD | NEW |