| OLD | NEW | 
|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 5 #ifndef CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 
| 6 #define CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 6 #define CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 
| 7 | 7 | 
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" | 
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" | 
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" | 
| 11 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" | 
| 12 #include "ui/gfx/geometry/size.h" | 12 #include "ui/gfx/geometry/size_f.h" | 
| 13 #include "ui/gfx/geometry/vector2d.h" | 13 #include "ui/gfx/geometry/vector2d.h" | 
| 14 #include "ui/gfx/geometry/vector2d_f.h" | 14 #include "ui/gfx/geometry/vector2d_f.h" | 
| 15 | 15 | 
| 16 namespace cc { | 16 namespace cc { | 
| 17 | 17 | 
| 18 class TimingFunction; | 18 class TimingFunction; | 
| 19 | 19 | 
| 20 // Used in the CC to pass around a scale animation that hasn't yet been | 20 // Used in the CC to pass around a scale animation that hasn't yet been | 
| 21 // initialized. | 21 // initialized. | 
| 22 struct PendingPageScaleAnimation { | 22 struct PendingPageScaleAnimation { | 
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 126   base::TimeDelta duration_; | 126   base::TimeDelta duration_; | 
| 127 | 127 | 
| 128   scoped_ptr<TimingFunction> timing_function_; | 128   scoped_ptr<TimingFunction> timing_function_; | 
| 129 | 129 | 
| 130   DISALLOW_COPY_AND_ASSIGN(PageScaleAnimation); | 130   DISALLOW_COPY_AND_ASSIGN(PageScaleAnimation); | 
| 131 }; | 131 }; | 
| 132 | 132 | 
| 133 }  // namespace cc | 133 }  // namespace cc | 
| 134 | 134 | 
| 135 #endif  // CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 135 #endif  // CC_INPUT_PAGE_SCALE_ANIMATION_H_ | 
| OLD | NEW | 
|---|