From fdcfb8b7c23fbf18f872d2c31d27978235033876 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:42:32 -0400 Subject: 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 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 Commit-Queue: Hal Canary --- src/pipe/SkPipeCanvas.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/pipe') diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp index d66953c5bd..911595c47c 100644 --- a/src/pipe/SkPipeCanvas.cpp +++ b/src/pipe/SkPipeCanvas.cpp @@ -5,23 +5,21 @@ * found in the LICENSE file. */ -#include "SkPipeCanvas.h" - #include "SkAutoMalloc.h" #include "SkCanvasPriv.h" #include "SkColorFilter.h" +#include "SkDrawable.h" #include "SkDrawLooper.h" #include "SkDrawShadowInfo.h" -#include "SkDrawable.h" #include "SkImageFilter.h" #include "SkMaskFilter.h" #include "SkPathEffect.h" +#include "SkPipeCanvas.h" #include "SkPipeFormat.h" #include "SkRSXform.h" #include "SkShader.h" #include "SkStream.h" #include "SkTextBlob.h" -#include "SkTo.h" #include "SkTypeface.h" template void write_rrect(T* writer, const SkRRect& rrect) { -- cgit v1.2.3