diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-06-21 18:38:09 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-21 20:06:19 +0000 |
| commit | cd224b17e8f91fb4c44553226055325d46df3a46 (patch) | |
| tree | c41a5ba96b4481215985c089744416edfe33caaf /include/core | |
| parent | 149b541d8889198b61cec85dcfcb85dd872eccc4 (diff) | |
Revert "SkRefCnt, SkTypes: fix includes for clients"
This reverts commit 61582510eeb8484ad3e12df97bf781a3129f60d0.
Reason for revert: Chromium should now be fixed.
Original change's description:
> SkRefCnt, SkTypes: fix includes for clients
>
> Change-Id: I1cfdc03963eaab9687608974958d20411806cfeb
> Reviewed-on: https://skia-review.googlesource.com/136592
> Commit-Queue: Hal Canary <halcanary@google.com>
> Reviewed-by: Hal Canary <halcanary@google.com>
TBR=halcanary@google.com
Change-Id: I1a3588ed9e19ee5884f8a907abcfc2aa00cfe5e9
Reviewed-on: https://skia-review.googlesource.com/136700
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkRefCnt.h | 5 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index d4107b8473..d919c8114c 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -13,14 +13,11 @@ #include <atomic> #include <cstddef> #include <functional> +#include <memory> #include <ostream> #include <type_traits> #include <utility> -// These two headers will be removed in a later CL: -#include <memory> -#include <array> - /** \class SkRefCntBase SkRefCntBase is the base class for objects that may be shared by multiple diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index 395211a237..be51e20bac 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -16,8 +16,6 @@ #include <stdint.h> // IWYU pragma: end_exports -#include <utility> - /** \file SkTypes.h */ |