| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index 80e9e35fe7379f8ef169436d322282d6499f8114..ca034e5fef3e640d5334b2d1f6ed95b3ed3fbd71 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -49,9 +49,9 @@ LayerTreeSettings::LayerTreeSettings()
|
| , renderVSyncEnabled(true)
|
| , refreshRate(0)
|
| , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
|
| - , defaultTileSize(IntSize(256, 256))
|
| - , maxUntiledLayerSize(IntSize(512, 512))
|
| - , minimumOcclusionTrackingSize(IntSize(160, 160))
|
| + , defaultTileSize(gfx::Size(256, 256))
|
| + , maxUntiledLayerSize(gfx::Size(512, 512))
|
| + , minimumOcclusionTrackingSize(gfx::Size(160, 160))
|
| {
|
| }
|
|
|
| @@ -164,14 +164,14 @@ void LayerTreeHost::initializeRenderer()
|
| m_settings.maxPartialTextureUpdates = min(m_settings.maxPartialTextureUpdates, m_proxy->maxPartialTextureUpdates());
|
|
|
| m_contentsTextureManager = PrioritizedTextureManager::create(0, m_proxy->rendererCapabilities().maxTextureSize, Renderer::ContentPool);
|
| - m_surfaceMemoryPlaceholder = m_contentsTextureManager->createTexture(IntSize(), GL_RGBA);
|
| + m_surfaceMemoryPlaceholder = m_contentsTextureManager->createTexture(gfx::Size(), GL_RGBA);
|
|
|
| m_rendererInitialized = true;
|
|
|
| - m_settings.defaultTileSize = IntSize(min(m_settings.defaultTileSize.width(), m_proxy->rendererCapabilities().maxTextureSize),
|
| - min(m_settings.defaultTileSize.height(), m_proxy->rendererCapabilities().maxTextureSize));
|
| - m_settings.maxUntiledLayerSize = IntSize(min(m_settings.maxUntiledLayerSize.width(), m_proxy->rendererCapabilities().maxTextureSize),
|
| - min(m_settings.maxUntiledLayerSize.height(), m_proxy->rendererCapabilities().maxTextureSize));
|
| + m_settings.defaultTileSize = gfx::Size(min(m_settings.defaultTileSize.width(), m_proxy->rendererCapabilities().maxTextureSize),
|
| + min(m_settings.defaultTileSize.height(), m_proxy->rendererCapabilities().maxTextureSize));
|
| + m_settings.maxUntiledLayerSize = gfx::Size(min(m_settings.maxUntiledLayerSize.width(), m_proxy->rendererCapabilities().maxTextureSize),
|
| + min(m_settings.maxUntiledLayerSize.height(), m_proxy->rendererCapabilities().maxTextureSize));
|
| }
|
|
|
| LayerTreeHost::RecreateResult LayerTreeHost::recreateContext()
|
| @@ -408,7 +408,7 @@ void LayerTreeHost::setRootLayer(scoped_refptr<Layer> rootLayer)
|
| setNeedsCommit();
|
| }
|
|
|
| -void LayerTreeHost::setViewportSize(const IntSize& layoutViewportSize, const IntSize& deviceViewportSize)
|
| +void LayerTreeHost::setViewportSize(const gfx::Size& layoutViewportSize, const gfx::Size& deviceViewportSize)
|
| {
|
| if (layoutViewportSize == m_layoutViewportSize && deviceViewportSize == m_deviceViewportSize)
|
| return;
|
| @@ -489,7 +489,7 @@ void LayerTreeHost::updateLayers(TextureUpdateQueue& queue, size_t memoryAllocat
|
| if (!rootLayer())
|
| return;
|
|
|
| - if (layoutViewportSize().isEmpty())
|
| + if (layoutViewportSize().IsEmpty())
|
| return;
|
|
|
| m_contentsTextureManager->setMaxMemoryLimitBytes(memoryAllocationLimitBytes);
|
| @@ -651,7 +651,7 @@ bool LayerTreeHost::paintLayerContents(const LayerList& renderSurfaceLayerList,
|
| DCHECK(it->renderSurface()->drawOpacity() || it->renderSurface()->drawOpacityIsAnimating());
|
| needMoreUpdates |= paintMasksForRenderSurface(*it, queue);
|
| } else if (it.representsItself()) {
|
| - DCHECK(!it->bounds().isEmpty());
|
| + DCHECK(!it->bounds().IsEmpty());
|
| it->update(queue, &occlusionTracker, m_renderingStats);
|
| needMoreUpdates |= it->needMoreUpdates();
|
| }
|
|
|