| Index: cc/layers/layer_impl.h
|
| diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
|
| index b5f2ee25183d93fee72f2c4b3e77dbaf73c61df4..a7a3a7588cbc9aef56e74847759f5692185dd739 100644
|
| --- a/cc/layers/layer_impl.h
|
| +++ b/cc/layers/layer_impl.h
|
| @@ -127,6 +127,9 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| void NotifyAnimationAborted(base::TimeTicks monotonic_time,
|
| TargetProperty::Type target_property,
|
| int group) override{};
|
| + void NotifyAnimationTakeover(base::TimeTicks monotonic_time,
|
| + double animation_start_time,
|
| + scoped_ptr<AnimationCurve> curve) override {}
|
|
|
| // Tree structure.
|
| LayerImpl* parent() { return parent_; }
|
| @@ -505,9 +508,7 @@ class CC_EXPORT LayerImpl : public LayerAnimationValueObserver,
|
| void ApplySentScrollDeltasFromAbortedCommit();
|
|
|
| void set_main_thread_scrolling_reasons(
|
| - uint32_t main_thread_scrolling_reasons) {
|
| - main_thread_scrolling_reasons_ = main_thread_scrolling_reasons;
|
| - }
|
| + uint32_t main_thread_scrolling_reasons);
|
| uint32_t main_thread_scrolling_reasons() const {
|
| return main_thread_scrolling_reasons_;
|
| }
|
|
|