setDrawFilter needs to trigger any deferred saves

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/1077353002

diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index 9a2404b..bcf8d56 100644 (file)
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -91,6 +91,7 @@
     '../tests/DiscardableMemoryTest.cpp',
     '../tests/DocumentTest.cpp',
     '../tests/DrawBitmapRectTest.cpp',
+    '../tests/DrawFilterTest.cpp',
     '../tests/DrawPathTest.cpp',
     '../tests/DrawTextTest.cpp',
     '../tests/DynamicHashTest.cpp',

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 7949cb3..68ced60 100644 (file)
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -589,6 +589,7 @@ SkDrawFilter* SkCanvas::getDrawFilter() const {
 }
 
 SkDrawFilter* SkCanvas::setDrawFilter(SkDrawFilter* filter) {
+    this->checkForDeferredSave();
     SkRefCnt_SafeAssign(fMCRec->fFilter, filter);
     return filter;
 }

diff --git a/tests/DrawFilterTest.cpp b/tests/DrawFilterTest.cpp
new file mode 100644 (file)
index 0000000..d01fa07
--- /dev/null
+++ b/tests/DrawFilterTest.cpp
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkCanvas.h"
+#include "SkDrawFilter.h"
+#include "SkSurface.h"
+#include "Test.h"
+
+class TestFilter : public SkDrawFilter {
+public:
+    bool filter(SkPaint* p, Type) override {
+        return true;
+    }
+};
+
+/**
+ *  canvas.setDrawFilter is defined to be local to the save/restore block, such that if you
+ *  do the following: save / modify-drawfilter / restore, the current drawfilter should be what
+ *  it was before the save.
+ */
+static void test_saverestore(skiatest::Reporter* reporter) {
+    SkAutoTUnref<SkSurface> surface(SkSurface::NewRasterN32Premul(10, 10));
+    SkCanvas* canvas = surface->getCanvas();
+
+
+    SkAutoTUnref<TestFilter> df(SkNEW(TestFilter));
+
+    REPORTER_ASSERT(reporter, NULL == canvas->getDrawFilter());
+
+    canvas->save();
+    canvas->setDrawFilter(df);
+    REPORTER_ASSERT(reporter, NULL != canvas->getDrawFilter());
+    canvas->restore();
+
+    REPORTER_ASSERT(reporter, NULL == canvas->getDrawFilter());
+}
+
+DEF_TEST(DrawFilter, reporter) {
+    test_saverestore(reporter);
+}