Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: Source/core/paint/DeprecatedPaintLayerScrollableArea.h

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 virtual void invalidateScrollCornerRect(const IntRect&) override; 87 virtual void invalidateScrollCornerRect(const IntRect&) override;
88 virtual bool shouldUseIntegerScrollOffset() const override; 88 virtual bool shouldUseIntegerScrollOffset() const override;
89 virtual bool isActive() const override; 89 virtual bool isActive() const override;
90 virtual bool isScrollCornerVisible() const override; 90 virtual bool isScrollCornerVisible() const override;
91 virtual IntRect scrollCornerRect() const override; 91 virtual IntRect scrollCornerRect() const override;
92 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override; 92 virtual IntRect convertFromScrollbarToContainingView(const Scrollbar*, const IntRect&) const override;
93 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override; 93 virtual IntRect convertFromContainingViewToScrollbar(const Scrollbar*, const IntRect&) const override;
94 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override; 94 virtual IntPoint convertFromScrollbarToContainingView(const Scrollbar*, cons t IntPoint&) const override;
95 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override; 95 virtual IntPoint convertFromContainingViewToScrollbar(const Scrollbar*, cons t IntPoint&) const override;
96 virtual int scrollSize(ScrollbarOrientation) const override; 96 virtual int scrollSize(ScrollbarOrientation) const override;
97 virtual void setScrollOffset(const IntPoint&) override; 97 virtual void setScrollOffset(const IntPoint&, ScrollType) override;
98 virtual void setScrollOffset(const DoublePoint&) override; 98 virtual void setScrollOffset(const DoublePoint&, ScrollType) override;
99 virtual IntPoint scrollPosition() const override; 99 virtual IntPoint scrollPosition() const override;
100 virtual DoublePoint scrollPositionDouble() const override; 100 virtual DoublePoint scrollPositionDouble() const override;
101 virtual IntPoint minimumScrollPosition() const override; 101 virtual IntPoint minimumScrollPosition() const override;
102 virtual IntPoint maximumScrollPosition() const override; 102 virtual IntPoint maximumScrollPosition() const override;
103 virtual IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollba rs) const override; 103 virtual IntRect visibleContentRect(IncludeScrollbarsInRect = ExcludeScrollba rs) const override;
104 virtual int visibleHeight() const override; 104 virtual int visibleHeight() const override;
105 virtual int visibleWidth() const override; 105 virtual int visibleWidth() const override;
106 virtual IntSize contentsSize() const override; 106 virtual IntSize contentsSize() const override;
107 virtual IntPoint lastKnownMousePosition() const override; 107 virtual IntPoint lastKnownMousePosition() const override;
108 virtual bool scrollAnimatorEnabled() const override; 108 virtual bool scrollAnimatorEnabled() const override;
(...skipping 19 matching lines...) Expand all
128 void scrollToXOffset(double x, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) 128 void scrollToXOffset(double x, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant)
129 { 129 {
130 scrollToOffset(DoubleSize(x, scrollYOffset()), clamp, scrollBehavior); 130 scrollToOffset(DoubleSize(x, scrollYOffset()), clamp, scrollBehavior);
131 } 131 }
132 132
133 void scrollToYOffset(double y, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) 133 void scrollToYOffset(double y, ScrollOffsetClamping clamp = ScrollOffsetUncl amped, ScrollBehavior scrollBehavior = ScrollBehaviorInstant)
134 { 134 {
135 scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior); 135 scrollToOffset(DoubleSize(scrollXOffset(), y), clamp, scrollBehavior);
136 } 136 }
137 137
138 virtual void setScrollPosition(const DoublePoint& position, ScrollBehavior s crollBehavior = ScrollBehaviorInstant) override 138 virtual void setScrollPosition(const DoublePoint& position, ScrollType scrol lType, ScrollBehavior scrollBehavior = ScrollBehaviorInstant) override
139 { 139 {
140 scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavi or); 140 scrollToOffset(toDoubleSize(position), ScrollOffsetClamped, scrollBehavi or);
141 } 141 }
142 142
143 void updateAfterLayout(); 143 void updateAfterLayout();
144 void updateAfterStyleChange(const ComputedStyle*); 144 void updateAfterStyleChange(const ComputedStyle*);
145 void updateAfterOverflowRecalc(); 145 void updateAfterOverflowRecalc();
146 146
147 virtual bool updateAfterCompositingChange() override; 147 virtual bool updateAfterCompositingChange() override;
148 148
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // LayoutObject to hold our custom scroll corner. 282 // LayoutObject to hold our custom scroll corner.
283 LayoutScrollbarPart* m_scrollCorner; 283 LayoutScrollbarPart* m_scrollCorner;
284 284
285 // LayoutObject to hold our custom resizer. 285 // LayoutObject to hold our custom resizer.
286 LayoutScrollbarPart* m_resizer; 286 LayoutScrollbarPart* m_resizer;
287 }; 287 };
288 288
289 } // namespace blink 289 } // namespace blink
290 290
291 #endif // LayerScrollableArea_h 291 #endif // LayerScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698