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 /src/gpu/GrClipStackClip.cpp | |
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 'src/gpu/GrClipStackClip.cpp')
-rw-r--r-- | src/gpu/GrClipStackClip.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp index 212aa364b5..92a6d04340 100644 --- a/src/gpu/GrClipStackClip.cpp +++ b/src/gpu/GrClipStackClip.cpp @@ -13,19 +13,18 @@ #include "GrDrawingManager.h" #include "GrFixedClip.h" #include "GrGpuResourcePriv.h" -#include "GrProxyProvider.h" #include "GrRenderTargetContextPriv.h" -#include "GrSWMaskHelper.h" +#include "GrProxyProvider.h" #include "GrStencilAttachment.h" +#include "GrSWMaskHelper.h" #include "GrTextureProxy.h" +#include "effects/GrConvexPolyEffect.h" +#include "effects/GrRRectEffect.h" +#include "effects/GrTextureDomain.h" #include "SkClipOpPriv.h" #include "SkMakeUnique.h" #include "SkTaskGroup.h" -#include "SkTo.h" #include "SkTraceEvent.h" -#include "effects/GrConvexPolyEffect.h" -#include "effects/GrRRectEffect.h" -#include "effects/GrTextureDomain.h" typedef SkClipStack::Element Element; typedef GrReducedClip::InitialState InitialState; |