diff options
| author | Zeno Albisser <zeno@webkit.org> | 2012-12-11 14:47:37 +0100 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2012-12-11 15:25:15 +0100 |
| commit | e286166f8c7dd4a9cdc071d5ed7a2e84eb73e7b1 (patch) | |
| tree | af164d0ac41c6e4de30e81c3b5ea60d2063398b1 | |
| parent | 12f47a6b99bc60e2d8552f9beaf7cec38d9b7cdf (diff) | |
| download | qtwebkit-e286166f8c7dd4a9cdc071d5ed7a2e84eb73e7b1.tar.gz | |
[Qt][Mac] Fix transparency for WebGL content.
https://bugs.webkit.org/show_bug.cgi?id=104659
When drawing a texture to the TextureMapper the flag SupportsBlending
must be passed in order to allow for transparent webgl content.
We are doing this for GLX already, but the flag was still missing
in GraphicsSurfaceMac.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:
(WebCore::GraphicsSurface::platformPaintToTextureMapper):
Change-Id: I83ef9bc8e4525373e27c7bb43ff2d45c2b1944db
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | Source/WebCore/ChangeLog | 15 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 292b7cc40..d812c3aba 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,18 @@ +2012-12-11 Zeno Albisser <zeno@webkit.org> + + [Qt][Mac] Fix transparency for WebGL content. + https://bugs.webkit.org/show_bug.cgi?id=104659 + + When drawing a texture to the TextureMapper the flag SupportsBlending + must be passed in order to allow for transparent webgl content. + We are doing this for GLX already, but the flag was still missing + in GraphicsSurfaceMac. + + Reviewed by Kenneth Rohde Christiansen. + + * platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp: + (WebCore::GraphicsSurface::platformPaintToTextureMapper): + 2012-12-05 Allan Sandfeld Jensen <allan.jensen@digia.com> [Qt] Don't rely on QMimeDatabase for essential MIME types diff --git a/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp b/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp index 5dfc8c55f..439bf9a2d 100644 --- a/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp +++ b/Source/WebCore/platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp @@ -345,7 +345,7 @@ void GraphicsSurface::platformPaintToTextureMapper(TextureMapper* textureMapper, { TransformationMatrix adjustedTransform = transform; adjustedTransform.multiply(TransformationMatrix::rectToRect(FloatRect(FloatPoint::zero(), m_private->size()), targetRect)); - static_cast<TextureMapperGL*>(textureMapper)->drawTextureRectangleARB(m_private->frontBufferTextureID(), 0, m_private->size(), targetRect, adjustedTransform, opacity, mask); + static_cast<TextureMapperGL*>(textureMapper)->drawTextureRectangleARB(m_private->frontBufferTextureID(), TextureMapperGL::SupportsBlending, m_private->size(), targetRect, adjustedTransform, opacity, mask); } uint32_t GraphicsSurface::platformFrontBuffer() const |