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 /tools/gpu | |
| 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 'tools/gpu')
| -rw-r--r-- | tools/gpu/GrTest.cpp | 5 | ||||
| -rw-r--r-- | tools/gpu/gl/debug/DebugGLTestContext.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index 00abd957e0..14ba7a0035 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#include "GrTest.h" +#include <algorithm> #include "GrBackendSurface.h" #include "GrContextOptions.h" #include "GrContextPriv.h" @@ -18,17 +20,14 @@ #include "GrResourceCache.h" #include "GrSemaphore.h" #include "GrSurfaceContextPriv.h" -#include "GrTest.h" #include "GrTexture.h" #include "SkGr.h" #include "SkImage_Gpu.h" #include "SkMathPriv.h" #include "SkString.h" -#include "SkTo.h" #include "ops/GrMeshDrawOp.h" #include "text/GrGlyphCache.h" #include "text/GrTextBlobCache.h" -#include <algorithm> namespace GrTest { diff --git a/tools/gpu/gl/debug/DebugGLTestContext.cpp b/tools/gpu/gl/debug/DebugGLTestContext.cpp index 59f3c93fa2..2b05693366 100644 --- a/tools/gpu/gl/debug/DebugGLTestContext.cpp +++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp @@ -1,3 +1,4 @@ + /* * Copyright 2012 Google Inc. * @@ -15,10 +16,10 @@ #include "GrTextureObj.h" #include "GrTextureUnitObj.h" #include "GrVertexArrayObj.h" -#include "SkMutex.h" -#include "SkTo.h" #include "gl/GrGLTestInterface.h" +#include "SkMutex.h" + namespace { // Helper macro to make creating an object (where you need to get back a derived type) easier |