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

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp

Issue 2926553004: Remove trailing semicolon at the end of a method definition (Closed)
Patch Set: rebase Created 3 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
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 bool scroll_animator_enabled_; 132 bool scroll_animator_enabled_;
133 ScrollOffset min_offset_; 133 ScrollOffset min_offset_;
134 ScrollOffset max_offset_; 134 ScrollOffset max_offset_;
135 Member<ScrollAnimator> animator; 135 Member<ScrollAnimator> animator;
136 }; 136 };
137 137
138 class TestScrollAnimator : public ScrollAnimator { 138 class TestScrollAnimator : public ScrollAnimator {
139 public: 139 public:
140 TestScrollAnimator(ScrollableArea* scrollable_area, 140 TestScrollAnimator(ScrollableArea* scrollable_area,
141 WTF::TimeFunction timing_function) 141 WTF::TimeFunction timing_function)
142 : ScrollAnimator(scrollable_area, timing_function){}; 142 : ScrollAnimator(scrollable_area, timing_function) {}
143 ~TestScrollAnimator() override{}; 143 ~TestScrollAnimator() override {}
144 144
145 void SetShouldSendToCompositor(bool send) { 145 void SetShouldSendToCompositor(bool send) {
146 should_send_to_compositor_ = send; 146 should_send_to_compositor_ = send;
147 } 147 }
148 148
149 bool SendAnimationToCompositor() override { 149 bool SendAnimationToCompositor() override {
150 if (should_send_to_compositor_) { 150 if (should_send_to_compositor_) {
151 run_state_ = 151 run_state_ =
152 ScrollAnimatorCompositorCoordinator::RunState::kRunningOnCompositor; 152 ScrollAnimatorCompositorCoordinator::RunState::kRunningOnCompositor;
153 compositor_animation_id_ = 1; 153 compositor_animation_id_ = 1;
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 ScrollAnimatorCompositorCoordinator::RunState::kPostAnimationCleanup); 664 ScrollAnimatorCompositorCoordinator::RunState::kPostAnimationCleanup);
665 EXPECT_EQ(ScrollOffset(110, 90), animator->DesiredTargetOffset()); 665 EXPECT_EQ(ScrollOffset(110, 90), animator->DesiredTargetOffset());
666 666
667 Reset(*animator); 667 Reset(*animator);
668 668
669 // Forced GC in order to finalize objects depending on the mock object. 669 // Forced GC in order to finalize objects depending on the mock object.
670 ThreadState::Current()->CollectAllGarbage(); 670 ThreadState::Current()->CollectAllGarbage();
671 } 671 }
672 672
673 } // namespace blink 673 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698