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

Side by Side Diff: trunk/src/webkit/renderer/compositor_bindings/web_compositor_support_impl.cc

Issue 141953013: Revert 245663 "Revert 245645 "Define WebScrollOffsetAnimationCur..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" 5 #include "webkit/renderer/compositor_bindings/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/output/output_surface.h" 10 #include "cc/output/output_surface.h"
11 #include "cc/output/software_output_device.h" 11 #include "cc/output/software_output_device.h"
12 #include "webkit/child/webthread_impl.h" 12 #include "webkit/child/webthread_impl.h"
13 #include "webkit/renderer/compositor_bindings/web_animation_impl.h" 13 #include "webkit/renderer/compositor_bindings/web_animation_impl.h"
14 #include "webkit/renderer/compositor_bindings/web_content_layer_impl.h" 14 #include "webkit/renderer/compositor_bindings/web_content_layer_impl.h"
15 #include "webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h" 15 #include "webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h"
16 #include "webkit/renderer/compositor_bindings/web_filter_animation_curve_impl.h" 16 #include "webkit/renderer/compositor_bindings/web_filter_animation_curve_impl.h"
17 #include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h" 17 #include "webkit/renderer/compositor_bindings/web_filter_operations_impl.h"
18 #include "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h" 18 #include "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h"
19 #include "webkit/renderer/compositor_bindings/web_image_layer_impl.h" 19 #include "webkit/renderer/compositor_bindings/web_image_layer_impl.h"
20 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" 20 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
21 #include "webkit/renderer/compositor_bindings/web_nine_patch_layer_impl.h" 21 #include "webkit/renderer/compositor_bindings/web_nine_patch_layer_impl.h"
22 #include "webkit/renderer/compositor_bindings/web_scroll_offset_animation_curve_ impl.h"
22 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h" 23 #include "webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h"
23 #include "webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h" 24 #include "webkit/renderer/compositor_bindings/web_solid_color_layer_impl.h"
24 #include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl .h" 25 #include "webkit/renderer/compositor_bindings/web_transform_animation_curve_impl .h"
25 #include "webkit/renderer/compositor_bindings/web_transform_operations_impl.h" 26 #include "webkit/renderer/compositor_bindings/web_transform_operations_impl.h"
26 27
27 using blink::WebAnimation; 28 using blink::WebAnimation;
28 using blink::WebAnimationCurve; 29 using blink::WebAnimationCurve;
29 using blink::WebContentLayer; 30 using blink::WebContentLayer;
30 using blink::WebContentLayerClient; 31 using blink::WebContentLayerClient;
31 using blink::WebExternalTextureLayer; 32 using blink::WebExternalTextureLayer;
32 using blink::WebExternalTextureLayerClient; 33 using blink::WebExternalTextureLayerClient;
33 using blink::WebFilterAnimationCurve; 34 using blink::WebFilterAnimationCurve;
34 using blink::WebFilterOperations; 35 using blink::WebFilterOperations;
35 using blink::WebFloatAnimationCurve; 36 using blink::WebFloatAnimationCurve;
36 using blink::WebImageLayer; 37 using blink::WebImageLayer;
37 using blink::WebNinePatchLayer; 38 using blink::WebNinePatchLayer;
38 using blink::WebLayer; 39 using blink::WebLayer;
39 using blink::WebScrollbar; 40 using blink::WebScrollbar;
40 using blink::WebScrollbarLayer; 41 using blink::WebScrollbarLayer;
41 using blink::WebScrollbarThemeGeometry; 42 using blink::WebScrollbarThemeGeometry;
42 using blink::WebScrollbarThemePainter; 43 using blink::WebScrollbarThemePainter;
44 #if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
45 using blink::WebScrollOffsetAnimationCurve;
46 #endif
43 using blink::WebSolidColorLayer; 47 using blink::WebSolidColorLayer;
44 using blink::WebTransformAnimationCurve; 48 using blink::WebTransformAnimationCurve;
45 using blink::WebTransformOperations; 49 using blink::WebTransformOperations;
46 50
47 namespace webkit { 51 namespace webkit {
48 52
49 WebCompositorSupportImpl::WebCompositorSupportImpl() {} 53 WebCompositorSupportImpl::WebCompositorSupportImpl() {}
50 54
51 WebCompositorSupportImpl::~WebCompositorSupportImpl() {} 55 WebCompositorSupportImpl::~WebCompositorSupportImpl() {}
52 56
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 103
100 WebFilterAnimationCurve* 104 WebFilterAnimationCurve*
101 WebCompositorSupportImpl::createFilterAnimationCurve() { 105 WebCompositorSupportImpl::createFilterAnimationCurve() {
102 return new WebFilterAnimationCurveImpl(); 106 return new WebFilterAnimationCurveImpl();
103 } 107 }
104 108
105 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { 109 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() {
106 return new WebFloatAnimationCurveImpl(); 110 return new WebFloatAnimationCurveImpl();
107 } 111 }
108 112
113 #if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
114 WebScrollOffsetAnimationCurve*
115 WebCompositorSupportImpl::createScrollOffsetAnimationCurve(
116 blink::WebFloatPoint target_value,
117 blink::WebAnimationCurve::TimingFunctionType timing_function) {
118 return new WebScrollOffsetAnimationCurveImpl(target_value, timing_function);
119 }
120 #endif
121
109 WebTransformAnimationCurve* 122 WebTransformAnimationCurve*
110 WebCompositorSupportImpl::createTransformAnimationCurve() { 123 WebCompositorSupportImpl::createTransformAnimationCurve() {
111 return new WebTransformAnimationCurveImpl(); 124 return new WebTransformAnimationCurveImpl();
112 } 125 }
113 126
114 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() { 127 WebTransformOperations* WebCompositorSupportImpl::createTransformOperations() {
115 return new WebTransformOperationsImpl(); 128 return new WebTransformOperationsImpl();
116 } 129 }
117 130
118 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() { 131 WebFilterOperations* WebCompositorSupportImpl::createFilterOperations() {
119 return new WebFilterOperationsImpl(); 132 return new WebFilterOperationsImpl();
120 } 133 }
121 134
122 } // namespace webkit 135 } // namespace webkit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698