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 --- bench/BitmapRectBench.cpp | 2 -- bench/PDFBench.cpp | 1 - 2 files changed, 3 deletions(-) (limited to 'bench') diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp index 0e5d3627f2..789a725e11 100644 --- a/bench/BitmapRectBench.cpp +++ b/bench/BitmapRectBench.cpp @@ -4,7 +4,6 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - #include "Benchmark.h" #include "SkBitmap.h" #include "SkCanvas.h" @@ -12,7 +11,6 @@ #include "SkPaint.h" #include "SkRandom.h" #include "SkString.h" -#include "SkTo.h" static void draw_into_bitmap(const SkBitmap& bm) { const int w = bm.width(); diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp index 44b96a73dd..4cda80bd6e 100644 --- a/bench/PDFBench.cpp +++ b/bench/PDFBench.cpp @@ -16,7 +16,6 @@ #include "SkPixmap.h" #include "SkRandom.h" #include "SkStream.h" -#include "SkTo.h" namespace { struct WStreamWriteTextBenchmark : public Benchmark { -- cgit v1.2.3