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

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

Issue 1208433002: Replaced adjustScrollPositionWithinRange with clampScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Unremoved DoublePoint version of FrameView::setScrollOffset 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
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const; 216 IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const;
217 217
218 private: 218 private:
219 bool hasHorizontalOverflow() const; 219 bool hasHorizontalOverflow() const;
220 bool hasVerticalOverflow() const; 220 bool hasVerticalOverflow() const;
221 bool hasScrollableHorizontalOverflow() const; 221 bool hasScrollableHorizontalOverflow() const;
222 bool hasScrollableVerticalOverflow() const; 222 bool hasScrollableVerticalOverflow() const;
223 223
224 void computeScrollDimensions(); 224 void computeScrollDimensions();
225 225
226 // TODO(bokan): This method hides the base class version and is subtly diffe rent.
227 // Should be unified.
226 DoubleSize clampScrollOffset(const DoubleSize&) const; 228 DoubleSize clampScrollOffset(const DoubleSize&) const;
227 229
228 virtual void setScrollOffset(const IntPoint&, ScrollType) override; 230 virtual void setScrollOffset(const IntPoint&, ScrollType) override;
229 virtual void setScrollOffset(const DoublePoint&, ScrollType) override; 231 virtual void setScrollOffset(const DoublePoint&, ScrollType) override;
230 232
231 LayoutUnit verticalScrollbarStart(int minX, int maxX) const; 233 LayoutUnit verticalScrollbarStart(int minX, int maxX) const;
232 LayoutUnit horizontalScrollbarStart(int minX) const; 234 LayoutUnit horizontalScrollbarStart(int minX) const;
233 IntSize scrollbarOffset(const Scrollbar*) const; 235 IntSize scrollbarOffset(const Scrollbar*) const;
234 236
235 PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation); 237 PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 // LayoutObject to hold our custom scroll corner. 282 // LayoutObject to hold our custom scroll corner.
281 LayoutScrollbarPart* m_scrollCorner; 283 LayoutScrollbarPart* m_scrollCorner;
282 284
283 // LayoutObject to hold our custom resizer. 285 // LayoutObject to hold our custom resizer.
284 LayoutScrollbarPart* m_resizer; 286 LayoutScrollbarPart* m_resizer;
285 }; 287 };
286 288
287 } // namespace blink 289 } // namespace blink
288 290
289 #endif // LayerScrollableArea_h 291 #endif // LayerScrollableArea_h
OLDNEW
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/platform/scroll/ScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698