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

Unified Diff: chrome/browser/ui/touch/animation/screen_rotation.h

Issue 8362006: Reland r107720 - Enable the new layer animation framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with parent patch Created 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/touch/animation/screen_rotation.h
diff --git a/chrome/browser/ui/touch/animation/screen_rotation.h b/chrome/browser/ui/touch/animation/screen_rotation.h
index 7b462709435cff3c821bb0203c719ba4816465b8..5dd5ba6b4be5200d284ee40c9ca87f4871777414 100644
--- a/chrome/browser/ui/touch/animation/screen_rotation.h
+++ b/chrome/browser/ui/touch/animation/screen_rotation.h
@@ -17,6 +17,7 @@
namespace ui {
class InterpolatedTransform;
class Layer;
+class LayerAnimationDelegate;
class SlideAnimation;
class Transform;
}
@@ -51,6 +52,7 @@ class ScreenRotation : public ui::AnimationDelegate,
// The screen rotation does not own the view or the listener, and these
// objects are required to outlive the Screen rotation object.
ScreenRotation(views::View* view,
+ ui::LayerAnimationDelegate* delegate,
ScreenRotationListener* listener,
float old_degrees,
float new_degrees);
@@ -92,6 +94,11 @@ class ScreenRotation : public ui::AnimationDelegate,
// update the bounds.
views::View* view_;
+ // This is the delegate that will be modified during the rotation. It is
+ // important not to modify the rotation directly, otherwise we will cause
+ // other, implicit animations.
+ ui::LayerAnimationDelegate* delegate_;
+
// This widget will be used for scheduling paints.
views::Widget* widget_;

Powered by Google App Engine
This is Rietveld 408576698