Text blob run paints should be filtered.
We're constructing blob run paints after the canvas draw filter has been
applied.
Instead, we need do defer text blob draw filters until we have access
to the full run paints.
BUG=skia:3494
R=reed@google.com,mtklein@google.com
Review URL: https://codereview.chromium.org/973973003
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index c10d390..8b88a03 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -2161,14 +2161,21 @@
}
}
+ // We cannot filter in the looper as we normally do, because the paint is
+ // incomplete at this point (text-related attributes are embedded within blob run paints).
+ SkDrawFilter* drawFilter = fMCRec->fFilter;
+ fMCRec->fFilter = NULL;
+
LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
while (iter.next()) {
SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
- iter.fDevice->drawTextBlob(iter, blob, x, y, dfp.paint());
+ iter.fDevice->drawTextBlob(iter, blob, x, y, dfp.paint(), drawFilter);
}
LOOPER_END
+
+ fMCRec->fFilter = drawFilter;
}
// These will become non-virtual, so they always call the (virtual) onDraw... method