| 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) | 16 #if defined(USE_LIBCC_FOR_COMPOSITOR) |
| 17 #ifdef LOG | 17 #ifdef LOG |
| 18 #undef LOG | 18 #undef LOG |
| 19 #endif | 19 #endif |
| 20 #include "base/message_loop_proxy.h" | 20 #include "base/message_loop_proxy.h" |
| 21 #include "webkit/glue/webthread_impl.h" | 21 #include "webkit/glue/webthread_impl.h" |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 using namespace WebCore; | 24 using namespace cc; |
| 25 | 25 |
| 26 namespace WebKit { | 26 namespace WebKit { |
| 27 | 27 |
| 28 bool WebCompositorImpl::s_initialized = false; | 28 bool WebCompositorImpl::s_initialized = false; |
| 29 CCThread* WebCompositorImpl::s_mainThread = 0; | 29 CCThread* WebCompositorImpl::s_mainThread = 0; |
| 30 CCThread* WebCompositorImpl::s_implThread = 0; | 30 CCThread* WebCompositorImpl::s_implThread = 0; |
| 31 | 31 |
| 32 void WebCompositor::initialize(WebThread* implThread) | 32 void WebCompositor::initialize(WebThread* implThread) |
| 33 { | 33 { |
| 34 WebCompositorImpl::initialize(implThread); | 34 WebCompositorImpl::initialize(implThread); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 s_implThread = 0; | 97 s_implThread = 0; |
| 98 } | 98 } |
| 99 delete s_mainThread; | 99 delete s_mainThread; |
| 100 s_mainThread = 0; | 100 s_mainThread = 0; |
| 101 CCProxy::setImplThread(0); | 101 CCProxy::setImplThread(0); |
| 102 CCProxy::setMainThread(0); | 102 CCProxy::setMainThread(0); |
| 103 s_initialized = false; | 103 s_initialized = false; |
| 104 } | 104 } |
| 105 | 105 |
| 106 } | 106 } |
| OLD | NEW |