OLD | NEW |
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/compositor_bindings/web_compositor_support_impl.h" | 5 #include "webkit/compositor_bindings/web_compositor_support_impl.h" |
6 | 6 |
7 #if defined(USE_LIBCC_FOR_COMPOSITOR) | 7 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
8 #include "config.h" | 8 #include "config.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "webkit/compositor_bindings/WebLayerImpl.h" | 10 #include "webkit/compositor_bindings/WebLayerImpl.h" |
11 #include "webkit/compositor_bindings/WebLayerTreeViewImpl.h" | 11 #include "webkit/compositor_bindings/WebLayerTreeViewImpl.h" |
12 #include "webkit/compositor_bindings/WebCompositorImpl.h" | 12 #include "webkit/compositor_bindings/WebCompositorImpl.h" |
13 #include "webkit/compositor_bindings/WebContentLayerImpl.h" | 13 #include "webkit/compositor_bindings/WebContentLayerImpl.h" |
| 14 #include "webkit/compositor_bindings/WebDelegatedRendererLayerImpl.h" |
14 #include "webkit/compositor_bindings/WebExternalTextureLayerImpl.h" | 15 #include "webkit/compositor_bindings/WebExternalTextureLayerImpl.h" |
15 #include "webkit/compositor_bindings/WebIOSurfaceLayerImpl.h" | 16 #include "webkit/compositor_bindings/WebIOSurfaceLayerImpl.h" |
16 #include "webkit/compositor_bindings/WebSolidColorLayerImpl.h" | 17 #include "webkit/compositor_bindings/WebSolidColorLayerImpl.h" |
17 #include "webkit/compositor_bindings/WebImageLayerImpl.h" | 18 #include "webkit/compositor_bindings/WebImageLayerImpl.h" |
18 #include "webkit/compositor_bindings/WebVideoLayerImpl.h" | 19 #include "webkit/compositor_bindings/WebVideoLayerImpl.h" |
19 #include "webkit/compositor_bindings/WebScrollbarLayerImpl.h" | 20 #include "webkit/compositor_bindings/WebScrollbarLayerImpl.h" |
20 #include "webkit/compositor_bindings/WebAnimationImpl.h" | 21 #include "webkit/compositor_bindings/WebAnimationImpl.h" |
21 #include "webkit/compositor_bindings/WebFloatAnimationCurveImpl.h" | 22 #include "webkit/compositor_bindings/WebFloatAnimationCurveImpl.h" |
22 #include "webkit/compositor_bindings/WebTransformAnimationCurveImpl.h" | 23 #include "webkit/compositor_bindings/WebTransformAnimationCurveImpl.h" |
23 #else | 24 #else |
24 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" | 25 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" |
25 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.h" | 26 #include "third_party/WebKit/Source/Platform/chromium/public/WebCompositor.h" |
26 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" | 27 #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" |
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL
ayer.h" | 28 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureL
ayer.h" |
28 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatAnimationCu
rve.h" | 29 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatAnimationCu
rve.h" |
29 #include "third_party/WebKit/Source/Platform/chromium/public/WebIOSurfaceLayer.h
" | 30 #include "third_party/WebKit/Source/Platform/chromium/public/WebIOSurfaceLayer.h
" |
30 #include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h" | 31 #include "third_party/WebKit/Source/Platform/chromium/public/WebImageLayer.h" |
31 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" | 32 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" |
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarLayer.h
" | 33 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarLayer.h
" |
33 #include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.
h" | 34 #include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.
h" |
34 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformAnimati
onCurve.h" | 35 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformAnimati
onCurve.h" |
35 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoLayer.h" | 36 #include "third_party/WebKit/Source/Platform/chromium/public/WebVideoLayer.h" |
36 #endif | 37 #endif |
37 | 38 |
38 using WebKit::WebAnimation; | 39 using WebKit::WebAnimation; |
39 using WebKit::WebAnimationCurve; | 40 using WebKit::WebAnimationCurve; |
40 using WebKit::WebContentLayer; | 41 using WebKit::WebContentLayer; |
41 using WebKit::WebContentLayerClient; | 42 using WebKit::WebContentLayerClient; |
| 43 using WebKit::WebDelegatedRendererLayer; |
42 using WebKit::WebExternalTextureLayer; | 44 using WebKit::WebExternalTextureLayer; |
43 using WebKit::WebExternalTextureLayerClient; | 45 using WebKit::WebExternalTextureLayerClient; |
44 using WebKit::WebFloatAnimationCurve; | 46 using WebKit::WebFloatAnimationCurve; |
45 using WebKit::WebIOSurfaceLayer; | 47 using WebKit::WebIOSurfaceLayer; |
46 using WebKit::WebImageLayer; | 48 using WebKit::WebImageLayer; |
47 using WebKit::WebImageLayer; | 49 using WebKit::WebImageLayer; |
48 using WebKit::WebLayer; | 50 using WebKit::WebLayer; |
49 using WebKit::WebLayerTreeView; | 51 using WebKit::WebLayerTreeView; |
50 using WebKit::WebLayerTreeViewClient; | 52 using WebKit::WebLayerTreeViewClient; |
51 using WebKit::WebScrollbar; | 53 using WebKit::WebScrollbar; |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 147 |
146 WebContentLayer* WebCompositorSupportImpl::createContentLayer( | 148 WebContentLayer* WebCompositorSupportImpl::createContentLayer( |
147 WebContentLayerClient* client) { | 149 WebContentLayerClient* client) { |
148 #if defined(USE_LIBCC_FOR_COMPOSITOR) | 150 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
149 return new WebKit::WebContentLayerImpl(client); | 151 return new WebKit::WebContentLayerImpl(client); |
150 #else | 152 #else |
151 return WebKit::WebContentLayer::create(client); | 153 return WebKit::WebContentLayer::create(client); |
152 #endif | 154 #endif |
153 } | 155 } |
154 | 156 |
| 157 WebDelegatedRendererLayer* |
| 158 WebCompositorSupportImpl::createDelegatedRendererLayer() { |
| 159 return new WebKit::WebDelegatedRendererLayerImpl(); |
| 160 } |
| 161 |
155 WebExternalTextureLayer* WebCompositorSupportImpl::createExternalTextureLayer( | 162 WebExternalTextureLayer* WebCompositorSupportImpl::createExternalTextureLayer( |
156 WebExternalTextureLayerClient* client) { | 163 WebExternalTextureLayerClient* client) { |
157 #if defined(USE_LIBCC_FOR_COMPOSITOR) | 164 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
158 return new WebKit::WebExternalTextureLayerImpl(client); | 165 return new WebKit::WebExternalTextureLayerImpl(client); |
159 #else | 166 #else |
160 return WebKit::WebExternalTextureLayer::create(client); | 167 return WebKit::WebExternalTextureLayer::create(client); |
161 #endif | 168 #endif |
162 } | 169 } |
163 | 170 |
164 WebKit::WebIOSurfaceLayer* | 171 WebKit::WebIOSurfaceLayer* |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 WebTransformAnimationCurve* | 235 WebTransformAnimationCurve* |
229 WebCompositorSupportImpl::createTransformAnimationCurve() { | 236 WebCompositorSupportImpl::createTransformAnimationCurve() { |
230 #if defined(USE_LIBCC_FOR_COMPOSITOR) | 237 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
231 return new WebKit::WebTransformAnimationCurveImpl(); | 238 return new WebKit::WebTransformAnimationCurveImpl(); |
232 #else | 239 #else |
233 return WebKit::WebTransformAnimationCurve::create(); | 240 return WebKit::WebTransformAnimationCurve::create(); |
234 #endif | 241 #endif |
235 } | 242 } |
236 | 243 |
237 } // namespace webkit | 244 } // namespace webkit |
OLD | NEW |