diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
| commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
| tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /tools/gpu | |
| parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff) | |
Revert "Revert "SkTypes: extract SkTo""
This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876.
> 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>
Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@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 14ba7a0035..00abd957e0 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -5,8 +5,6 @@ * found in the LICENSE file. */ -#include "GrTest.h" -#include <algorithm> #include "GrBackendSurface.h" #include "GrContextOptions.h" #include "GrContextPriv.h" @@ -20,14 +18,17 @@ #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 2b05693366..59f3c93fa2 100644 --- a/tools/gpu/gl/debug/DebugGLTestContext.cpp +++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp @@ -1,4 +1,3 @@ - /* * Copyright 2012 Google Inc. * @@ -16,9 +15,9 @@ #include "GrTextureObj.h" #include "GrTextureUnitObj.h" #include "GrVertexArrayObj.h" -#include "gl/GrGLTestInterface.h" - #include "SkMutex.h" +#include "SkTo.h" +#include "gl/GrGLTestInterface.h" namespace { |