OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
5 * | 5 * |
6 * Other contributors: | 6 * Other contributors: |
7 * Robert O'Callahan <roc+@cs.cmu.edu> | 7 * Robert O'Callahan <roc+@cs.cmu.edu> |
8 * David Baron <dbaron@fas.harvard.edu> | 8 * David Baron <dbaron@fas.harvard.edu> |
9 * Christian Biesinger <cbiesinger@web.de> | 9 * Christian Biesinger <cbiesinger@web.de> |
10 * Randall Jesup <rjesup@wgate.com> | 10 * Randall Jesup <rjesup@wgate.com> |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
140 void scrollToYOffset(double y, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) | 140 void scrollToYOffset(double y, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) |
141 { | 141 { |
142 scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior); | 142 scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior); |
143 } | 143 } |
144 | 144 |
145 void setScrollPosition(const DoublePoint& position, ScrollType scrollType, S crollBehavior scrollBehavior = ScrollBehaviorInstant) override | 145 void setScrollPosition(const DoublePoint& position, ScrollType scrollType, S crollBehavior scrollBehavior = ScrollBehaviorInstant) override |
146 { | 146 { |
147 scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavi or); | 147 scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavi or); |
148 } | 148 } |
149 | 149 |
150 void updateScrollDimensions(DoubleSize& scrollOffset, bool& autoHorizontalSc rollBarChanged, bool& autoVerticalScrollBarChanged); | |
leviw_travelin_and_unemployed
2015/08/20 18:53:06
Seems like maybe these could just take a ScrollInf
szager1
2015/08/20 21:53:29
This file doesn't #include LayoutBlock.h, and I do
| |
151 void finalizeScrollDimensions(const DoubleSize& originalScrollOffset, bool a utoHorizontalScrollBarChanged, bool autoVerticalScrollBarChanged); | |
152 | |
150 void updateAfterLayout(); | 153 void updateAfterLayout(); |
151 void updateAfterStyleChange(const ComputedStyle*); | 154 void updateAfterStyleChange(const ComputedStyle*); |
152 void updateAfterOverflowRecalc(); | 155 void updateAfterOverflowRecalc(); |
153 | 156 |
154 bool updateAfterCompositingChange() override; | 157 bool updateAfterCompositingChange() override; |
155 | 158 |
156 bool hasScrollbar() const { return m_hBar || m_vBar; } | 159 bool hasScrollbar() const { return m_hBar || m_vBar; } |
157 | 160 |
158 LayoutScrollbarPart* scrollCorner() const { return m_scrollCorner; } | 161 LayoutScrollbarPart* scrollCorner() const { return m_scrollCorner; } |
159 | 162 |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
298 LayoutScrollbarPart* m_resizer; | 301 LayoutScrollbarPart* m_resizer; |
299 | 302 |
300 #if ENABLE(ASSERT) | 303 #if ENABLE(ASSERT) |
301 bool m_hasBeenDisposed; | 304 bool m_hasBeenDisposed; |
302 #endif | 305 #endif |
303 }; | 306 }; |
304 | 307 |
305 } // namespace blink | 308 } // namespace blink |
306 | 309 |
307 #endif // LayerScrollableArea_h | 310 #endif // LayerScrollableArea_h |
OLD | NEW |