| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 bool is_left_side_vertical_scrollbar) { | 89 bool is_left_side_vertical_scrollbar) { |
| 90 return new WebScrollbarLayerImpl(orientation, | 90 return new WebScrollbarLayerImpl(orientation, |
| 91 thumb_thickness, | 91 thumb_thickness, |
| 92 track_start, | 92 track_start, |
| 93 is_left_side_vertical_scrollbar); | 93 is_left_side_vertical_scrollbar); |
| 94 } | 94 } |
| 95 | 95 |
| 96 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation( | 96 WebCompositorAnimation* WebCompositorSupportImpl::createAnimation( |
| 97 const blink::WebCompositorAnimationCurve& curve, | 97 const blink::WebCompositorAnimationCurve& curve, |
| 98 blink::WebCompositorAnimation::TargetProperty target, | 98 blink::WebCompositorAnimation::TargetProperty target, |
| 99 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP | |
| 100 int group_id, | 99 int group_id, |
| 101 #endif | |
| 102 int animation_id) { | 100 int animation_id) { |
| 103 #ifdef WEB_COMPOSITOR_SUPPORT_CREATE_ANIMATION_SUPPORTS_GROUP | |
| 104 return new WebCompositorAnimationImpl(curve, target, animation_id, group_id); | 101 return new WebCompositorAnimationImpl(curve, target, animation_id, group_id); |
| 105 #else | |
| 106 return new WebCompositorAnimationImpl(curve, target, animation_id, 0); | |
| 107 #endif | |
| 108 } | 102 } |
| 109 | 103 |
| 110 WebFilterAnimationCurve* | 104 WebFilterAnimationCurve* |
| 111 WebCompositorSupportImpl::createFilterAnimationCurve() { | 105 WebCompositorSupportImpl::createFilterAnimationCurve() { |
| 112 return new WebFilterAnimationCurveImpl(); | 106 return new WebFilterAnimationCurveImpl(); |
| 113 } | 107 } |
| 114 | 108 |
| 115 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 109 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { |
| 116 return new WebFloatAnimationCurveImpl(); | 110 return new WebFloatAnimationCurveImpl(); |
| 117 } | 111 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 130 | 124 |
| 131 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { | 125 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { |
| 132 return new WebTransformOperationsImpl(); | 126 return new WebTransformOperationsImpl(); |
| 133 } | 127 } |
| 134 | 128 |
| 135 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { | 129 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { |
| 136 return new WebFilterOperationsImpl(); | 130 return new WebFilterOperationsImpl(); |
| 137 } | 131 } |
| 138 | 132 |
| 139 } // namespace cc_blink | 133 } // namespace cc_blink |
| OLD | NEW |