aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/views
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-13 09:59:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 14:55:17 +0000
commitc640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch)
treed8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/views
parent4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff)
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>
Diffstat (limited to 'src/views')
-rw-r--r--src/views/SkView.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/views/SkView.cpp b/src/views/SkView.cpp
index 6c9098848c..26ee1eae13 100644
--- a/src/views/SkView.cpp
+++ b/src/views/SkView.cpp
@@ -6,7 +6,9 @@
*/
#include "SkView.h"
+
#include "SkCanvas.h"
+#include "SkTo.h"
static inline uint32_t SkSetClearShift(uint32_t bits, bool cond, unsigned shift) {
SkASSERT((int)cond == 0 || (int)cond == 1);