Source/platform/scroll/ScrollAnimatorNone.h - Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase build fix Created 6 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

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2011, Google Inc. All rights reserved.	2 * Copyright (c) 2011, Google 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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

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

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 26 matching lines...) Expand all Loading...
37	37

38 class ScrollAnimatorNoneTest;	38 class ScrollAnimatorNoneTest;

39	39

40 namespace blink {	40 namespace blink {

41	41

42 class PLATFORM_EXPORT ScrollAnimatorNone : public ScrollAnimator {	42 class PLATFORM_EXPORT ScrollAnimatorNone : public ScrollAnimator {

43 public:	43 public:

44 explicit ScrollAnimatorNone(ScrollableArea*);	44 explicit ScrollAnimatorNone(ScrollableArea*);

45 virtual ~ScrollAnimatorNone();	45 virtual ~ScrollAnimatorNone();

46	46

47 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo at delta) OVERRIDE;	47 virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, flo at delta) override;

48 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) OVERRIDE;	48 virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;

49	49

50 virtual void cancelAnimations() OVERRIDE;	50 virtual void cancelAnimations() override;

51 virtual void serviceScrollAnimations() OVERRIDE;	51 virtual void serviceScrollAnimations() override;

52	52

53 virtual void willEndLiveResize() OVERRIDE;	53 virtual void willEndLiveResize() override;

54 virtual void didAddVerticalScrollbar(Scrollbar*) OVERRIDE;	54 virtual void didAddVerticalScrollbar(Scrollbar*) override;

55 virtual void didAddHorizontalScrollbar(Scrollbar*) OVERRIDE;	55 virtual void didAddHorizontalScrollbar(Scrollbar*) override;

56	56

57 enum Curve {	57 enum Curve {

58 Linear,	58 Linear,

59 Quadratic,	59 Quadratic,

60 Cubic,	60 Cubic,

61 Quartic,	61 Quartic,

62 Bounce	62 Bounce

63 };	63 };

64	64

65 struct PLATFORM_EXPORT Parameters {	65 struct PLATFORM_EXPORT Parameters {

(...skipping 77 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143 PerAxisData m_horizontalData;	143 PerAxisData m_horizontalData;

144 PerAxisData m_verticalData;	144 PerAxisData m_verticalData;

145	145

146 double m_startTime;	146 double m_startTime;

147 bool m_animationActive;	147 bool m_animationActive;

148 };	148 };

149	149

150 } // namespace blink	150 } // namespace blink

151	151

152 #endif // ScrollAnimatorNone_h	152 #endif // ScrollAnimatorNone_h

OLD	NEW

« no previous file with comments | « Source/platform/scheduler/SchedulerTest.cpp ('k') | Source/platform/scroll/ScrollView.h » ('j') | no next file with comments »