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

Side by Side Diff: Source/platform/scroll/ScrollableArea.h

Issue 1298973004: Remove special wheel handling path from ScrollableArea (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed TODO Created 5 years, 4 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) 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing 95 // since scrolling it can't change the location of content relative to the d ocument, unlike an overflowing
96 // element. 96 // element.
97 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY); 97 virtual LayoutRect scrollIntoView(const LayoutRect& rectInContent, const Scr ollAlignment& alignX, const ScrollAlignment& alignY);
98 98
99 // Scrolls the area so that the given rect, given in the area's content coor dinates, such that it's 99 // Scrolls the area so that the given rect, given in the area's content coor dinates, such that it's
100 // cenetered in the second rect, which is given relative to the area's origi n. 100 // cenetered in the second rect, which is given relative to the area's origi n.
101 void scrollIntoRect(const LayoutRect& rectInContent, const FloatRect& target RectInFrame); 101 void scrollIntoRect(const LayoutRect& rectInContent, const FloatRect& target RectInFrame);
102 102
103 static bool scrollBehaviorFromString(const String&, ScrollBehavior&); 103 static bool scrollBehaviorFromString(const String&, ScrollBehavior&);
104 104
105 virtual ScrollResult handleWheel(const PlatformWheelEvent&);
106
107 bool inLiveResize() const { return m_inLiveResize; } 105 bool inLiveResize() const { return m_inLiveResize; }
108 void willStartLiveResize(); 106 void willStartLiveResize();
109 void willEndLiveResize(); 107 void willEndLiveResize();
110 108
111 void contentAreaWillPaint() const; 109 void contentAreaWillPaint() const;
112 void mouseEnteredContentArea() const; 110 void mouseEnteredContentArea() const;
113 void mouseExitedContentArea() const; 111 void mouseExitedContentArea() const;
114 void mouseMovedInContentArea() const; 112 void mouseMovedInContentArea() const;
115 void mouseEnteredScrollbar(Scrollbar*) const; 113 void mouseEnteredScrollbar(Scrollbar*) const;
116 void mouseExitedScrollbar(Scrollbar*) const; 114 void mouseExitedScrollbar(Scrollbar*) const;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // vertical-lr / ltr NO NO 365 // vertical-lr / ltr NO NO
368 // vertical-lr / rtl NO YES 366 // vertical-lr / rtl NO YES
369 // vertical-rl / ltr YES NO 367 // vertical-rl / ltr YES NO
370 // vertical-rl / rtl YES YES 368 // vertical-rl / rtl YES YES
371 IntPoint m_scrollOrigin; 369 IntPoint m_scrollOrigin;
372 }; 370 };
373 371
374 } // namespace blink 372 } // namespace blink
375 373
376 #endif // ScrollableArea_h 374 #endif // ScrollableArea_h
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollAnimatorNone.cpp ('k') | Source/platform/scroll/ScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698