diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-30 15:54:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 21:21:42 +0100 |
| commit | db006e7811c4cdc8eada301a2a986a8abbc5d13f (patch) | |
| tree | 6210a23553a8f2f70b4f2d1fab97a33d662f8d26 | |
| parent | beb21ff26028d559d35ab748aa28d32d8ab0bdff (diff) | |
Fix assert in BitmapTextureImageBuffer::applyFilters()
While WebCore should not give a BitmapTextureImageBuffer any filters
applyFilters() will still be called with an empty list of filters.
We should therefore not assert that applyFilters is never called by
that is only ever called with an empty list of filters to apply.
Change-Id: Ic24b735f1fc92e2a57c7ef068a8c7d712f0fc31f
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp index a59b33f4a..c04e576db 100644 --- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp +++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp @@ -163,9 +163,10 @@ void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const } #if ENABLE(CSS_FILTERS) -PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations&) +PassRefPtr<BitmapTexture> BitmapTextureImageBuffer::applyFilters(TextureMapper*, const FilterOperations& filters) { - ASSERT_NOT_REACHED(); + ASSERT_UNUSED(filters, filters.isEmpty()); + return this; } #endif |