diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:42:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 13:45:47 +0000 |
| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 (patch) | |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba /src/gpu/ops | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 (diff) | |
Revert "SkTypes: extract SkTo"
This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.
Reason for revert: this appears to be what is holding up the Chrome roll.
Original change's description:
> SkTypes: extract SkTo
>
> Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> Reviewed-on: https://skia-review.googlesource.com/133620
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,halcanary@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/ops')
| -rw-r--r-- | src/gpu/ops/GrOp.cpp | 1 | ||||
| -rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/gpu/ops/GrOp.cpp b/src/gpu/ops/GrOp.cpp index f020cdef67..798d29d358 100644 --- a/src/gpu/ops/GrOp.cpp +++ b/src/gpu/ops/GrOp.cpp @@ -9,7 +9,6 @@ #include "GrMemoryPool.h" #include "SkSpinlock.h" -#include "SkTo.h" // TODO I noticed a small benefit to using a larger exclusive pool for ops. Its very small, but // seems to be mostly consistent. There is a lot in flux right now, but we should really revisit diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index 98228c5709..2301930e93 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -6,7 +6,6 @@ */ #include "GrTextureOp.h" - #include "GrAppliedClip.h" #include "GrCaps.h" #include "GrContext.h" @@ -27,7 +26,6 @@ #include "SkMatrixPriv.h" #include "SkPoint.h" #include "SkPoint3.h" -#include "SkTo.h" #include "glsl/GrGLSLColorSpaceXformHelper.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" #include "glsl/GrGLSLGeometryProcessor.h" |