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 |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include <algorithm> | 29 #include <algorithm> |
30 #include "core/platform/PlatformGestureEvent.h" | 30 #include "core/platform/PlatformGestureEvent.h" |
31 #include "core/platform/PlatformMouseEvent.h" | 31 #include "core/platform/PlatformMouseEvent.h" |
32 #include "core/platform/ScrollAnimator.h" | 32 #include "core/platform/ScrollAnimator.h" |
33 #include "core/platform/ScrollableArea.h" | 33 #include "core/platform/ScrollableArea.h" |
34 #include "core/platform/ScrollbarTheme.h" | 34 #include "core/platform/ScrollbarTheme.h" |
35 #include "core/platform/graphics/GraphicsContext.h" | 35 #include "core/platform/graphics/GraphicsContext.h" |
36 | 36 |
37 // FIXME: The following #includes are a layering violation and should be removed
. | 37 // FIXME: The following #includes are a layering violation and should be removed
. |
38 #include "core/accessibility/AXObjectCache.h" | 38 #include "core/accessibility/AXObjectCache.h" |
39 #include "core/accessibility/AccessibilityScrollbar.h" | |
40 #include "core/dom/Document.h" | |
41 #include "core/page/EventHandler.h" | 39 #include "core/page/EventHandler.h" |
42 #include "core/page/Frame.h" | 40 #include "core/page/Frame.h" |
43 #include "core/page/FrameView.h" | 41 #include "core/page/FrameView.h" |
44 | 42 |
45 using namespace std; | 43 using namespace std; |
46 | 44 |
47 #if OS(UNIX) && !OS(DARWIN) | 45 #if OS(UNIX) && !OS(DARWIN) |
48 // The position of the scrollbar thumb affects the appearance of the steppers, s
o | 46 // The position of the scrollbar thumb affects the appearance of the steppers, s
o |
49 // when the thumb moves, we have to invalidate them for painting. | 47 // when the thumb moves, we have to invalidate them for painting. |
50 #define THUMB_POSITION_AFFECTS_BUTTONS | 48 #define THUMB_POSITION_AFFECTS_BUTTONS |
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 | 595 |
598 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const | 596 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const |
599 { | 597 { |
600 if (m_scrollableArea) | 598 if (m_scrollableArea) |
601 return m_scrollableArea->convertFromContainingViewToScrollbar(this, pare
ntPoint); | 599 return m_scrollableArea->convertFromContainingViewToScrollbar(this, pare
ntPoint); |
602 | 600 |
603 return Widget::convertFromContainingView(parentPoint); | 601 return Widget::convertFromContainingView(parentPoint); |
604 } | 602 } |
605 | 603 |
606 } // namespace WebCore | 604 } // namespace WebCore |
OLD | NEW |