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

Side by Side Diff: Source/web/tests/ScrollAnimatorNoneTest.cpp

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/web/tests/PrerenderingTest.cpp ('k') | Source/web/tests/TextFinderTest.cpp » ('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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 MOCK_METHOD1(setScrollOffsetFromAnimation, void(const IntPoint&)); 59 MOCK_METHOD1(setScrollOffsetFromAnimation, void(const IntPoint&));
60 MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*()); 60 MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*());
61 MOCK_CONST_METHOD0(minimumScrollPosition, IntPoint()); 61 MOCK_CONST_METHOD0(minimumScrollPosition, IntPoint());
62 MOCK_CONST_METHOD0(maximumScrollPosition, IntPoint()); 62 MOCK_CONST_METHOD0(maximumScrollPosition, IntPoint());
63 MOCK_CONST_METHOD1(visibleContentRect, IntRect(IncludeScrollbarsInRect)); 63 MOCK_CONST_METHOD1(visibleContentRect, IntRect(IncludeScrollbarsInRect));
64 MOCK_CONST_METHOD0(contentsSize, IntSize()); 64 MOCK_CONST_METHOD0(contentsSize, IntSize());
65 MOCK_CONST_METHOD0(overhangAmount, IntSize()); 65 MOCK_CONST_METHOD0(overhangAmount, IntSize());
66 MOCK_CONST_METHOD0(scrollbarsCanBeActive, bool()); 66 MOCK_CONST_METHOD0(scrollbarsCanBeActive, bool());
67 MOCK_CONST_METHOD0(scrollableAreaBoundingBox, IntRect()); 67 MOCK_CONST_METHOD0(scrollableAreaBoundingBox, IntRect());
68 68
69 virtual bool userInputScrollable(ScrollbarOrientation) const OVERRIDE { retu rn true; } 69 virtual bool userInputScrollable(ScrollbarOrientation) const override { retu rn true; }
70 virtual bool shouldPlaceVerticalScrollbarOnLeft() const OVERRIDE { return fa lse; } 70 virtual bool shouldPlaceVerticalScrollbarOnLeft() const override { return fa lse; }
71 virtual IntPoint scrollPosition() const OVERRIDE { return IntPoint(); } 71 virtual IntPoint scrollPosition() const override { return IntPoint(); }
72 virtual int visibleHeight() const OVERRIDE { return 768; } 72 virtual int visibleHeight() const override { return 768; }
73 virtual int visibleWidth() const OVERRIDE { return 1024; } 73 virtual int visibleWidth() const override { return 1024; }
74 virtual bool scrollAnimatorEnabled() const OVERRIDE { return m_scrollAnimato rEnabled; } 74 virtual bool scrollAnimatorEnabled() const override { return m_scrollAnimato rEnabled; }
75 virtual int pageStep(ScrollbarOrientation) const OVERRIDE { return 0; } 75 virtual int pageStep(ScrollbarOrientation) const override { return 0; }
76 76
77 private: 77 private:
78 bool m_scrollAnimatorEnabled; 78 bool m_scrollAnimatorEnabled;
79 }; 79 };
80 80
81 class MockScrollAnimatorNone : public ScrollAnimatorNone { 81 class MockScrollAnimatorNone : public ScrollAnimatorNone {
82 public: 82 public:
83 MockScrollAnimatorNone(ScrollableArea* scrollableArea) 83 MockScrollAnimatorNone(ScrollableArea* scrollableArea)
84 : ScrollAnimatorNone(scrollableArea) { } 84 : ScrollAnimatorNone(scrollableArea) { }
85 85
(...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 EXPECT_TRUE(result); 1043 EXPECT_TRUE(result);
1044 result = result && animateScroll(t); 1044 result = result && animateScroll(t);
1045 double after = m_currentPosition; 1045 double after = m_currentPosition;
1046 EXPECT_GE(before, after); 1046 EXPECT_GE(before, after);
1047 1047
1048 t += kAnimationTime; 1048 t += kAnimationTime;
1049 for (; result && t < kEndTime; t += kAnimationTime) 1049 for (; result && t < kEndTime; t += kAnimationTime)
1050 result = result && animateScroll(t); 1050 result = result && animateScroll(t);
1051 EXPECT_GE(before, m_currentPosition); 1051 EXPECT_GE(before, m_currentPosition);
1052 } 1052 }
OLDNEW
« no previous file with comments | « Source/web/tests/PrerenderingTest.cpp ('k') | Source/web/tests/TextFinderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698