commit 3743013f755d23c215d852af7d829c3cd74f34a2
author Robert Phillips <robertphillips@google.com> Wed Nov 09 06:50:43 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 09 12:20:50 2016 +0000
tree f685cc82d3dc40153863552b55c2519582c84d15
parent 7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840

Consolidate GrSurfaceProxy Make methods

I think GrSurfaceDesc is still the most compact way to communicate the deferred GrSurface's settings to the Proxy but this CL, at least, reduces where it is used.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4559

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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 13d1f3d..ff8de9d 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -609,9 +609,9 @@
                                                                const SkSurfaceProps* surfaceProps) {
     ASSERT_SINGLE_OWNER_PRIV
 
-    sk_sp<GrRenderTargetProxy> rtp(GrRenderTargetProxy::Make(std::move(rt)));
+    sk_sp<GrSurfaceProxy> proxy(GrSurfaceProxy::MakeWrapped(std::move(rt)));
 
-    return this->drawingManager()->makeRenderTargetContext(std::move(rtp),
+    return this->drawingManager()->makeRenderTargetContext(std::move(proxy),
                                                            std::move(colorSpace),
                                                            surfaceProps);
 }
@@ -629,10 +629,9 @@
         return nullptr;
     }
 
-    sk_sp<GrRenderTargetProxy> rtp(GrRenderTargetProxy::Make(
-                                                            sk_ref_sp(surface->asRenderTarget())));
+    sk_sp<GrSurfaceProxy> proxy(GrSurfaceProxy::MakeWrapped(std::move(surface)));
 
-    return this->drawingManager()->makeRenderTargetContext(std::move(rtp),
+    return this->drawingManager()->makeRenderTargetContext(std::move(proxy),
                                                            std::move(colorSpace), props);
 }
 
@@ -647,9 +646,9 @@
         return nullptr;
     }
 
-    sk_sp<GrRenderTargetProxy> rtp(GrRenderTargetProxy::Make(std::move(rt)));
+    sk_sp<GrSurfaceProxy> proxy(GrSurfaceProxy::MakeWrapped(std::move(rt)));
 
-    return this->drawingManager()->makeRenderTargetContext(std::move(rtp),
+    return this->drawingManager()->makeRenderTargetContext(std::move(proxy),
                                                            std::move(colorSpace),
                                                            surfaceProps);
 }
@@ -666,9 +665,9 @@
         return nullptr;
     }
 
-    sk_sp<GrRenderTargetProxy> rtp(GrRenderTargetProxy::Make(sk_ref_sp(surface->asRenderTarget())));
+    sk_sp<GrSurfaceProxy> proxy(GrSurfaceProxy::MakeWrapped(std::move(surface)));
 
-    return this->drawingManager()->makeRenderTargetContext(std::move(rtp),
+    return this->drawingManager()->makeRenderTargetContext(std::move(proxy),
                                                            std::move(colorSpace),
                                                            surfaceProps);
 }
@@ -787,7 +786,7 @@
     desc.fConfig = config;
     desc.fSampleCnt = sampleCnt;
 
-    sk_sp<GrRenderTargetProxy> rtp = GrRenderTargetProxy::Make(*this->caps(), desc, fit, budgeted);
+    sk_sp<GrSurfaceProxy> rtp = GrSurfaceProxy::MakeDeferred(*this->caps(), desc, fit, budgeted);
 
     return fDrawingManager->makeRenderTargetContext(std::move(rtp),
                                                     std::move(colorSpace),