| commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c | [log] [tgz] |
|---|---|---|
| author | Hal Canary <halcanary@google.com> | Wed Jun 13 09:59:02 2018 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Thu Jun 14 14:55:17 2018 +0000 |
| tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d | |
| parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 [diff] [blame] |
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>
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index 9df2265..a14fc67 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -5,12 +5,13 @@ * found in the LICENSE file. */ - -#include "GrNonAtomicRef.h" -#include "gl/GrGLInterface.h" #include "GrGLTestInterface.h" +#include "GrNonAtomicRef.h" #include "SkMutex.h" #include "SkTDArray.h" +#include "SkTo.h" +#include "gl/GrGLInterface.h" + #include <type_traits> // added to suppress 'no previous prototype' warning and because this code is duplicated in