| 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 "platform/scroll/Scrollbar.h" | 27 #include "platform/scroll/Scrollbar.h" |
| 28 | 28 |
| 29 #include <algorithm> | |
| 30 #include "platform/graphics/GraphicsContext.h" | 29 #include "platform/graphics/GraphicsContext.h" |
| 31 #include "platform/PlatformGestureEvent.h" | 30 #include "platform/PlatformGestureEvent.h" |
| 32 #include "platform/PlatformMouseEvent.h" | 31 #include "platform/PlatformMouseEvent.h" |
| 33 #include "platform/FrameWidget.h" | |
| 34 #include "platform/scroll/ScrollableArea.h" | 32 #include "platform/scroll/ScrollableArea.h" |
| 35 #include "platform/scroll/ScrollAnimator.h" | 33 #include "platform/scroll/ScrollAnimator.h" |
| 36 #include "platform/scroll/Scrollbar.h" | 34 #include "platform/scroll/Scrollbar.h" |
| 37 #include "public/platform/Platform.h" | 35 #include "public/platform/Platform.h" |
| 38 #include "public/platform/WebPoint.h" | 36 #include "public/platform/WebPoint.h" |
| 39 #include "public/platform/WebRect.h" | 37 #include "public/platform/WebRect.h" |
| 40 #include "public/platform/WebScrollbarBehavior.h" | 38 #include "public/platform/WebScrollbarBehavior.h" |
| 41 #include "public/platform/WebThemeEngine.h" | 39 #include "public/platform/WebThemeEngine.h" |
| 42 | 40 |
| 43 #if ((OS(POSIX) && !OS(MACOSX)) || OS(WIN)) | 41 #if ((OS(POSIX) && !OS(MACOSX)) || OS(WIN)) |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 Widget::setFrameRect(IntRect(0, 0, thickness, thickness)); | 79 Widget::setFrameRect(IntRect(0, 0, thickness, thickness)); |
| 82 | 80 |
| 83 m_currentPos = scrollableAreaCurrentPos(); | 81 m_currentPos = scrollableAreaCurrentPos(); |
| 84 } | 82 } |
| 85 | 83 |
| 86 Scrollbar::~Scrollbar() | 84 Scrollbar::~Scrollbar() |
| 87 { | 85 { |
| 88 stopTimerIfNeeded(); | 86 stopTimerIfNeeded(); |
| 89 } | 87 } |
| 90 | 88 |
| 91 void Scrollbar::removeFromParent() | |
| 92 { | |
| 93 if (parent()) | |
| 94 toFrameWidget(parent())->removeChild(this); | |
| 95 } | |
| 96 | |
| 97 ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const | 89 ScrollbarOverlayStyle Scrollbar::scrollbarOverlayStyle() const |
| 98 { | 90 { |
| 99 return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : Scroll
barOverlayStyleDefault; | 91 return m_scrollableArea ? m_scrollableArea->scrollbarOverlayStyle() : Scroll
barOverlayStyleDefault; |
| 100 } | 92 } |
| 101 | 93 |
| 102 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const | 94 void Scrollbar::getTickmarks(Vector<IntRect>& tickmarks) const |
| 103 { | 95 { |
| 104 if (m_scrollableArea) | 96 if (m_scrollableArea) |
| 105 m_scrollableArea->getTickmarks(tickmarks); | 97 m_scrollableArea->getTickmarks(tickmarks); |
| 106 } | 98 } |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 thumbRect.setWidth(thumbRect.width() - kScrollbarMargin); | 665 thumbRect.setWidth(thumbRect.width() - kScrollbarMargin); |
| 674 if (isLeftSideVerticalScrollbar()) | 666 if (isLeftSideVerticalScrollbar()) |
| 675 thumbRect.setX(thumbRect.x() + kScrollbarMargin); | 667 thumbRect.setX(thumbRect.x() + kScrollbarMargin); |
| 676 } | 668 } |
| 677 | 669 |
| 678 DEFINE_STATIC_LOCAL(Color, color, (128, 128, 128, 128)); | 670 DEFINE_STATIC_LOCAL(Color, color, (128, 128, 128, 128)); |
| 679 context->fillRect(thumbRect, color); | 671 context->fillRect(thumbRect, color); |
| 680 } | 672 } |
| 681 | 673 |
| 682 } // namespace blink | 674 } // namespace blink |
| OLD | NEW |