| Index: webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
|
| diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
|
| index f621a864a6eaeba69ae0c5454a520c03683eff9c..b989c91f93cc36cf063681fa1bcc17616f8c06f7 100644
|
| --- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
|
| +++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
|
| @@ -44,7 +44,7 @@ WebLayerTreeViewImpl::~WebLayerTreeViewImpl()
|
|
|
| bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings)
|
| {
|
| - CCLayerTreeSettings settings;
|
| + LayerTreeSettings settings;
|
| settings.acceleratePainting = webSettings.acceleratePainting;
|
| settings.showFPSCounter = webSettings.showFPSCounter;
|
| settings.showPlatformLayerTree = webSettings.showPlatformLayerTree;
|
| @@ -53,7 +53,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
|
| settings.refreshRate = webSettings.refreshRate;
|
| settings.defaultTileSize = convert(webSettings.defaultTileSize);
|
| settings.maxUntiledLayerSize = convert(webSettings.maxUntiledLayerSize);
|
| - m_layerTreeHost = CCLayerTreeHost::create(this, settings);
|
| + m_layerTreeHost = LayerTreeHost::create(this, settings);
|
| if (!m_layerTreeHost.get())
|
| return false;
|
| return true;
|
| @@ -71,7 +71,7 @@ void WebLayerTreeViewImpl::setRootLayer(const WebLayer& root)
|
|
|
| void WebLayerTreeViewImpl::clearRootLayer()
|
| {
|
| - m_layerTreeHost->setRootLayer(scoped_refptr<LayerChromium>());
|
| + m_layerTreeHost->setRootLayer(scoped_refptr<Layer>());
|
| }
|
|
|
| void WebLayerTreeViewImpl::setViewportSize(const WebSize& layoutViewportSize, const WebSize& deviceViewportSize)
|
| @@ -144,7 +144,7 @@ bool WebLayerTreeViewImpl::commitRequested() const
|
|
|
| void WebLayerTreeViewImpl::composite()
|
| {
|
| - if (CCProxy::hasImplThread())
|
| + if (Proxy::hasImplThread())
|
| m_layerTreeHost->setNeedsCommit();
|
| else
|
| m_layerTreeHost->composite();
|
| @@ -167,7 +167,7 @@ void WebLayerTreeViewImpl::finishAllRendering()
|
|
|
| void WebLayerTreeViewImpl::renderingStats(WebRenderingStats& stats) const
|
| {
|
| - CCRenderingStats ccStats;
|
| + RenderingStats ccStats;
|
| m_layerTreeHost->renderingStats(&ccStats);
|
|
|
| stats.numAnimationFrames = ccStats.numAnimationFrames;
|
| @@ -186,7 +186,7 @@ void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectT
|
| IntRect asciiToRectTable[128];
|
| for (int i = 0; i < 128; ++i)
|
| asciiToRectTable[i] = convert(asciiToWebRectTable[i]);
|
| - scoped_ptr<CCFontAtlas> fontAtlas = CCFontAtlas::create(bitmap, asciiToRectTable, fontHeight);
|
| + scoped_ptr<FontAtlas> fontAtlas = FontAtlas::create(bitmap, asciiToRectTable, fontHeight);
|
| m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
|
| }
|
|
|
| @@ -230,9 +230,9 @@ void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
|
| m_client->didRecreateOutputSurface(success);
|
| }
|
|
|
| -scoped_ptr<CCInputHandler> WebLayerTreeViewImpl::createInputHandler()
|
| +scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler()
|
| {
|
| - scoped_ptr<CCInputHandler> ret;
|
| + scoped_ptr<InputHandler> ret;
|
| scoped_ptr<WebInputHandler> handler(m_client->createInputHandler());
|
| if (handler)
|
| ret = WebToCCInputHandlerAdapter::create(handler.Pass());
|
|
|