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

Unified Diff: cc/CCLayerTreeHost.cpp

Issue 10909255: Support high DPI scrollbar on top level web frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only apply page scale factor to layers within and including root scroll layer. 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
« no previous file with comments | « cc/CCLayerImpl.cpp ('k') | cc/CCScrollbarLayerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHost.cpp
diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
index 18786f52b4d8d263bdd91820ce425a5cf7dc8cb4..d88ee5e86f8ce650930c21a37c71d6a73394d61e 100644
--- a/cc/CCLayerTreeHost.cpp
+++ b/cc/CCLayerTreeHost.cpp
@@ -467,36 +467,39 @@ void CCLayerTreeHost::updateLayers(CCTextureUpdateQueue& queue, size_t memoryAll
updateLayers(rootLayer(), queue);
}
-static void setScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor)
+static void setScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor, bool inScrollLayer)
{
- if (layer->boundsContainPageScale())
+ if (!inScrollLayer || layer->boundsContainPageScale())
layer->setContentsScale(deviceScaleFactor);
else
layer->setContentsScale(deviceScaleFactor * pageScaleFactor);
}
-static void updateLayerScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor)
+static void updateLayerScale(LayerChromium* layer, float deviceScaleFactor, float pageScaleFactor, bool inScrollLayer)
{
- setScale(layer, deviceScaleFactor, pageScaleFactor);
+ if (layer->scrollable())
+ inScrollLayer = true;
flackr 2012/09/17 19:37:51 Alexandre, is the logic for finding the root scrol
enne (OOO) 2012/09/17 20:37:00 I think I'd prefer to keep this complexity outside
+
+ setScale(layer, deviceScaleFactor, pageScaleFactor, inScrollLayer);
LayerChromium* maskLayer = layer->maskLayer();
if (maskLayer)
- setScale(maskLayer, deviceScaleFactor, pageScaleFactor);
+ setScale(maskLayer, deviceScaleFactor, pageScaleFactor, inScrollLayer);
LayerChromium* replicaMaskLayer = layer->replicaLayer() ? layer->replicaLayer()->maskLayer() : 0;
if (replicaMaskLayer)
- setScale(replicaMaskLayer, deviceScaleFactor, pageScaleFactor);
+ setScale(replicaMaskLayer, deviceScaleFactor, pageScaleFactor, inScrollLayer);
const Vector<RefPtr<LayerChromium> >& children = layer->children();
for (unsigned int i = 0; i < children.size(); ++i)
- updateLayerScale(children[i].get(), deviceScaleFactor, pageScaleFactor);
+ updateLayerScale(children[i].get(), deviceScaleFactor, pageScaleFactor, inScrollLayer);
}
void CCLayerTreeHost::updateLayers(LayerChromium* rootLayer, CCTextureUpdateQueue& queue)
{
TRACE_EVENT0("cc", "CCLayerTreeHost::updateLayers");
- updateLayerScale(rootLayer, m_deviceScaleFactor, m_pageScaleFactor);
+ updateLayerScale(rootLayer, m_deviceScaleFactor, m_pageScaleFactor, false);
LayerList updateList;
« no previous file with comments | « cc/CCLayerImpl.cpp ('k') | cc/CCScrollbarLayerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698