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 #include "base/debug/trace_event.h" | |
8 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
9 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
10 #include "cc/thread_impl.h" | 9 #include "cc/thread_impl.h" |
11 #include "webkit/compositor_bindings/web_animation_impl.h" | 10 #include "webkit/compositor_bindings/web_animation_impl.h" |
12 #include "webkit/compositor_bindings/web_content_layer_impl.h" | 11 #include "webkit/compositor_bindings/web_content_layer_impl.h" |
13 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" | 12 #include "webkit/compositor_bindings/web_delegated_renderer_layer_impl.h" |
14 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" | 13 #include "webkit/compositor_bindings/web_external_texture_layer_impl.h" |
15 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" | 14 #include "webkit/compositor_bindings/web_float_animation_curve_impl.h" |
16 #include "webkit/compositor_bindings/web_image_layer_impl.h" | 15 #include "webkit/compositor_bindings/web_image_layer_impl.h" |
17 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" | 16 #include "webkit/compositor_bindings/web_io_surface_layer_impl.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 : initialized_(false) { | 51 : initialized_(false) { |
53 } | 52 } |
54 | 53 |
55 WebCompositorSupportImpl::~WebCompositorSupportImpl() { | 54 WebCompositorSupportImpl::~WebCompositorSupportImpl() { |
56 } | 55 } |
57 | 56 |
58 void WebCompositorSupportImpl::initialize(WebKit::WebThread* impl_thread) { | 57 void WebCompositorSupportImpl::initialize(WebKit::WebThread* impl_thread) { |
59 DCHECK(!initialized_); | 58 DCHECK(!initialized_); |
60 initialized_ = true; | 59 initialized_ = true; |
61 if (impl_thread) { | 60 if (impl_thread) { |
62 TRACE_EVENT_INSTANT0("test_gpu", "ThreadedCompositingInitialization"); | |
63 impl_thread_message_loop_proxy_ = | 61 impl_thread_message_loop_proxy_ = |
64 static_cast<webkit_glue::WebThreadImpl*>(impl_thread)-> | 62 static_cast<webkit_glue::WebThreadImpl*>(impl_thread)-> |
65 message_loop()->message_loop_proxy(); | 63 message_loop()->message_loop_proxy(); |
66 } else { | 64 } else { |
67 impl_thread_message_loop_proxy_ = NULL; | 65 impl_thread_message_loop_proxy_ = NULL; |
68 } | 66 } |
69 } | 67 } |
70 | 68 |
71 bool WebCompositorSupportImpl::isThreadingEnabled() { | 69 bool WebCompositorSupportImpl::isThreadingEnabled() { |
72 return impl_thread_message_loop_proxy_; | 70 return impl_thread_message_loop_proxy_; |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { | 146 WebFloatAnimationCurve* WebCompositorSupportImpl::createFloatAnimationCurve() { |
149 return new WebKit::WebFloatAnimationCurveImpl(); | 147 return new WebKit::WebFloatAnimationCurveImpl(); |
150 } | 148 } |
151 | 149 |
152 WebTransformAnimationCurve* | 150 WebTransformAnimationCurve* |
153 WebCompositorSupportImpl::createTransformAnimationCurve() { | 151 WebCompositorSupportImpl::createTransformAnimationCurve() { |
154 return new WebKit::WebTransformAnimationCurveImpl(); | 152 return new WebKit::WebTransformAnimationCurveImpl(); |
155 } | 153 } |
156 | 154 |
157 } // namespace webkit | 155 } // namespace webkit |
OLD | NEW |