SkPDF Implement colorfilters on bitmaps

src/pdf/SkPDFDevice.cpp

Index: src/pdf/SkPDFDevice.cpp
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 52c4c655cd9c38d6b1cd58c4cb0b217f54321c8a..98de50b77d7390441c05c0cd9463c1f4dbb87818 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -9,6 +9,7 @@
 
 #include "SkAnnotation.h"
 #include "SkColor.h"
+#include "SkColorFilter.h"
 #include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDraw.h"
@@ -2202,10 +2203,20 @@ void SkPDFDevice::internalDrawBitmap(const SkMatrix& origMatrix,
     }
 
     SkBitmap subsetBitmap;
-    // Should extractSubset be done by the SkPDFDevice?

[scroggo, 2015/09/24 17:09:16]

I suppose this comment is no longer relevant because your fix for color filters
requires it?

[hal.canary, 2015/09/24 17:15:06]

It wasn't relevant before, too.

     if (!bitmap->extractSubset(&subsetBitmap, subset)) {
         return;
     }
+    if (SkColorFilter* colorFilter = paint.getColorFilter()) {
+        // TODO(http://skbug.com/4378): implement colorfilter everywhere.

[scroggo, 2015/09/24 17:09:16]

What do you mean support it everywhere? I suppose this only fixes it for
drawBitmap? The bug does not explain that. The bug just shows a fiddle which
looks similar to the GM you've added here, except without an image filter and
without a saveLayer? Does "everywhere" mean when image filters are not involved?
(It's not clear to me this case handles image filters in particular, though.)

[hal.canary, 2015/09/24 17:15:05]

I tried to make it more clear.

[scroggo, 2015/09/24 17:20:26]

lgtm

+        SkBitmap tmp;
+        if (subsetBitmap.copyTo(&tmp, kN32_SkColorType)) {
+            for (int y = 0; y < tmp.height();  ++y) {
+                SkPMColor* pixels = tmp.getAddr32(0, y);
+                colorFilter->filterSpan(pixels, tmp.width(), pixels);
+            }
+            subsetBitmap = tmp;
+        }
+    }
     SkAutoTUnref<SkPDFObject> image(SkPDFBitmap::Create(fCanon, subsetBitmap));
     if (!image) {
         return;