commit 066f020bb6cb9dbb12b977fcddd93982201777fe
author Robert Phillips <robertphillips@google.com> Tue Jul 25 10:16:35 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 25 17:34:29 2017 +0000
tree 792f93eeb1503885417576d7b3f8d5627b6357af
parent e4832b287c6d0ae4a4a193f0144736f7eb6a824d

Reduce dependence on GrSurface's origin field (take 3)

TBR=bsalomon@google.com

Change-Id: I8c95c6774897dbd87e3c5c87d92f75c5b64d4e76
Reviewed-on: https://skia-review.googlesource.com/26424
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tests/ProxyConversionTest.cpp

diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp
index 513b680..23ca695 100644
--- a/tests/ProxyConversionTest.cpp
+++ b/tests/ProxyConversionTest.cpp
@@ -29,7 +29,7 @@
     sk_sp<GrRenderTarget> defaultFBO(provider->wrapBackendRenderTarget(backendRT, desc.fOrigin));
     SkASSERT(!defaultFBO->asTexture());
 
-    return GrSurfaceProxy::MakeWrapped(std::move(defaultFBO));
+    return GrSurfaceProxy::MakeWrapped(std::move(defaultFBO), desc.fOrigin);
 }
 
 static sk_sp<GrSurfaceProxy> make_wrapped_offscreen_rt(GrResourceProvider* provider,
@@ -40,7 +40,7 @@
 
     sk_sp<GrTexture> tex(provider->createTexture(desc, budgeted));
 
-    return GrSurfaceProxy::MakeWrapped(std::move(tex));
+    return GrSurfaceProxy::MakeWrapped(std::move(tex), desc.fOrigin);
 }
 
 static sk_sp<GrSurfaceProxy> make_wrapped_texture(GrResourceProvider* provider,
@@ -48,7 +48,7 @@
                                                   SkBudgeted budgeted) {
     sk_sp<GrTexture> tex(provider->createTexture(desc, budgeted));
 
-    return GrSurfaceProxy::MakeWrapped(std::move(tex));
+    return GrSurfaceProxy::MakeWrapped(std::move(tex), desc.fOrigin);
 }
 
 // Test converting between RenderTargetProxies and TextureProxies for wrapped