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

Unified Diff: cc/input/scrollbar_animation_controller_linear_fade.h

Issue 2692243005: Merge Compositor's ScrollbarAnimationControllers into single class (Closed)
Patch Set: fix confict constant Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: cc/input/scrollbar_animation_controller_linear_fade.h
diff --git a/cc/input/scrollbar_animation_controller_linear_fade.h b/cc/input/scrollbar_animation_controller_linear_fade.h
deleted file mode 100644
index 62dddcf785c74908f174d9eb8334f6bb02e4af64..0000000000000000000000000000000000000000
--- a/cc/input/scrollbar_animation_controller_linear_fade.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
-#define CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "cc/base/cc_export.h"
-#include "cc/input/scrollbar_animation_controller.h"
-
-namespace cc {
-
-class CC_EXPORT ScrollbarAnimationControllerLinearFade
- : public ScrollbarAnimationController {
- public:
- static std::unique_ptr<ScrollbarAnimationControllerLinearFade> Create(
- int scroll_layer_id,
- ScrollbarAnimationControllerClient* client,
- base::TimeDelta delay_before_starting,
- base::TimeDelta resize_delay_before_starting,
- base::TimeDelta duration);
-
- ~ScrollbarAnimationControllerLinearFade() override;
-
- void DidScrollUpdate(bool on_resize) override;
-
- protected:
- ScrollbarAnimationControllerLinearFade(
- int scroll_layer_id,
- ScrollbarAnimationControllerClient* client,
- base::TimeDelta delay_before_starting,
- base::TimeDelta resize_delay_before_starting,
- base::TimeDelta duration);
-
- void RunAnimationFrame(float progress) override;
- const base::TimeDelta& Duration() override;
-
- private:
- float OpacityAtTime(base::TimeTicks now) const;
- void ApplyOpacityToScrollbars(float opacity) override;
-
- base::TimeDelta duration_;
-
- DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade);
-};
-
-} // namespace cc
-
-#endif // CC_INPUT_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_

Powered by Google App Engine
This is Rietveld 408576698