Text blob run paints should be filtered.

src/core/SkCanvas.cpp

 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkCanvasPriv.h"
 #include "SkBitmapDevice.h"
@@ skipping 218 matching lines @@
 class SkDrawIter : public SkDraw {
 public:
     SkDrawIter(SkCanvas* canvas, bool skipEmptyClips = true) {
         canvas = canvas->canvasForDrawIter();
         fCanvas = canvas;
         canvas->updateDeviceCMCache();
 
         fClipStack = canvas->fClipStack.get();
         fCurrLayer = canvas->fMCRec->fTopLayer;
         fSkipEmptyClips = skipEmptyClips;
+
+        fDrawFilter = fCanvas->getDrawFilter();

[reed1, 2015/03/03 21:26:22]

nit: cavas-> instead of fCanvas, just to match the lines above (and no blank
line)?

     }
 
     bool next() {
         // skip over recs with empty clips
         if (fSkipEmptyClips) {
             while (fCurrLayer && fCurrLayer->fClip.isEmpty()) {
                 fCurrLayer = fCurrLayer->fNext;
             }
         }
 
@@ skipping 30 matching lines @@
     SkBool8         fSkipEmptyClips;
 
     typedef SkDraw INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////////////
 
 class AutoDrawLooper {
 public:
     AutoDrawLooper(SkCanvas* canvas, const SkSurfaceProps& props, const SkPaint& paint,
-                   bool skipLayerForImageFilter = false,
-                   const SkRect* bounds = NULL) : fOrigPaint(paint) {
-        fCanvas = canvas;
-        fFilter = canvas->getDrawFilter();
-        fPaint = &fOrigPaint;
-        fSaveCount = canvas->getSaveCount();
-        fDoClearImageFilter = false;
-        fDone = false;
+                   bool skipLayerForImageFilter, bool skipDrawFilter,
+                   const SkRect* bounds = NULL)
+        : fCanvas(canvas)
+        , fOrigPaint(paint)
+        , fFilter(skipDrawFilter ? NULL : canvas->getDrawFilter())
+        , fPaint(&fOrigPaint)
+        , fSaveCount(canvas->getSaveCount())
+        , fDoClearImageFilter(false)
+        , fDone(false) {
 
         if (!skipLayerForImageFilter && fOrigPaint.getImageFilter()) {
             SkPaint tmp;
             tmp.setImageFilter(fOrigPaint.getImageFilter());
             (void)canvas->internalSaveLayer(bounds, &tmp, SkCanvas::kARGB_ClipLayer_SaveFlag,
                                             true, SkCanvas::kFullLayer_SaveLayerStrategy);
             // we'll clear the imageFilter for the actual draws in next(), so
             // it will only be applied during the restore().
             fDoClearImageFilter = true;
         }
@@ skipping 97 matching lines @@
         fPaint = NULL;
         return false;
     }
     return true;
 }
 
 ////////// macros to place around the internal draw calls //////////////////
 
 #define LOOPER_BEGIN_DRAWDEVICE(paint, type)                        \
     this->predrawNotify();                                          \
-    AutoDrawLooper  looper(this, fProps, paint, true);              \
+    AutoDrawLooper  looper(this, fProps, paint, true, false);       \
     while (looper.next(type)) {                                     \
         SkDrawIter          iter(this);
 
 #define LOOPER_BEGIN(paint, type, bounds)                           \
     this->predrawNotify();                                          \
-    AutoDrawLooper  looper(this, fProps, paint, false, bounds);     \
+    AutoDrawLooper  looper(this, fProps, paint, false, false, bounds);     \
     while (looper.next(type)) {                                     \
         SkDrawIter          iter(this);
 
+#define LOOPER_BEGIN_UNFILTERED(paint, type, bounds)                \
+    this->predrawNotify();                                          \
+    AutoDrawLooper  looper(this, fProps, paint, false, true, bounds);     \
+    while (looper.next(type)) {                                     \
+        SkDrawIter          iter(this);
+
 #define LOOPER_END    }
 
 ////////////////////////////////////////////////////////////////////////////
 
 SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) {
     fConservativeRasterClip = SkToBool(flags & kConservativeRasterClip_InitFlag);
     fCachedLocalClipBounds.setEmpty();
     fCachedLocalClipBoundsDirty = true;
     fAllowSoftClip = true;
     fAllowSimplifyClip = false;
@@ skipping 1720 matching lines @@
                               const SkPaint& paint) {
 
     if (paint.canComputeFastBounds()) {
         SkRect storage;
 
         if (this->quickReject(paint.computeFastBounds(blob->bounds().makeOffset(x, y), &storage))) {
             return;
         }
     }
 
-    LOOPER_BEGIN(paint, SkDrawFilter::kText_Type, NULL)
+    // Skip draw filters because the actual paint depends on run font info. Draw filters
+    // are applied at the device level, where we have access to the complete paint.
+    LOOPER_BEGIN_UNFILTERED(paint, SkDrawFilter::kText_Type, NULL)
 
     while (iter.next()) {
         SkDeviceFilteredPaint dfp(iter.fDevice, looper.paint());
         iter.fDevice->drawTextBlob(iter, blob, x, y, dfp.paint());
     }
 
     LOOPER_END
 }
 
 // These will become non-virtual, so they always call the (virtual) onDraw... method
@@ skipping 338 matching lines @@
     }
 
     if (matrix) {
         canvas->concat(*matrix);
     }
 }
 
 SkAutoCanvasMatrixPaint::~SkAutoCanvasMatrixPaint() {
     fCanvas->restoreToCount(fSaveCount);
 }