Defer more renderTargetContexts in the GPU image filter paths - take 2

tests/ProxyRefTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test.
 
 #include "Test.h"
@@ skipping 88 matching lines @@
             sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider));
 
             GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(sProxy.get());
 
             check_refs(reporter, sProxy.get(), 1, 1, 0, 1);
 
             // In the deferred case, the discard batch created on instantiation adds an
             // extra ref and write
             bool proxyGetsDiscardRef = !sProxy->isWrapped_ForTesting() &&
                                        caps.discardRenderTargetSupport();
-            int expectedWrites = proxyGetsDiscardRef ? 2 : 1;
+            int expectedWrites = proxyGetsDiscardRef ? 2 : 1;
 
             sProxy->instantiate(provider);
 
             // In the deferred case, this checks that the refs transfered to the GrSurface
             check_refs(reporter, sProxy.get(), 1, 1, 0, expectedWrites);
         }
 
         // A single read
         {
             sk_sp<GrSurfaceProxy> sProxy((*make)(caps, provider));
@@ skipping 76 matching lines @@
             sProxy->unref();
             check_refs(reporter, sProxy.get(), 1, 1, 0, expectedWrites);
 
             GrPendingIOResource<GrSurfaceProxy, kRead_GrIOType> fRead(sProxy.get());
             check_refs(reporter, sProxy.get(), 1, 1, 1, expectedWrites);
         }
     }
 }
 
 #endif