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

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

Issue 2387393003: Revert of Refactor ScrollableArea::setScrollPosition. (Closed)
Patch Set: Created 4 years, 2 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 m_verticalScrollbarNeedsPaintInvalidation = false; 373 m_verticalScrollbarNeedsPaintInvalidation = false;
374 m_scrollCornerNeedsPaintInvalidation = false; 374 m_scrollCornerNeedsPaintInvalidation = false;
375 } 375 }
376 376
377 private: 377 private:
378 void programmaticScrollHelper(const DoublePoint&, ScrollBehavior); 378 void programmaticScrollHelper(const DoublePoint&, ScrollBehavior);
379 void userScrollHelper(const DoublePoint&, ScrollBehavior); 379 void userScrollHelper(const DoublePoint&, ScrollBehavior);
380 380
381 // This function should be overriden by subclasses to perform the actual 381 // This function should be overriden by subclasses to perform the actual
382 // scroll of the content. 382 // scroll of the content.
383 virtual void setScrollOffset(const DoublePoint&, ScrollType) = 0; 383 virtual void setScrollOffset(const DoublePoint& offset, ScrollType) = 0;
384 384
385 virtual int lineStep(ScrollbarOrientation) const; 385 virtual int lineStep(ScrollbarOrientation) const;
386 virtual int pageStep(ScrollbarOrientation) const; 386 virtual int pageStep(ScrollbarOrientation) const;
387 virtual int documentStep(ScrollbarOrientation) const; 387 virtual int documentStep(ScrollbarOrientation) const;
388 virtual float pixelStep(ScrollbarOrientation) const; 388 virtual float pixelStep(ScrollbarOrientation) const;
389 389
390 mutable Member<ScrollAnimatorBase> m_scrollAnimator; 390 mutable Member<ScrollAnimatorBase> m_scrollAnimator;
391 mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator; 391 mutable Member<ProgrammaticScrollAnimator> m_programmaticScrollAnimator;
392 392
393 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle 393 unsigned m_scrollbarOverlayStyle : 2; // ScrollbarOverlayStyle
(...skipping 13 matching lines...) Expand all
407 // vertical-lr / ltr NO NO 407 // vertical-lr / ltr NO NO
408 // vertical-lr / rtl NO YES 408 // vertical-lr / rtl NO YES
409 // vertical-rl / ltr YES NO 409 // vertical-rl / ltr YES NO
410 // vertical-rl / rtl YES YES 410 // vertical-rl / rtl YES YES
411 IntPoint m_scrollOrigin; 411 IntPoint m_scrollOrigin;
412 }; 412 };
413 413
414 } // namespace blink 414 } // namespace blink
415 415
416 #endif // ScrollableArea_h 416 #endif // ScrollableArea_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698