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

Unified Diff: webkit/compositor/WebCompositorImpl.cpp

Issue 10920056: Make cc_unittests and webkit_compositor_unittests executable always (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rename to webkit_compositor_bindings Created 8 years, 4 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
« no previous file with comments | « webkit/compositor/WebCompositorImpl.h ('k') | webkit/compositor/WebCompositorInputHandlerImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor/WebCompositorImpl.cpp
diff --git a/webkit/compositor/WebCompositorImpl.cpp b/webkit/compositor/WebCompositorImpl.cpp
deleted file mode 100644
index 530fa9bf613b6e26e9d6b33f22080c8a4db4bef3..0000000000000000000000000000000000000000
--- a/webkit/compositor/WebCompositorImpl.cpp
+++ /dev/null
@@ -1,98 +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 "WebCompositorImpl.h"
-
-#include "CCLayerTreeHost.h"
-#include "CCProxy.h"
-#include "CCSettings.h"
-#include "CCThreadImpl.h"
-#include <public/Platform.h>
-#include <wtf/ThreadingPrimitives.h>
-
-using namespace WebCore;
-
-namespace WebKit {
-
-bool WebCompositorImpl::s_initialized = false;
-CCThread* WebCompositorImpl::s_mainThread = 0;
-CCThread* WebCompositorImpl::s_implThread = 0;
-
-void WebCompositor::initialize(WebThread* implThread)
-{
- WebCompositorImpl::initialize(implThread);
-}
-
-bool WebCompositor::threadingEnabled()
-{
- return WebCompositorImpl::threadingEnabled();
-}
-
-void WebCompositor::shutdown()
-{
- WebCompositorImpl::shutdown();
- CCSettings::reset();
-}
-
-void WebCompositor::setPerTilePaintingEnabled(bool enabled)
-{
- ASSERT(!WebCompositorImpl::initialized());
- CCSettings::setPerTilePaintingEnabled(enabled);
-}
-
-void WebCompositor::setPartialSwapEnabled(bool enabled)
-{
- ASSERT(!WebCompositorImpl::initialized());
- CCSettings::setPartialSwapEnabled(enabled);
-}
-
-void WebCompositor::setAcceleratedAnimationEnabled(bool enabled)
-{
- ASSERT(!WebCompositorImpl::initialized());
- CCSettings::setAcceleratedAnimationEnabled(enabled);
-}
-
-void WebCompositorImpl::initialize(WebThread* implThread)
-{
- ASSERT(!s_initialized);
- s_initialized = true;
-
- s_mainThread = CCThreadImpl::create(WebKit::Platform::current()->currentThread()).leakPtr();
- CCProxy::setMainThread(s_mainThread);
- if (implThread) {
- s_implThread = CCThreadImpl::create(implThread).leakPtr();
- CCProxy::setImplThread(s_implThread);
- } else
- CCProxy::setImplThread(0);
-}
-
-bool WebCompositorImpl::threadingEnabled()
-{
- return s_implThread;
-}
-
-bool WebCompositorImpl::initialized()
-{
- return s_initialized;
-}
-
-void WebCompositorImpl::shutdown()
-{
- ASSERT(s_initialized);
- ASSERT(!CCLayerTreeHost::anyLayerTreeHostInstanceExists());
-
- if (s_implThread) {
- delete s_implThread;
- s_implThread = 0;
- }
- delete s_mainThread;
- s_mainThread = 0;
- CCProxy::setImplThread(0);
- CCProxy::setMainThread(0);
- s_initialized = false;
-}
-
-}
« no previous file with comments | « webkit/compositor/WebCompositorImpl.h ('k') | webkit/compositor/WebCompositorInputHandlerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698