diff options
| author | android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> | 2020-04-12 01:29:20 +0000 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2020-04-13 15:34:22 +0000 |
| commit | 2a6e562629e67b6b759f6f3b6ef19bfe3745117f (patch) | |
| tree | 78bcd7e55ee087b6708eb6295f1d20916cdadd0f | |
| parent | 85b8275ce9a4328d16f860046342fffd86d005cc (diff) | |
| parent | 3e4e9ab7c20e16e3d632c6769126a73ccf1aaa4c (diff) | |
| download | skia-2a6e562629e67b6b759f6f3b6ef19bfe3745117f.tar.gz | |
Roll external/skia 178b86076996..3e4e9ab7c20e (1 commits)
https://skia.googlesource.com/skia.git/+log/178b86076996..3e4e9ab7c20e
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-next-autoroll
Please CC stani@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Test: Built on Android
Bug: 142426387
Change-Id: I47782f5fc677b361f243942181af968d73d6eae8
| -rw-r--r-- | src/core/SkTraceEventCommon.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrGpu.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkTraceEventCommon.h b/src/core/SkTraceEventCommon.h index 03439d70e7..01b8a72afd 100644 --- a/src/core/SkTraceEventCommon.h +++ b/src/core/SkTraceEventCommon.h @@ -136,7 +136,7 @@ public: }; #define ATRACE_ANDROID_FRAMEWORK(fmt, ...) SkAndroidFrameworkTraceUtil __trace(true, fmt, ##__VA_ARGS__) -#define ATRACE_ANDROID_FRAMEWORK_ALWAYS(fmt, ...) SkAndroidFrameworkTraceUtilAlways __trace(fmt, ##__VA_ARGS__) +#define ATRACE_ANDROID_FRAMEWORK_ALWAYS(fmt, ...) SkAndroidFrameworkTraceUtilAlways __trace_always(fmt, ##__VA_ARGS__) // Records a pair of begin and end events called "name" for the current scope, with 0, 1 or 2 // associated arguments. In the framework, the arguments are ignored. diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 65829eb875..d4ecebdb15 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -492,6 +492,7 @@ bool GrGpu::writePixels(GrSurface* surface, int left, int top, int width, int he GrColorType surfaceColorType, GrColorType srcColorType, const GrMipLevel texels[], int mipLevelCount, bool prepForTexSampling) { TRACE_EVENT0("skia.gpu", TRACE_FUNC); + ATRACE_ANDROID_FRAMEWORK_ALWAYS("texture_upload"); SkASSERT(surface); SkASSERT(!surface->framebufferOnly()); SkASSERT(this->caps()->isFormatTexturableAndUploadable(surfaceColorType, |