Index: cc/layer_tree_host.cc |
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
index a15713666c6f423c2103ca1cb098426c87a31e58..baf82a5bcdef2f5b91284b513dcda4af566cbba3 100644 |
--- a/cc/layer_tree_host.cc |
+++ b/cc/layer_tree_host.cc |
@@ -495,14 +495,6 @@ void CCLayerTreeHost::updateLayers(CCTextureUpdateQueue& queue, size_t memoryAll |
updateLayers(rootLayer(), queue); |
} |
-static void setScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor) |
-{ |
- if (layer->boundsContainPageScale()) |
- layer->setContentsScale(deviceScaleFactor); |
- else |
- layer->setContentsScale(deviceScaleFactor * pageScaleFactor); |
-} |
- |
static LayerChromium* findFirstScrollableLayer(LayerChromium* layer) |
{ |
if (!layer) |
@@ -520,29 +512,10 @@ static LayerChromium* findFirstScrollableLayer(LayerChromium* layer) |
return 0; |
} |
-static void updateLayerScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor) |
-{ |
- setScale(layer, deviceScaleFactor, pageScaleFactor); |
- |
- LayerChromium* maskLayer = layer->maskLayer(); |
- if (maskLayer) |
- setScale(maskLayer, deviceScaleFactor, pageScaleFactor); |
- |
- LayerChromium* replicaMaskLayer = layer->replicaLayer() ? layer->replicaLayer()->maskLayer() : 0; |
- if (replicaMaskLayer) |
- setScale(replicaMaskLayer, deviceScaleFactor, pageScaleFactor); |
- |
- const std::vector<scoped_refptr<LayerChromium> >& children = layer->children(); |
- for (unsigned int i = 0; i < children.size(); ++i) |
- updateLayerScale(children[i].get(), deviceScaleFactor, pageScaleFactor); |
-} |
- |
void CCLayerTreeHost::updateLayers(LayerChromium* rootLayer, CCTextureUpdateQueue& queue) |
{ |
TRACE_EVENT0("cc", "CCLayerTreeHost::updateLayers"); |
- updateLayerScale(rootLayer, m_deviceScaleFactor, m_pageScaleFactor); |
- |
LayerList updateList; |
{ |
@@ -553,7 +526,7 @@ void CCLayerTreeHost::updateLayers(LayerChromium* rootLayer, CCTextureUpdateQueu |
} |
TRACE_EVENT0("cc", "CCLayerTreeHost::updateLayers::calcDrawEtc"); |
- CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize(), m_deviceScaleFactor, rendererCapabilities().maxTextureSize, updateList); |
+ CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer, deviceViewportSize(), m_deviceScaleFactor, m_pageScaleFactor, rendererCapabilities().maxTextureSize, updateList); |
} |
// Reset partial texture update requests. |