Title: [90295] trunk/Source/WebCore
- Revision
- 90295
- Author
- [email protected]
- Date
- 2011-07-01 16:24:21 -0700 (Fri, 01 Jul 2011)
Log Message
Add change accidentally left out of last commit.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateContentsScale): Multiply in the
backing scale.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90294 => 90295)
--- trunk/Source/WebCore/ChangeLog 2011-07-01 23:19:00 UTC (rev 90294)
+++ trunk/Source/WebCore/ChangeLog 2011-07-01 23:24:21 UTC (rev 90295)
@@ -1,5 +1,13 @@
2011-07-01 Darin Adler <[email protected]>
+ Add change accidentally left out of last commit.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateContentsScale): Multiply in the
+ backing scale.
+
+2011-07-01 Darin Adler <[email protected]>
+
Consider backing scale when setting up graphics layers
https://bugs.webkit.org/show_bug.cgi?id=63848
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (90294 => 90295)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-07-01 23:19:00 UTC (rev 90294)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-07-01 23:24:21 UTC (rev 90295)
@@ -1477,14 +1477,16 @@
void RenderLayerBacking::updateContentsScale(float scale)
{
+ float combinedScale = scale * backingScaleFactor();
+
if (m_graphicsLayer)
- m_graphicsLayer->setContentsScale(scale);
+ m_graphicsLayer->setContentsScale(combinedScale);
if (m_foregroundLayer)
- m_foregroundLayer->setContentsScale(scale);
+ m_foregroundLayer->setContentsScale(combinedScale);
if (m_maskLayer)
- m_maskLayer->setContentsScale(scale);
+ m_maskLayer->setContentsScale(combinedScale);
}
float RenderLayerBacking::pageScaleFactor() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
