| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 | [log] [tgz] |
|---|---|---|
| author | Hal Canary <halcanary@google.com> | Wed Jun 13 09:42:32 2018 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Wed Jun 13 13:45:47 2018 +0000 |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 [diff] [blame] |
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>
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index 90b84d7..0240387 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h
@@ -1,3 +1,4 @@ + /* * Copyright 2014 Google Inc. * @@ -10,7 +11,6 @@ #include "../private/SkOnce.h" #include "../private/SkTemplates.h" -#include "../private/SkTo.h" #include "GrTypes.h" #include "SkData.h" #include "SkString.h"