OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
10 * | 10 * |
(...skipping 2889 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2900 m_scrollableAreas->add(scrollableArea); | 2900 m_scrollableAreas->add(scrollableArea); |
2901 } | 2901 } |
2902 | 2902 |
2903 void FrameView::removeScrollableArea(ScrollableArea* scrollableArea) | 2903 void FrameView::removeScrollableArea(ScrollableArea* scrollableArea) |
2904 { | 2904 { |
2905 if (!m_scrollableAreas) | 2905 if (!m_scrollableAreas) |
2906 return; | 2906 return; |
2907 m_scrollableAreas->remove(scrollableArea); | 2907 m_scrollableAreas->remove(scrollableArea); |
2908 } | 2908 } |
2909 | 2909 |
| 2910 void FrameView::addAnimatingScrollableArea(ScrollableArea* scrollableArea) |
| 2911 { |
| 2912 ASSERT(scrollableArea); |
| 2913 if (!m_animatingScrollableAreas) |
| 2914 m_animatingScrollableAreas = adoptPtr(new ScrollableAreaSet); |
| 2915 m_animatingScrollableAreas->add(scrollableArea); |
| 2916 } |
| 2917 |
| 2918 void FrameView::removeAnimatingScrollableArea(ScrollableArea* scrollableArea) |
| 2919 { |
| 2920 if (!m_animatingScrollableAreas) |
| 2921 return; |
| 2922 m_animatingScrollableAreas->remove(scrollableArea); |
| 2923 } |
| 2924 |
2910 void FrameView::setParent(Widget* parentView) | 2925 void FrameView::setParent(Widget* parentView) |
2911 { | 2926 { |
2912 if (parentView == parent()) | 2927 if (parentView == parent()) |
2913 return; | 2928 return; |
2914 | 2929 |
2915 if (m_scrollbarsAvoidingResizer && parent()) | 2930 if (m_scrollbarsAvoidingResizer && parent()) |
2916 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(-m_scrollbar
sAvoidingResizer); | 2931 toFrameView(parent())->adjustScrollbarsAvoidingResizerCount(-m_scrollbar
sAvoidingResizer); |
2917 | 2932 |
2918 Widget::setParent(parentView); | 2933 Widget::setParent(parentView); |
2919 | 2934 |
(...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3966 return; | 3981 return; |
3967 | 3982 |
3968 ScrollableArea::setScrollOrigin(origin); | 3983 ScrollableArea::setScrollOrigin(origin); |
3969 | 3984 |
3970 // Update if the scroll origin changes, since our position will be different
if the content size did not change. | 3985 // Update if the scroll origin changes, since our position will be different
if the content size did not change. |
3971 if (updatePositionAtAll && updatePositionSynchronously) | 3986 if (updatePositionAtAll && updatePositionSynchronously) |
3972 updateScrollbars(scrollOffsetDouble()); | 3987 updateScrollbars(scrollOffsetDouble()); |
3973 } | 3988 } |
3974 | 3989 |
3975 } // namespace blink | 3990 } // namespace blink |
OLD | NEW |