| 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/include/private/SkTDArray.h b/include/private/SkTDArray.h index b030dc5..dd3212d 100644 --- a/include/private/SkTDArray.h +++ b/include/private/SkTDArray.h
@@ -1,4 +1,3 @@ - /* * Copyright 2006 The Android Open Source Project * @@ -10,8 +9,9 @@ #ifndef SkTDArray_DEFINED #define SkTDArray_DEFINED -#include "SkTypes.h" #include "SkMalloc.h" +#include "SkTo.h" +#include "SkTypes.h" template <typename T> class SkTDArray { public: