Commit 48545b58 authored by allan.jensen@digia.com's avatar allan.jensen@digia.com
Browse files

[Texmap] CSS filter not working on software composited layers

https://bugs.webkit.org/show_bug.cgi?id=122159

Reviewed by Noam Rosenthal.

Tell the rendering layer we do not support CSS filters when we do not. This
will make RenderLayer fall back to using its own software implementation.

* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setFilters):
* platform/graphics/texmap/TextureMapperImageBuffer.cpp:
(WebCore::BitmapTextureImageBuffer::applyFilters):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 49f61d06
2013-10-01 Allan Sandfeld Jensen <allan.jensen@digia.com>
[Texmap] CSS filter not working on software composited layers
https://bugs.webkit.org/show_bug.cgi?id=122159
Reviewed by Noam Rosenthal.
Tell the rendering layer we do not support CSS filters when we do not. This
will make RenderLayer fall back to using its own software implementation.
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::GraphicsLayerTextureMapper::setFilters):
* platform/graphics/texmap/TextureMapperImageBuffer.cpp:
(WebCore::BitmapTextureImageBuffer::applyFilters):
2013-10-01 Darin Adler <darin@apple.com> 2013-10-01 Darin Adler <darin@apple.com>
   
Try to fix assertion failures seem on bots. Try to fix assertion failures seem on bots.
...@@ -670,6 +670,10 @@ void GraphicsLayerTextureMapper::removeAnimation(const String& animationName) ...@@ -670,6 +670,10 @@ void GraphicsLayerTextureMapper::removeAnimation(const String& animationName)
#if ENABLE(CSS_FILTERS) #if ENABLE(CSS_FILTERS)
bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters) bool GraphicsLayerTextureMapper::setFilters(const FilterOperations& filters)
{ {
TextureMapper* textureMapper = m_layer->textureMapper();
// TextureMapperImageBuffer does not support CSS filters.
if (!textureMapper || textureMapper->accelerationMode() == TextureMapper::SoftwareMode)
return false;
notifyChange(FilterChange); notifyChange(FilterChange);
return GraphicsLayer::setFilters(filters); return GraphicsLayer::setFilters(filters);
} }
......
...@@ -165,6 +165,7 @@ void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const ...@@ -165,6 +165,7 @@ void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const
#if ENABLE(CSS_FILTERS) #if ENABLE(CSS_FILTERS)
PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&) PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&)
{ {
ASSERT_NOT_REACHED();
return this; return this;
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment