summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-11-28 15:07:54 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-12-08 14:25:47 +0100
commit88c4538698fbfd7bc7d4e546abb17f9014ed61bd (patch)
treeab37270269b5117a342900c173f88a0e88513625
parent2edecfd1da38a4eb1249ff2157cbed8277e9df19 (diff)
downloadqtwebkit-88c4538698fbfd7bc7d4e546abb17f9014ed61bd.tar.gz
Do not set the mainframe graphicslayer to being opaque when it isn't
If the frameview has a transparent background we need to tell the GraphicsLayer that it is not opaque otherwise the TextureMapperGL might choose not to use blend. Task-number: QTBUG-40063 Change-Id: If129305fed8620cd3c28cec5357625d8892ad063 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
-rw-r--r--Source/WebCore/rendering/RenderLayerBacking.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index acfc67776..b653a0fb9 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -315,7 +315,8 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer");
if (m_isMainFrameRenderViewLayer) {
- m_graphicsLayer->setContentsOpaque(true);
+ bool viewIsTransparent = compositor()->viewHasTransparentBackground(0);
+ m_graphicsLayer->setContentsOpaque(!viewIsTransparent);
m_graphicsLayer->setAppliesPageScale();
}