Switch to a more complete method of filtering hoisted layers

src/gpu/GrLayerCache.h

Index: src/gpu/GrLayerCache.h
diff --git a/src/gpu/GrLayerCache.h b/src/gpu/GrLayerCache.h
index cdbd0806ccb4e0694a8054d98bad4b7b3c931b78..df8c670689bb2258b66be6bbf20747b80654cabb 100644
--- a/src/gpu/GrLayerCache.h
+++ b/src/gpu/GrLayerCache.h
@@ -164,7 +164,7 @@ public:
         SkASSERT(SK_InvalidGenID != pictureID);
 
         if (fPaint) {
-            if (fPaint->getImageFilter() && fPaint->getImageFilter()->canFilterImageGPU()) {
+            if (fPaint->getImageFilter()) {
                 fFilter = SkSafeRef(fPaint->getImageFilter());
                 fPaint->setImageFilter(NULL);
             }
@@ -190,6 +190,9 @@ public:
     void setTexture(GrTexture* texture, const SkIRect& rect) {
         SkRefCnt_SafeAssign(fTexture, texture);
         fRect = rect;
+        if (!fTexture) {
+            fLocked = false;
+        }
     }
     GrTexture* texture() { return fTexture; }
     const SkPaint* paint() const { return fPaint; }