add filterTextFlags() to SkDevice (virtual) to allow device subclasses to
filter what text features we try to use. The filtering allows for implementation
limitations to dictate when we turn off certain text features.
git-svn-id: http://skia.googlecode.com/svn/trunk@943 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 2b7d588..a31623e 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1352,12 +1352,42 @@
ITER_END
}
+class SkDeviceFilteredPaint {
+public:
+ SkDeviceFilteredPaint(SkDevice* device, const SkPaint& paint) {
+ SkDevice::TextFlags flags;
+ if (device->filterTextFlags(paint, &flags)) {
+ SkPaint* newPaint = new (fStorage) SkPaint(paint);
+ newPaint->setFlags(flags.fFlags);
+ newPaint->setHinting(flags.fHinting);
+ fPaint = newPaint;
+ } else {
+ fPaint = &paint;
+ }
+ }
+
+ ~SkDeviceFilteredPaint() {
+ if (reinterpret_cast<SkPaint*>(fStorage) == fPaint) {
+ fPaint->~SkPaint();
+ }
+ }
+
+ const SkPaint& paint() const { return *fPaint; }
+
+private:
+ // points to either fStorage or the caller's paint
+ const SkPaint* fPaint;
+ // we rely on the fPaint above to ensure proper alignment of fStorage
+ char fStorage[sizeof(SkPaint)];
+};
+
void SkCanvas::drawText(const void* text, size_t byteLength,
SkScalar x, SkScalar y, const SkPaint& paint) {
ITER_BEGIN(paint, SkDrawFilter::kText_Type)
while (iter.next()) {
- iter.fDevice->drawText(iter, text, byteLength, x, y, paint);
+ SkDeviceFilteredPaint dfp(iter.fDevice, paint);
+ iter.fDevice->drawText(iter, text, byteLength, x, y, dfp.paint());
}
ITER_END
@@ -1368,8 +1398,9 @@
ITER_BEGIN(paint, SkDrawFilter::kText_Type)
while (iter.next()) {
+ SkDeviceFilteredPaint dfp(iter.fDevice, paint);
iter.fDevice->drawPosText(iter, text, byteLength, &pos->fX, 0, 2,
- paint);
+ dfp.paint());
}
ITER_END
@@ -1381,8 +1412,9 @@
ITER_BEGIN(paint, SkDrawFilter::kText_Type)
while (iter.next()) {
+ SkDeviceFilteredPaint dfp(iter.fDevice, paint);
iter.fDevice->drawPosText(iter, text, byteLength, xpos, constY, 1,
- paint);
+ dfp.paint());
}
ITER_END