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

Unified Diff: cc/CCLayerTreeHost.cpp

Issue 10915313: cc: Apply the layer's initial CSS scale to the contentsScale to render text at the right resolution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove extra header Created 8 years, 3 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
Index: cc/CCLayerTreeHost.cpp
diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
index 18786f52b4d8d263bdd91820ce425a5cf7dc8cb4..200b41b2dd2f91f8a4c9bb1ed74dc2e386678be2 100644
--- a/cc/CCLayerTreeHost.cpp
+++ b/cc/CCLayerTreeHost.cpp
@@ -467,42 +467,15 @@ 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 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 Vector<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;
{
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);
CCLayerTreeHostCommon::calculateVisibleRects(updateList);
}
« no previous file with comments | « cc/CCLayerIteratorTest.cpp ('k') | cc/CCLayerTreeHostCommon.h » ('j') | cc/CCMathUtil.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698