Import WebKit commit 13ac532967b6ac2d18d6fc4ea72c4ca35eccff20

Change-Id: I12a5c8f98aeaac1b542ce20c0ff297c57b5d84d1
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

2 files changed, 13 insertions, 3 deletions

diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp
index 0812b585d..48130eba4 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.cpp
@@ -67,6 +67,15 @@ void TextureMapperImageBuffer::beginClip(const TransformationMatrix& matrix, con
 #endif
 }
 
+void TextureMapperImageBuffer::endClip()
+{
+    GraphicsContext* context = currentContext();
+    if (!context)
+        return;
+
+    context->restore();
+}
+
 void TextureMapperImageBuffer::drawTexture(const BitmapTexture& texture, const FloatRect& targetRect, const TransformationMatrix& matrix, float opacity, unsigned /* exposedEdges */)
 {
     GraphicsContext* context = currentContext();
@@ -115,9 +124,10 @@ void TextureMapperImageBuffer::drawNumber(int /* number */, const Color&, const
     notImplemented();
 }
 
-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;
 }
 
diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h
index 234b8eeec..519a4820d 100644
--- a/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h
+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperImageBuffer.h
@@ -39,7 +39,7 @@ public:
     void drawSolidColor(const FloatRect&, const TransformationMatrix&, const Color&) final;
     void beginClip(const TransformationMatrix&, const FloatRect&) final;
     void bindSurface(BitmapTexture* surface) final { m_currentSurface = surface;}
-    void endClip() final { graphicsContext()->restore(); }
+    void endClip() final;
     IntRect clipBounds() final { return currentContext()->clipBounds(); }
     IntSize maxTextureSize() const final;
     PassRefPtr<BitmapTexture> createTexture() final { return BitmapTextureImageBuffer::create(); }