| Index: webkit/compositor_bindings/WebCompositorImpl.cpp
|
| diff --git a/webkit/compositor_bindings/WebCompositorImpl.cpp b/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| index 2b42b3815f41a6ca96e7746498eb90ebe7068553..633451ab4f339266c4080514a2b713411c30301e 100644
|
| --- a/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| +++ b/webkit/compositor_bindings/WebCompositorImpl.cpp
|
| @@ -22,8 +22,8 @@ using namespace cc;
|
| namespace WebKit {
|
|
|
| bool WebCompositorImpl::s_initialized = false;
|
| -CCThread* WebCompositorImpl::s_mainThread = 0;
|
| -CCThread* WebCompositorImpl::s_implThread = 0;
|
| +Thread* WebCompositorImpl::s_mainThread = 0;
|
| +Thread* WebCompositorImpl::s_implThread = 0;
|
|
|
| void WebCompositor::initialize(WebThread* implThread)
|
| {
|
| @@ -38,31 +38,31 @@ bool WebCompositor::isThreadingEnabled()
|
| void WebCompositor::shutdown()
|
| {
|
| WebCompositorImpl::shutdown();
|
| - CCSettings::reset();
|
| + Settings::reset();
|
| }
|
|
|
| void WebCompositor::setPerTilePaintingEnabled(bool enabled)
|
| {
|
| ASSERT(!WebCompositorImpl::initialized());
|
| - CCSettings::setPerTilePaintingEnabled(enabled);
|
| + Settings::setPerTilePaintingEnabled(enabled);
|
| }
|
|
|
| void WebCompositor::setPartialSwapEnabled(bool enabled)
|
| {
|
| ASSERT(!WebCompositorImpl::initialized());
|
| - CCSettings::setPartialSwapEnabled(enabled);
|
| + Settings::setPartialSwapEnabled(enabled);
|
| }
|
|
|
| void WebCompositor::setAcceleratedAnimationEnabled(bool enabled)
|
| {
|
| ASSERT(!WebCompositorImpl::initialized());
|
| - CCSettings::setAcceleratedAnimationEnabled(enabled);
|
| + Settings::setAcceleratedAnimationEnabled(enabled);
|
| }
|
|
|
| void WebCompositor::setPageScalePinchZoomEnabled(bool enabled)
|
| {
|
| ASSERT(!WebCompositorImpl::initialized());
|
| - CCSettings::setPageScalePinchZoomEnabled(enabled);
|
| + Settings::setPageScalePinchZoomEnabled(enabled);
|
| }
|
|
|
| void WebCompositorImpl::initialize(WebThread* implThread)
|
| @@ -71,12 +71,12 @@ void WebCompositorImpl::initialize(WebThread* implThread)
|
| s_initialized = true;
|
|
|
| s_mainThread = CCThreadImpl::createForCurrentThread().release();
|
| - CCProxy::setMainThread(s_mainThread);
|
| + Proxy::setMainThread(s_mainThread);
|
| if (implThread) {
|
| s_implThread = CCThreadImpl::createForDifferentThread(implThread).release();
|
| - CCProxy::setImplThread(s_implThread);
|
| + Proxy::setImplThread(s_implThread);
|
| } else
|
| - CCProxy::setImplThread(0);
|
| + Proxy::setImplThread(0);
|
| }
|
|
|
| bool WebCompositorImpl::isThreadingEnabled()
|
| @@ -92,7 +92,7 @@ bool WebCompositorImpl::initialized()
|
| void WebCompositorImpl::shutdown()
|
| {
|
| ASSERT(s_initialized);
|
| - ASSERT(!CCLayerTreeHost::anyLayerTreeHostInstanceExists());
|
| + ASSERT(!LayerTreeHost::anyLayerTreeHostInstanceExists());
|
|
|
| if (s_implThread) {
|
| delete s_implThread;
|
| @@ -100,8 +100,8 @@ void WebCompositorImpl::shutdown()
|
| }
|
| delete s_mainThread;
|
| s_mainThread = 0;
|
| - CCProxy::setImplThread(0);
|
| - CCProxy::setMainThread(0);
|
| + Proxy::setImplThread(0);
|
| + Proxy::setMainThread(0);
|
| s_initialized = false;
|
| }
|
|
|
|
|