| 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 "web_compositor_impl.h" |
| 8 | 8 |
| 9 #ifdef LOG | 9 #ifdef LOG |
| 10 #undef LOG | 10 #undef LOG |
| 11 #endif | 11 #endif |
| 12 #include "base/message_loop_proxy.h" | 12 #include "base/message_loop_proxy.h" |
| 13 #include "cc/layer_tree_host.h" | 13 #include "cc/layer_tree_host.h" |
| 14 #include "cc/proxy.h" | 14 #include "cc/proxy.h" |
| 15 #include "cc/settings.h" | 15 #include "cc/settings.h" |
| 16 #include "ccthread_impl.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" | 17 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" |
| 17 #include "webkit/glue/webthread_impl.h" | 18 #include "webkit/glue/webthread_impl.h" |
| 18 #include "CCThreadImpl.h" | |
| 19 | 19 |
| 20 using namespace cc; | 20 using namespace cc; |
| 21 | 21 |
| 22 namespace WebKit { | 22 namespace WebKit { |
| 23 | 23 |
| 24 bool WebCompositorImpl::s_initialized = false; | 24 bool WebCompositorImpl::s_initialized = false; |
| 25 CCThread* WebCompositorImpl::s_mainThread = 0; | 25 CCThread* WebCompositorImpl::s_mainThread = 0; |
| 26 CCThread* WebCompositorImpl::s_implThread = 0; | 26 CCThread* WebCompositorImpl::s_implThread = 0; |
| 27 | 27 |
| 28 void WebCompositor::initialize(WebThread* implThread) | 28 void WebCompositor::initialize(WebThread* implThread) |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 s_implThread = 0; | 99 s_implThread = 0; |
| 100 } | 100 } |
| 101 delete s_mainThread; | 101 delete s_mainThread; |
| 102 s_mainThread = 0; | 102 s_mainThread = 0; |
| 103 CCProxy::setImplThread(0); | 103 CCProxy::setImplThread(0); |
| 104 CCProxy::setMainThread(0); | 104 CCProxy::setMainThread(0); |
| 105 s_initialized = false; | 105 s_initialized = false; |
| 106 } | 106 } |
| 107 | 107 |
| 108 } | 108 } |
| OLD | NEW |