Title: [92013] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92012 => 92013)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-29 21:44:26 UTC (rev 92012)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-07-29 21:48:01 UTC (rev 92013)
@@ -1,5 +1,17 @@
2011-07-29 Lucas Forschler <[email protected]>
+ Merged 90295.
+
+ 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-29 Lucas Forschler <[email protected]>
+
Merged 90293.
2011-07-01 Darin Adler <[email protected]>
Modified: branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (92012 => 92013)
--- branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-07-29 21:44:26 UTC (rev 92012)
+++ branches/safari-534.51-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2011-07-29 21:48:01 UTC (rev 92013)
@@ -1480,14 +1480,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
