commit 1ec1faaff415a95022edfd504f552853a9af5d0a
author Robert Phillips <robertphillips@google.com> Tue Mar 28 16:21:27 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 29 12:48:17 2017 +0000
tree 2f414792e5a62d7b29074cf890b62b8509dd56de
parent 334e88c21ab51e2a9fa8a8352da7380f420cdb96

Remove GrSurface::flushWrites

Change-Id: Ifac5af00ef852ee212964baa113b490a03e0168d
Reviewed-on: https://skia-review.googlesource.com/10293
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/ProxyRefTest.cpp

diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index ec47597..67132a1 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -65,28 +65,28 @@
     SkASSERT(proxy->getPendingWriteCnt_TestOnly() == expectedNumWrites);
 }
 
-static sk_sp<GrSurfaceProxy> make_deferred(GrResourceProvider* provider) {
+static sk_sp<GrSurfaceProxy> make_deferred(GrContext* context) {
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = kWidthHeight;
     desc.fHeight = kWidthHeight;
     desc.fConfig = kRGBA_8888_GrPixelConfig;
 
-    return GrSurfaceProxy::MakeDeferred(provider, desc,
+    return GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc,
                                         SkBackingFit::kApprox, SkBudgeted::kYes);
 }
 
-static sk_sp<GrSurfaceProxy> make_wrapped(GrResourceProvider* provider) {
+static sk_sp<GrSurfaceProxy> make_wrapped(GrContext* context) {
     GrSurfaceDesc desc;
     desc.fFlags = kRenderTarget_GrSurfaceFlag;
     desc.fWidth = kWidthHeight;
     desc.fHeight = kWidthHeight;
     desc.fConfig = kRGBA_8888_GrPixelConfig;
 
-    sk_sp<GrTexture> tex(provider->createTexture(desc, SkBudgeted::kNo));
+    sk_sp<GrTexture> tex(context->resourceProvider()->createTexture(desc, SkBudgeted::kNo));
 
     // Flush the IOWrite from the initial discard or it will confuse the later ref count checks
-    tex->flushWrites();
+    context->flushSurfaceWrites(tex.get());
 
     return GrSurfaceProxy::MakeWrapped(std::move(tex));
 }
@@ -100,7 +100,7 @@
     for (auto make : { make_deferred, make_wrapped }) {
         // A single write
         {
-            sk_sp<GrSurfaceProxy> sProxy((*make)(provider));
+            sk_sp<GrSurfaceProxy> sProxy((*make)(ctxInfo.grContext()));
 
             GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(sProxy.get());
 
@@ -120,7 +120,7 @@
 
         // A single read
         {
-            sk_sp<GrSurfaceProxy> sProxy((*make)(provider));
+            sk_sp<GrSurfaceProxy> sProxy((*make)(ctxInfo.grContext()));
 
             GrPendingIOResource<GrSurfaceProxy, kRead_GrIOType> fRead(sProxy.get());
 
@@ -140,7 +140,7 @@
 
         // A single read/write pair
         {
-            sk_sp<GrSurfaceProxy> sProxy((*make)(provider));
+            sk_sp<GrSurfaceProxy> sProxy((*make)(ctxInfo.grContext()));
 
             GrPendingIOResource<GrSurfaceProxy, kRW_GrIOType> fRW(sProxy.get());
 
@@ -160,7 +160,7 @@
 
         // Multiple normal refs
         {
-            sk_sp<GrSurfaceProxy> sProxy((*make)(provider));
+            sk_sp<GrSurfaceProxy> sProxy((*make)(ctxInfo.grContext()));
             sProxy->ref();
             sProxy->ref();
 
@@ -181,7 +181,7 @@
 
         // Continue using (reffing) proxy after instantiation
         {
-            sk_sp<GrSurfaceProxy> sProxy((*make)(provider));
+            sk_sp<GrSurfaceProxy> sProxy((*make)(ctxInfo.grContext()));
             sProxy->ref();
 
             GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(sProxy.get());