| 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 "Scrollbar.h" | 27 #include "Scrollbar.h" | 
| 28 | 28 | 
|  | 29 #include <algorithm> | 
| 29 #include "GraphicsContext.h" | 30 #include "GraphicsContext.h" | 
| 30 #include "PlatformGestureEvent.h" | 31 #include "PlatformGestureEvent.h" | 
| 31 #include "PlatformMouseEvent.h" | 32 #include "PlatformMouseEvent.h" | 
| 32 #include "ScrollAnimator.h" | 33 #include "ScrollAnimator.h" | 
| 33 #include "ScrollableArea.h" | 34 #include "ScrollableArea.h" | 
| 34 #include "ScrollbarTheme.h" | 35 #include "ScrollbarTheme.h" | 
| 35 #include <algorithm> |  | 
| 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 "AXObjectCache.h" |  | 
| 39 #include "AccessibilityScrollbar.h" |  | 
| 40 #include "Document.h" | 38 #include "Document.h" | 
| 41 #include "EventHandler.h" | 39 #include "EventHandler.h" | 
| 42 #include "Frame.h" | 40 #include "Frame.h" | 
| 43 #include "FrameView.h" | 41 #include "FrameView.h" | 
|  | 42 #include "core/accessibility/AXObjectCache.h" | 
|  | 43 #include "core/accessibility/AccessibilityScrollbar.h" | 
| 44 | 44 | 
| 45 using namespace std; | 45 using namespace std; | 
| 46 | 46 | 
| 47 #if OS(UNIX) && !OS(DARWIN) | 47 #if OS(UNIX) && !OS(DARWIN) | 
| 48 // The position of the scrollbar thumb affects the appearance of the steppers, s
     o | 48 // 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. | 49 // when the thumb moves, we have to invalidate them for painting. | 
| 50 #define THUMB_POSITION_AFFECTS_BUTTONS | 50 #define THUMB_POSITION_AFFECTS_BUTTONS | 
| 51 #endif | 51 #endif | 
| 52 | 52 | 
| 53 namespace WebCore { | 53 namespace WebCore { | 
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 603 | 603 | 
| 604 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const | 604 IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const | 
| 605 { | 605 { | 
| 606     if (m_scrollableArea) | 606     if (m_scrollableArea) | 
| 607         return m_scrollableArea->convertFromContainingViewToScrollbar(this, pare
     ntPoint); | 607         return m_scrollableArea->convertFromContainingViewToScrollbar(this, pare
     ntPoint); | 
| 608 | 608 | 
| 609     return Widget::convertFromContainingView(parentPoint); | 609     return Widget::convertFromContainingView(parentPoint); | 
| 610 } | 610 } | 
| 611 | 611 | 
| 612 } // namespace WebCore | 612 } // namespace WebCore | 
| OLD | NEW | 
|---|