commit a92913e16957f0e5c9d51eb31d2be01a0d0d4c59
author Robert Phillips <robertphillips@google.com> Mon Jul 12 16:31:52 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 13 13:56:53 2021 +0000
tree ac439aaa5425d02e3cf97b96722a5565cd983253
parent 2d25d28e51b043b277a3e8c35a3101db95c1e72c

Make GrAuditTrail V1-only

This CL has some rough edges since some classes that use it (e.g., GrOpsTask) aren't yet V1-only. That said, the big CL has to be broken up somehow.

Bug: skia:11837
Change-Id: I41ed9982ca4664f893e447ba23c7aec59f42c964
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/426416
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrSurfaceContext.cpp

diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index 44e25db..33cdd68 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -14,7 +14,6 @@
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkMipmap.h"
 #include "src/core/SkYUVMath.h"
-#include "src/gpu/GrAuditTrail.h"
 #include "src/gpu/GrClientMappedBufferManager.h"
 #include "src/gpu/GrColorSpaceXform.h"
 #include "src/gpu/GrDataUtils.h"
@@ -147,10 +146,6 @@
 
 const GrCaps* GrSurfaceContext::caps() const { return fContext->priv().caps(); }
 
-GrAuditTrail* GrSurfaceContext::auditTrail() {
-    return fContext->priv().auditTrail();
-}
-
 GrDrawingManager* GrSurfaceContext::drawingManager() {
     return fContext->priv().drawingManager();
 }
@@ -172,7 +167,8 @@
     ASSERT_SINGLE_OWNER
     RETURN_FALSE_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
-    GR_AUDIT_TRAIL_AUTO_FRAME(this->auditTrail(), "GrSurfaceContext::readPixels");
+    GR_CREATE_TRACE_MARKER_CONTEXT("GrSurfaceContext", "readPixels", fContext);
+
     if (!fContext->priv().matches(dContext)) {
         return false;
     }
@@ -421,7 +417,7 @@
                                            const GrCPixmap src[],
                                            int numLevels,
                                            SkIPoint pt) {
-    GR_AUDIT_TRAIL_AUTO_FRAME(this->auditTrail(), "GrSurfaceContext::internalWritePixels");
+    GR_CREATE_TRACE_MARKER_CONTEXT("GrSurfaceContext", "internalWritePixels", fContext);
 
     SkASSERT(numLevels >= 1);
     SkASSERT(src);
@@ -1132,7 +1128,7 @@
     ASSERT_SINGLE_OWNER
     RETURN_NULLPTR_IF_ABANDONED
     SkDEBUGCODE(this->validate();)
-    GR_AUDIT_TRAIL_AUTO_FRAME(this->auditTrail(), "GrSurfaceContextPriv::copy");
+    GR_CREATE_TRACE_MARKER_CONTEXT("GrSurfaceContext", "copy", fContext);
 
     const GrCaps* caps = fContext->priv().caps();