commit a4f207eb67d56e22b25213239efbef776f64d177
author Jim Van Verth <jvanverth@google.com> Wed Jan 08 13:30:58 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 08 13:31:21 2020 +0000
tree 0f53d119d715d657a101e75cf25ed004c0a6c7ca
parent 039afd96fd66844e3d0ac031458c976d74aca325

Revert "Move makeDeferredRenderTargetContext calls to factory on RTC."

This reverts commit 1c16b430333c6384a8835d4e3671d2fb056ab45b.

Reason for revert: Red on tree
Original change's description:
> Move makeDeferredRenderTargetContext calls to factory on RTC.
> 
> Change-Id: Iaa8f5829d9f8650ff27a60f75fb2216f016ab85e
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262058
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=egdaniel@google.com,bsalomon@google.com

Change-Id: I9e3c9d13c66b5437c87ad7136d283fa4ac81df1f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263019
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>

src/gpu/GrSurfaceProxy.cpp

diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index c62f651..944f979 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -19,7 +19,6 @@
 #include "src/gpu/GrOpsTask.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrStencilAttachment.h"
 #include "src/gpu/GrSurfacePriv.h"
 #include "src/gpu/GrTexturePriv.h"
@@ -330,10 +329,10 @@
         }
     }
     if (src->asTextureProxy()) {
-        auto dstContext = GrRenderTargetContext::Make(context, colorType, nullptr, fit,
-                                                      {width, height}, format, 1,
-                                                      mipMapped, src->isProtected(), origin,
-                                                      budgeted, nullptr);
+        auto dstContext = context->priv().makeDeferredRenderTargetContext(
+                fit, width, height, colorType, nullptr, 1, mipMapped, src->origin(), nullptr,
+                budgeted);
+
         if (dstContext && dstContext->blitTexture(src->asTextureProxy(), srcRect, dstPoint)) {
             return dstContext->asTextureProxyRef();
         }