commit 05da783f87fb71ae4d7fe9c4d89162b887d8d5b8
author Chris Dalton <csmartdalton@google.com> Tue Jul 07 07:22:37 2020 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 07 07:23:55 2020 +0000
tree 75942c50118200d187f3449783614ced4a401aed
parent 95dfda4ecaa7b483712befaae176c4d645447604

Revert "Make SkGpuDevice hold a GrRecordingContext"

This reverts commit c8b721b08619f5b515b5dc066999205fa6aa56c9.

Reason for revert: Looks like it's causing build failures around
MakeRenderTargetContext on the roll.

Original change's description:
> Make SkGpuDevice hold a GrRecordingContext
> 
> This makes the code reflect what is actually going on. During DDL
> recording the SkGpuDevice only holds a recording context.
> 
> This can't land until the following Chrome-side CL lands:
> 
> https://chromium-review.googlesource.com/c/chromium/src/+/2277964 (Add GrContext.h include to skia renderer for upcoming Skia roll)
> 
> Change-Id: I69cfa744226c315c25f68fc509b7b59ec38bbf31
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299867
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Adlai Holler <adlai@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,adlai@google.com

Change-Id: I6a362daf7c40e36ed9f068c5b2d477c16a3f778e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/300853
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/SkGpuDevice_drawTexture.cpp

diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 6dee700..3f5a645 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -8,8 +8,6 @@
 #include "src/gpu/SkGpuDevice.h"
 
 #include "include/core/SkYUVAIndex.h"
-#include "include/gpu/GrDirectContext.h"
-#include "include/gpu/GrRecordingContext.h"
 #include "src/core/SkDraw.h"
 #include "src/core/SkMaskFilterBase.h"
 #include "src/gpu/GrBitmapTextureMaker.h"
@@ -17,7 +15,6 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrColorSpaceXform.h"
 #include "src/gpu/GrImageTextureMaker.h"
-#include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrStyle.h"
 #include "src/gpu/GrTextureAdjuster.h"
@@ -156,7 +153,7 @@
 }
 
 // tileSize and clippedSubset are valid if true is returned
-static bool should_tile_image_id(GrRecordingContext* context,
+static bool should_tile_image_id(GrContext* context,
                                  SkISize rtSize,
                                  const GrClip* clip,
                                  uint32_t imageID,
@@ -188,15 +185,14 @@
     // and theoretically, the resource cache's limits could be being changed on another thread, so
     // even having access to just the limit wouldn't be a reliable test during recording here.
     // Instead, we will just upload the entire image to be on the safe side and not tile.
-    auto direct = context->asDirectContext();
-    if (!direct) {
+    if (!context->asDirectContext()) {
         return false;
     }
 
     // assumption here is that sw bitmap size is a good proxy for its size as
     // a texture
     size_t bmpSize = area * sizeof(SkPMColor);  // assume 32bit pixels
-    size_t cacheSize = direct->getResourceCacheLimit();
+    size_t cacheSize = context->getResourceCacheLimit();
     if (bmpSize < cacheSize / 2) {
         return false;
     }
@@ -385,7 +381,7 @@
 }
 
 // Assumes srcRect and dstRect have already been optimized to fit the proxy.
-static void draw_texture_producer(GrRecordingContext* context,
+static void draw_texture_producer(GrContext* context,
                                   GrRenderTargetContext* rtc,
                                   const GrClip* clip,
                                   const SkMatrixProvider& matrixProvider,
@@ -514,7 +510,7 @@
     }
 }
 
-void draw_tiled_bitmap(GrRecordingContext* context,
+void draw_tiled_bitmap(GrContext* context,
                        GrRenderTargetContext* rtc,
                        const GrClip* clip,
                        const SkBitmap& bitmap,