OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2008 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 COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #include "config.h" | 26 #include "config.h" |
27 #include "core/platform/Scrollbar.h" | 27 #include "core/platform/Scrollbar.h" |
28 | 28 |
29 #include <algorithm> | 29 #include <algorithm> |
30 #include "core/platform/PlatformGestureEvent.h" | |
31 #include "core/platform/PlatformMouseEvent.h" | |
32 #include "core/platform/ScrollAnimator.h" | 30 #include "core/platform/ScrollAnimator.h" |
33 #include "core/platform/ScrollableArea.h" | 31 #include "core/platform/ScrollableArea.h" |
34 #include "core/platform/ScrollbarTheme.h" | 32 #include "core/platform/ScrollbarTheme.h" |
35 #include "core/platform/graphics/GraphicsContext.h" | 33 #include "core/platform/graphics/GraphicsContext.h" |
36 | 34 |
37 // FIXME: The following #includes are a layering violation and should be removed
. | 35 // FIXME: The following #includes are a layering violation and should be removed
. |
38 #include "core/accessibility/AXObjectCache.h" | 36 #include "core/accessibility/AXObjectCache.h" |
39 #include "core/page/EventHandler.h" | 37 #include "core/page/EventHandler.h" |
40 #include "core/page/Frame.h" | 38 #include "core/page/Frame.h" |
41 #include "core/page/FrameView.h" | 39 #include "core/page/FrameView.h" |
42 | 40 |
| 41 #include "platform/PlatformGestureEvent.h" |
| 42 #include "platform/PlatformMouseEvent.h" |
| 43 |
43 using namespace std; | 44 using namespace std; |
44 | 45 |
45 #if OS(POSIX) && !OS(MACOSX) | 46 #if OS(POSIX) && !OS(MACOSX) |
46 // The position of the scrollbar thumb affects the appearance of the steppers, s
o | 47 // The position of the scrollbar thumb affects the appearance of the steppers, s
o |
47 // when the thumb moves, we have to invalidate them for painting. | 48 // when the thumb moves, we have to invalidate them for painting. |
48 #define THUMB_POSITION_AFFECTS_BUTTONS | 49 #define THUMB_POSITION_AFFECTS_BUTTONS |
49 #endif | 50 #endif |
50 | 51 |
51 namespace WebCore { | 52 namespace WebCore { |
52 | 53 |
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
595 if (!m_scrollableArea) | 596 if (!m_scrollableArea) |
596 return 0; | 597 return 0; |
597 | 598 |
598 if (m_orientation == HorizontalScrollbar) | 599 if (m_orientation == HorizontalScrollbar) |
599 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu
mScrollPosition().x(); | 600 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu
mScrollPosition().x(); |
600 | 601 |
601 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
ollPosition().y(); | 602 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr
ollPosition().y(); |
602 } | 603 } |
603 | 604 |
604 } // namespace WebCore | 605 } // namespace WebCore |
OLD | NEW |