OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 | 6 |
7 #include "WebCompositorImpl.h" | 7 #include "WebCompositorImpl.h" |
8 | 8 |
9 #include "CCLayerTreeHost.h" | 9 #include "CCLayerTreeHost.h" |
10 #include "CCProxy.h" | 10 #include "CCProxy.h" |
11 #include "CCSettings.h" | 11 #include "CCSettings.h" |
12 #include "CCThreadImpl.h" | 12 #include "CCThreadImpl.h" |
13 #include <public/Platform.h> | 13 #include <public/Platform.h> |
14 #include <wtf/ThreadingPrimitives.h> | 14 #include <wtf/ThreadingPrimitives.h> |
15 | 15 |
16 #if defined(USE_LIBCC_FOR_COMPOSITOR) | |
17 #ifdef LOG | 16 #ifdef LOG |
18 #undef LOG | 17 #undef LOG |
19 #endif | 18 #endif |
20 #include "base/message_loop_proxy.h" | 19 #include "base/message_loop_proxy.h" |
21 #include "webkit/glue/webthread_impl.h" | 20 #include "webkit/glue/webthread_impl.h" |
22 #endif | |
23 | 21 |
24 using namespace cc; | 22 using namespace cc; |
25 | 23 |
26 namespace WebKit { | 24 namespace WebKit { |
27 | 25 |
28 bool WebCompositorImpl::s_initialized = false; | 26 bool WebCompositorImpl::s_initialized = false; |
29 CCThread* WebCompositorImpl::s_mainThread = 0; | 27 CCThread* WebCompositorImpl::s_mainThread = 0; |
30 CCThread* WebCompositorImpl::s_implThread = 0; | 28 CCThread* WebCompositorImpl::s_implThread = 0; |
31 | 29 |
32 void WebCompositor::initialize(WebThread* implThread) | 30 void WebCompositor::initialize(WebThread* implThread) |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 s_implThread = 0; | 101 s_implThread = 0; |
104 } | 102 } |
105 delete s_mainThread; | 103 delete s_mainThread; |
106 s_mainThread = 0; | 104 s_mainThread = 0; |
107 CCProxy::setImplThread(0); | 105 CCProxy::setImplThread(0); |
108 CCProxy::setMainThread(0); | 106 CCProxy::setMainThread(0); |
109 s_initialized = false; | 107 s_initialized = false; |
110 } | 108 } |
111 | 109 |
112 } | 110 } |
OLD | NEW |