Fix layer hoisting image filter corner cases

tests/RecordReplaceDrawTest.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.
  */
 
 #if SK_SUPPORT_GPU
 
 #include "Test.h"
@@ skipping 96 matching lines @@
                          SkPaint());
         pic.reset(recorder.endRecording());
     }
 
     unsigned key[1] = { 0 };
 
     SkPaint paint;
     GrLayerCache* layerCache = context->getLayerCache();
     GrCachedLayer* layer = layerCache->findLayerOrCreate(pic->uniqueID(), 0, 2,
                                                          SkIRect::MakeWH(kWidth, kHeight),
+                                                         SkIRect::MakeWH(kWidth, kHeight),
                                                          SkMatrix::I(), key, 1, &paint);
 
     GrSurfaceDesc desc;
     desc.fConfig = kSkia8888_GrPixelConfig;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = kWidth;
     desc.fHeight = kHeight;
     desc.fSampleCnt = 0;
 
     SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, NULL, 0));
     layer->setTexture(texture, SkIRect::MakeWH(kWidth, kHeight));
 
     SkAutoTUnref<SkBBoxHierarchy> bbh;
 
     SkRecord rerecord;
     SkRecorder canvas(&rerecord, kWidth, kHeight);
     GrRecordReplaceDraw(pic, &canvas, layerCache, SkMatrix::I(), NULL/*callback*/);
 
     int recount = rerecord.count();
-    REPORTER_ASSERT(r, 5 == recount || 7 == recount);
+    REPORTER_ASSERT(r, 2 == recount || 4 == recount);
 
     int index = 0;
-    if (7 == recount) {
+    if (4 == recount) {
         assert_type<SkRecords::Save>(r, rerecord, 0);
         index += 1;
     }
-    assert_type<SkRecords::Save>(r, rerecord, index + 0);
-    assert_type<SkRecords::SetMatrix>(r, rerecord, index + 1);
-    assert_type<SkRecords::DrawBitmapRectToRect>(r, rerecord, index + 2);
-    assert_type<SkRecords::Restore>(r, rerecord, index + 3);
-    assert_type<SkRecords::DrawRect>(r, rerecord, index + 4);
-    if (7 == recount) {
-        assert_type<SkRecords::Restore>(r, rerecord, 6);
+    assert_type<SkRecords::DrawSprite>(r, rerecord, index + 0);
+    assert_type<SkRecords::DrawRect>(r, rerecord, index + 1);
+    if (4 == recount) {
+        assert_type<SkRecords::Restore>(r, rerecord, 3);
     }
 }
 
 DEF_GPUTEST(RecordReplaceDraw, r, factory) { 
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContextFactory::GLContextType glType = static_cast<GrContextFactory::GLContextType>(type);
         if (!GrContextFactory::IsRenderingGLContext(glType)) {
             continue;
         }
         GrContext* context = factory->get(glType);
         if (NULL == context) {
             continue;
         }
 
         test_replacements(r, context, true);
         test_replacements(r, context, false);
     }
 }
 
 #endif