| 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 bool shouldPlaceVerticalScrollbarOnLeft() const override; | 230 bool shouldPlaceVerticalScrollbarOnLeft() const override; |
| 231 int pageStep(ScrollbarOrientation) const override; | 231 int pageStep(ScrollbarOrientation) const override; |
| 232 ScrollBehavior scrollBehaviorStyle() const override; | 232 ScrollBehavior scrollBehaviorStyle() const override; |
| 233 CompositorAnimationTimeline* compositorAnimationTimeline() const override; | 233 CompositorAnimationTimeline* compositorAnimationTimeline() const override; |
| 234 | 234 |
| 235 double scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin(
).x(); } | 235 double scrollXOffset() const { return m_scrollOffset.width() + scrollOrigin(
).x(); } |
| 236 double scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin
().y(); } | 236 double scrollYOffset() const { return m_scrollOffset.height() + scrollOrigin
().y(); } |
| 237 | 237 |
| 238 DoubleSize scrollOffset() const { return m_scrollOffset; } | 238 DoubleSize scrollOffset() const { return m_scrollOffset; } |
| 239 | 239 |
| 240 IntSize originAdjustmentForScrollbars() const; |
| 241 |
| 240 // FIXME: We shouldn't allow access to m_overflowRect outside this class. | 242 // FIXME: We shouldn't allow access to m_overflowRect outside this class. |
| 241 LayoutRect overflowRect() const { return m_overflowRect; } | 243 LayoutRect overflowRect() const { return m_overflowRect; } |
| 242 | 244 |
| 243 void scrollToPosition(const DoublePoint& scrollPosition, ScrollOffsetClampin
g = ScrollOffsetUnclamped, | 245 void scrollToPosition(const DoublePoint& scrollPosition, ScrollOffsetClampin
g = ScrollOffsetUnclamped, |
| 244 ScrollBehavior = ScrollBehaviorInstant, ScrollType = ProgrammaticScroll)
; | 246 ScrollBehavior = ScrollBehaviorInstant, ScrollType = ProgrammaticScroll)
; |
| 245 | 247 |
| 246 void scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping cla
mp = ScrollOffsetUnclamped, | 248 void scrollToOffset(const DoubleSize& scrollOffset, ScrollOffsetClamping cla
mp = ScrollOffsetUnclamped, |
| 247 ScrollBehavior scrollBehavior = ScrollBehaviorInstant, ScrollType scroll
Type = ProgrammaticScroll) | 249 ScrollBehavior scrollBehavior = ScrollBehaviorInstant, ScrollType scroll
Type = ProgrammaticScroll) |
| 248 { | 250 { |
| 249 scrollToPosition(-scrollOrigin() + scrollOffset, clamp, scrollBehavior,
scrollType); | 251 scrollToPosition(-scrollOrigin() + scrollOffset, clamp, scrollBehavior,
scrollType); |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 #endif | 457 #endif |
| 456 }; | 458 }; |
| 457 | 459 |
| 458 DEFINE_TYPE_CASTS(PaintLayerScrollableArea, ScrollableArea, scrollableArea, | 460 DEFINE_TYPE_CASTS(PaintLayerScrollableArea, ScrollableArea, scrollableArea, |
| 459 scrollableArea->isPaintLayerScrollableArea(), | 461 scrollableArea->isPaintLayerScrollableArea(), |
| 460 scrollableArea.isPaintLayerScrollableArea()); | 462 scrollableArea.isPaintLayerScrollableArea()); |
| 461 | 463 |
| 462 } // namespace blink | 464 } // namespace blink |
| 463 | 465 |
| 464 #endif // LayerScrollableArea_h | 466 #endif // LayerScrollableArea_h |
| OLD | NEW |