diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 17:06:53 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 17:06:53 +0100 |
| commit | bc227c233c89135c6fa2e0df0b06f0268e5c96b2 (patch) | |
| tree | bca51cd21561d4979425c7e52d35602235499115 /Source/WebCore/rendering/RenderLayerBacking.cpp | |
| parent | 1aef709674f43ebdc5b5bd4171fabd579412add4 (diff) | |
| parent | 1dce6f9ed4508f77856d32b5f8957a81ddd5f790 (diff) | |
| download | qtwebkit-bc227c233c89135c6fa2e0df0b06f0268e5c96b2.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I623088d8d000cd57cea011bb33c482e8f379021f
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp')
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 3 |
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(); } |