OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "cc/blink/web_compositor_support_impl.h" | 5 #include "cc/blink/web_compositor_support_impl.h" |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/message_loop/message_loop_proxy.h" | 8 #include "base/message_loop/message_loop_proxy.h" |
9 #include "cc/animation/transform_operations.h" | 9 #include "cc/animation/transform_operations.h" |
10 #include "cc/blink/web_animation_impl.h" | 10 #include "cc/blink/web_animation_impl.h" |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 bool is_left_side_vertical_scrollbar) { | 87 bool is_left_side_vertical_scrollbar) { |
88 return new WebScrollbarLayerImpl(orientation, | 88 return new WebScrollbarLayerImpl(orientation, |
89 thumb_thickness, | 89 thumb_thickness, |
90 track_start, | 90 track_start, |
91 is_left_side_vertical_scrollbar); | 91 is_left_side_vertical_scrollbar); |
92 } | 92 } |
93 | 93 |
94 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation( | 94 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation( |
95 const blink::WebCompositorAnimationCurve& curve, | 95 const blink::WebCompositorAnimationCurve& curve, |
96 blink::WebCompositorAnimation::TargetProperty target, | 96 blink::WebCompositorAnimation::TargetProperty target, |
| 97 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP |
| 98 int group_id, |
| 99 #endif |
97 int animation_id) { | 100 int animation_id) { |
| 101 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP |
| 102 return new WebCompositorAnimationImpl(curve, target, animation_id, group_id); |
| 103 #else |
98 return new WebCompositorAnimationImpl(curve, target, animation_id, 0); | 104 return new WebCompositorAnimationImpl(curve, target, animation_id, 0); |
| 105 #endif |
99 } | 106 } |
100 | 107 |
101 WebFilterAnimationCurve* | 108 WebFilterAnimationCurve* |
102 WebCompositorSupportImpl::createFilterAnimationCurve() { | 109 WebCompositorSupportImpl::createFilterAnimationCurve() { |
103 return new WebFilterAnimationCurveImpl(); | 110 return new WebFilterAnimationCurveImpl(); |
104 } | 111 } |
105 | 112 |
106 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 113 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { |
107 return new WebFloatAnimationCurveImpl(); | 114 return new WebFloatAnimationCurveImpl(); |
108 } | 115 } |
(...skipping 12 matching lines...) Expand all Loading... |
121 | 128 |
122 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { | 129 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { |
123 return new WebTransformOperationsImpl(); | 130 return new WebTransformOperationsImpl(); |
124 } | 131 } |
125 | 132 |
126 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { | 133 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { |
127 return new WebFilterOperationsImpl(); | 134 return new WebFilterOperationsImpl(); |
128 } | 135 } |
129 | 136 |
130 } // namespace cc_blink | 137 } // namespace cc_blink |
OLD | NEW |