| 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 "config.h" | 5 #include "config.h" |
| 6 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | 6 #include "webkit/compositor_bindings/web_compositor_support_impl.h" |
| 7 | 7 |
| 8 #include "base/debug/trace_event.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/settings.h" | 10 #include "cc/settings.h" |
| 10 #include "webkit/compositor_bindings/web_animation_impl.h" | 11 #include "webkit/compositor_bindings/web_animation_impl.h" |
| 11 #include "webkit/compositor_bindings/web_compositor_impl.h" | 12 #include "webkit/compositor_bindings/web_compositor_impl.h" |
| 12 #include "webkit/compositor_bindings/web_content_layer_impl.h" | 13 #include "webkit/compositor_bindings/web_content_layer_impl.h" |
| 13 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" | 14 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" |
| 14 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" | 15 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" |
| 15 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" | 16 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" |
| 16 #include "webkit/compositor_bindings/web_image_layer_impl.h" | 17 #include "webkit/compositor_bindings/web_image_layer_impl.h" |
| 17 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" | 18 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 | 50 |
| 50 namespace webkit { | 51 namespace webkit { |
| 51 | 52 |
| 52 WebCompositorSupportImpl::WebCompositorSupportImpl() { | 53 WebCompositorSupportImpl::WebCompositorSupportImpl() { |
| 53 } | 54 } |
| 54 | 55 |
| 55 WebCompositorSupportImpl::~WebCompositorSupportImpl() { | 56 WebCompositorSupportImpl::~WebCompositorSupportImpl() { |
| 56 } | 57 } |
| 57 | 58 |
| 58 void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) { | 59 void WebCompositorSupportImpl::initialize(WebKit::WebThread* thread) { |
| 60 if (thread) { |
| 61 TRACE_EVENT_INSTANT0("test_gpu", "ThreadedCompositingInitialization"); |
| 62 } |
| 59 WebCompositorImpl::initialize(thread); | 63 WebCompositorImpl::initialize(thread); |
| 60 } | 64 } |
| 61 | 65 |
| 62 bool WebCompositorSupportImpl::isThreadingEnabled() { | 66 bool WebCompositorSupportImpl::isThreadingEnabled() { |
| 63 return WebCompositorImpl::isThreadingEnabled(); | 67 return WebCompositorImpl::isThreadingEnabled(); |
| 64 } | 68 } |
| 65 | 69 |
| 66 void WebCompositorSupportImpl::shutdown() { | 70 void WebCompositorSupportImpl::shutdown() { |
| 67 WebCompositorImpl::shutdown(); | 71 WebCompositorImpl::shutdown(); |
| 68 } | 72 } |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 152 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { |
| 149 return new WebKit::WebFloatAnimationCurveImpl(); | 153 return new WebKit::WebFloatAnimationCurveImpl(); |
| 150 } | 154 } |
| 151 | 155 |
| 152 WebTransformAnimationCurve* | 156 WebTransformAnimationCurve* |
| 153 WebCompositorSupportImpl::createTransformAnimationCurve() { | 157 WebCompositorSupportImpl::createTransformAnimationCurve() { |
| 154 return new WebKit::WebTransformAnimationCurveImpl(); | 158 return new WebKit::WebTransformAnimationCurveImpl(); |
| 155 } | 159 } |
| 156 | 160 |
| 157 } // namespace webkit | 161 } // namespace webkit |
| OLD | NEW |