Revert of Fix layer hoisting image filter corner cases

src/gpu/GrLayerCache.h

Index: src/gpu/GrLayerCache.h
diff --git a/src/gpu/GrLayerCache.h b/src/gpu/GrLayerCache.h
index cdbd0806ccb4e0694a8054d98bad4b7b3c931b78..0ea23b3fc7294425c690da96c2707cf572c4c068 100644
--- a/src/gpu/GrLayerCache.h
+++ b/src/gpu/GrLayerCache.h
@@ -144,16 +144,13 @@
 
     // GrCachedLayer proper
     GrCachedLayer(uint32_t pictureID, unsigned start, unsigned stop,
-                  const SkIRect& srcIR, const SkIRect& dstIR,
-                  const SkMatrix& ctm,
+                  const SkIRect& bounds, const SkMatrix& ctm,
                   const unsigned* key, int keySize,
                   const SkPaint* paint)
         : fKey(pictureID, ctm, key, keySize, true)
         , fStart(start)
         , fStop(stop)
-        , fSrcIR(srcIR)
-        , fDstIR(dstIR)
-        , fOffset(SkIPoint::Make(0, 0))
+        , fBounds(bounds)
         , fPaint(paint ? SkNEW_ARGS(SkPaint, (*paint)) : NULL)
         , fFilter(NULL)
         , fTexture(NULL)
@@ -164,10 +161,8 @@
         SkASSERT(SK_InvalidGenID != pictureID);
 
         if (fPaint) {
-            if (fPaint->getImageFilter() && fPaint->getImageFilter()->canFilterImageGPU()) {
-                fFilter = SkSafeRef(fPaint->getImageFilter());
-                fPaint->setImageFilter(NULL);
-            }
+            fFilter = SkSafeRef(fPaint->getImageFilter());
+            fPaint->setImageFilter(NULL);
         }
     }
 
@@ -184,8 +179,7 @@
 
     unsigned start() const { return fStart; }
     // TODO: make bound debug only
-    const SkIRect& srcIR() const { return fSrcIR; }
-    const SkIRect& dstIR() const { return fDstIR; }
+    const SkIRect& bound() const { return fBounds; }
     unsigned stop() const { return fStop; }
     void setTexture(GrTexture* texture, const SkIRect& rect) {
         SkRefCnt_SafeAssign(fTexture, texture);
@@ -196,9 +190,6 @@
     const SkImageFilter* filter() const { return fFilter; }
     const SkIRect& rect() const { return fRect; }
 
-    void setOffset(const SkIPoint& offset) { fOffset = offset; }
-    const SkIPoint& offset() const { return fOffset; }
-
     void setPlot(GrPlot* plot) {
         SkASSERT(NULL == plot || NULL == fPlot);
         fPlot = plot;
@@ -221,13 +212,7 @@
     // The final "restore" operation index of the cached layer
     const unsigned  fStop;
 
-    // The layer's src rect (i.e., the portion of the source scene required
-    // for filtering).
-    const SkIRect   fSrcIR;
-    // The layer's dest rect (i.e., where it will land in device space)
-    const SkIRect   fDstIR;
-    // Offset sometimes required by image filters
-    SkIPoint        fOffset;
+    const SkIRect   fBounds;
 
     // The paint used when dropping the layer down into the owning canvas.
     // Can be NULL. This class makes a copy for itself.
@@ -291,8 +276,7 @@
                              const unsigned* key, int keySize);
     GrCachedLayer* findLayerOrCreate(uint32_t pictureID,
                                      int start, int stop, 
-                                     const SkIRect& srcIR,
-                                     const SkIRect& dstIR,
+                                     const SkIRect& bounds,
                                      const SkMatrix& initialMat,
                                      const unsigned* key, int keySize,
                                      const SkPaint* paint);
@@ -376,8 +360,7 @@
 
     void initAtlas();
     GrCachedLayer* createLayer(uint32_t pictureID, int start, int stop,
-                               const SkIRect& srcIR, const SkIRect& dstIR,
-                               const SkMatrix& initialMat,
+                               const SkIRect& bounds, const SkMatrix& initialMat,
                                const unsigned* key, int keySize,
                                const SkPaint* paint);