Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: webkit/compositor_bindings/web_compositor_impl.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/compositor_bindings/web_compositor_impl.cc
diff --git a/webkit/compositor_bindings/web_compositor_impl.cc b/webkit/compositor_bindings/web_compositor_impl.cc
deleted file mode 100644
index 5d0a2e94319b87b4fbf9b348bc5158aaff9e3f17..0000000000000000000000000000000000000000
--- a/webkit/compositor_bindings/web_compositor_impl.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "config.h"
-
-#include "web_compositor_impl.h"
-
-#ifdef LOG
-#undef LOG
-#endif
-#include "base/message_loop_proxy.h"
-#include "cc/layer_tree_host.h"
-#include "cc/proxy.h"
-#include "cc/settings.h"
-#include "ccthread_impl.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
-#include "webkit/glue/webthread_impl.h"
-
-using namespace cc;
-
-namespace WebKit {
-
-bool WebCompositorImpl::s_initialized = false;
-Thread* WebCompositorImpl::s_mainThread = 0;
-Thread* WebCompositorImpl::s_implThread = 0;
-
-void WebCompositor::initialize(WebThread* implThread)
-{
- WebCompositorImpl::initialize(implThread);
-}
-
-bool WebCompositor::isThreadingEnabled()
-{
- return WebCompositorImpl::isThreadingEnabled();
-}
-
-void WebCompositor::shutdown()
-{
- WebCompositorImpl::shutdown();
-}
-
-void WebCompositorImpl::initialize(WebThread* implThread)
-{
- ASSERT(!s_initialized);
- s_initialized = true;
-
- s_mainThread = CCThreadImpl::createForCurrentThread().release();
- Proxy::setMainThread(s_mainThread);
- if (implThread) {
- s_implThread = CCThreadImpl::createForDifferentThread(implThread).release();
- Proxy::setImplThread(s_implThread);
- } else
- Proxy::setImplThread(0);
-}
-
-bool WebCompositorImpl::isThreadingEnabled()
-{
- return s_implThread;
-}
-
-bool WebCompositorImpl::initialized()
-{
- return s_initialized;
-}
-
-void WebCompositorImpl::shutdown()
-{
- ASSERT(s_initialized);
- ASSERT(!LayerTreeHost::anyLayerTreeHostInstanceExists());
-
- if (s_implThread) {
- delete s_implThread;
- s_implThread = 0;
- }
- delete s_mainThread;
- s_mainThread = 0;
- Proxy::setImplThread(0);
- Proxy::setMainThread(0);
- s_initialized = false;
-}
-
-}

Powered by Google App Engine
This is Rietveld 408576698