Revert of Fix layer hoisting image filter corner cases

src/gpu/GrRecordReplaceDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "GrLayerCache.h"
 #include "GrRecordReplaceDraw.h"
 #include "SkCanvasPriv.h"
 #include "SkGrPixelRef.h"
 #include "SkImage.h"
 #include "SkRecordDraw.h"
 #include "SkRecords.h"
 
 static inline void wrap_texture(GrTexture* texture, int width, int height, SkBitmap* result) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(width, height);
     result->setInfo(info);
     result->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, texture)))->unref();
 }
 
 static inline void draw_replacement_bitmap(GrCachedLayer* layer, SkCanvas* canvas) {
+    const SkRect src = SkRect::Make(layer->rect());
+    const SkRect dst = SkRect::Make(layer->bound());
 
     SkBitmap bm;
     wrap_texture(layer->texture(),
                  !layer->isAtlased() ? layer->rect().width()  : layer->texture()->width(),
                  !layer->isAtlased() ? layer->rect().height() : layer->texture()->height(),
                  &bm);
 
-    if (layer->isAtlased()) {
-        const SkRect src = SkRect::Make(layer->rect());
-        const SkRect dst = SkRect::Make(layer->srcIR());
-
-        SkASSERT(layer->offset().isZero());
-
-        canvas->save();
-        canvas->setMatrix(SkMatrix::I());
-        canvas->drawBitmapRectToRect(bm, &src, dst, layer->paint());
-        canvas->restore();
-    } else {
-        canvas->drawSprite(bm, 
-                           layer->srcIR().fLeft + layer->offset().fX,
-                           layer->srcIR().fTop + layer->offset().fY,
-                           layer->paint());
-    }
+    canvas->save();
+    canvas->setMatrix(SkMatrix::I());
+    canvas->drawBitmapRectToRect(bm, &src, dst, layer->paint());
+    canvas->restore();
 }
 
 // Used by GrRecordReplaceDraw. It intercepts nested drawPicture calls and
 // also draws them with replaced layers.
 class ReplaceDraw : public SkRecords::Draw {
 public:
     ReplaceDraw(SkCanvas* canvas, GrLayerCache* layerCache,
                 SkPicture const* const drawablePicts[], int drawableCount,
                 const SkPicture* topLevelPicture,
                 const SkPicture* picture,
@@ skipping 147 matching lines @@
                         const SkMatrix& initialMatrix,
                         SkDrawPictureCallback* callback) {
     SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
 
     // TODO: drawablePicts?
     ReplaceDraw draw(canvas, layerCache, NULL, 0,
                      picture, picture,
                      initialMatrix, callback, NULL, 0);
     return draw.draw();
 }