Source/platform/scroll/ScrollableArea.h - Issue 1208433002: Replaced adjustScrollPositionWithinRange with clampScrollPosition

Side by Side Diff: Source/platform/scroll/ScrollableArea.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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.	2 * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 75 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY);	86 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY);

87	87

88 // Scrolls the area so that the given rect, given in the area's content coor dinates, such that it's	88 // Scrolls the area so that the given rect, given in the area's content coor dinates, such that it's

89 // cenetered in the second rect, which is given relative to the area's origi n.	89 // cenetered in the second rect, which is given relative to the area's origi n.

90 void scrollIntoRect(const LayoutRect& rectInContent, const FloatRect& target RectInFrame);	90 void scrollIntoRect(const LayoutRect& rectInContent, const FloatRect& target RectInFrame);

91	91

92 static bool scrollBehaviorFromString(const String&, ScrollBehavior&);	92 static bool scrollBehaviorFromString(const String&, ScrollBehavior&);

93	93

94 virtual ScrollResult handleWheel(const PlatformWheelEvent&);	94 virtual ScrollResult handleWheel(const PlatformWheelEvent&);

95	95

96 // Adjust the passed in scroll position to keep it between the minimum and m aximum positions.

97 IntPoint adjustScrollPositionWithinRange(const IntPoint&) const;

98 DoublePoint adjustScrollPositionWithinRange(const DoublePoint&) const;

99

100 bool inLiveResize() const { return m_inLiveResize; }	96 bool inLiveResize() const { return m_inLiveResize; }

101 void willStartLiveResize();	97 void willStartLiveResize();

102 void willEndLiveResize();	98 void willEndLiveResize();

103	99

104 void contentAreaWillPaint() const;	100 void contentAreaWillPaint() const;

105 void mouseEnteredContentArea() const;	101 void mouseEnteredContentArea() const;

106 void mouseExitedContentArea() const;	102 void mouseExitedContentArea() const;

107 void mouseMovedInContentArea() const;	103 void mouseMovedInContentArea() const;

108 void mouseEnteredScrollbar(Scrollbar*) const;	104 void mouseEnteredScrollbar(Scrollbar*) const;

109 void mouseExitedScrollbar(Scrollbar*) const;	105 void mouseExitedScrollbar(Scrollbar*) const;

(...skipping 243 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
353 // vertical-lr / ltr NO NO	349 // vertical-lr / ltr NO NO

354 // vertical-lr / rtl NO YES	350 // vertical-lr / rtl NO YES

355 // vertical-rl / ltr YES NO	351 // vertical-rl / ltr YES NO

356 // vertical-rl / rtl YES YES	352 // vertical-rl / rtl YES YES

357 IntPoint m_scrollOrigin;	353 IntPoint m_scrollOrigin;

358 };	354 };

359	355

360 } // namespace blink	356 } // namespace blink

361	357

362 #endif // ScrollableArea_h	358 #endif // ScrollableArea_h

OLD	NEW

« no previous file with comments | « Source/core/paint/DeprecatedPaintLayerScrollableArea.h ('k') | Source/platform/scroll/ScrollableArea.cpp » ('j') | no next file with comments »