diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:24:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-19 13:24:31 +0100 |
| commit | 58d942e3a1d7add6967a0eee13bdbad620a18664 (patch) | |
| tree | 36c8b67ed2088c9cf09804985d387ab460d195a3 /Source/WebCore/rendering/RenderLayerBacking.cpp | |
| parent | a4a5e663d6409fc19296c7329bdb0456fa7f54ec (diff) | |
| parent | bc227c233c89135c6fa2e0df0b06f0268e5c96b2 (diff) | |
| download | qtwebkit-58d942e3a1d7add6967a0eee13bdbad620a18664.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
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(); } |