diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2018-03-23 14:39:42 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-23 14:39:51 +0000 |
| commit | af78a942179143e4646871fc797e2ce17c23a594 (patch) | |
| tree | e1df52c03c579436005b1098a500a3523c816000 /tools/sk_tool_utils.cpp | |
| parent | 8c53d465e3ceb3898f8037b61046c198bbec2fca (diff) | |
Revert "Add color fonts."
This reverts commit c912d6133c66df7cde3d64adc76941856a12da64.
Reason for revert: Causing TSAN issues.
Original change's description:
> Add color fonts.
>
> BUG=skia:7624
>
> Change-Id: Id2b7449048591892ff802484d5e3745a7e1402bb
> Reviewed-on: https://skia-review.googlesource.com/109521
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
> Reviewed-by: Herb Derby <herb@google.com>
TBR=mtklein@google.com,bungeman@google.com,herb@google.com
Change-Id: I2ccd1f00e91bb92b7059323c95da0dd3de954164
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116141
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'tools/sk_tool_utils.cpp')
| -rw-r--r-- | tools/sk_tool_utils.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp index 99b03a4391..2eb8dba833 100644 --- a/tools/sk_tool_utils.cpp +++ b/tools/sk_tool_utils.cpp @@ -5,29 +5,19 @@ * found in the LICENSE file. */ +#include "sk_tool_utils.h" + +#include "Resources.h" #include "SkBitmap.h" -#include "SkBlendMode.h" #include "SkCanvas.h" -#include "SkColorData.h" -#include "SkColorPriv.h" -#include "SkFloatingPoint.h" #include "SkImage.h" -#include "SkMatrix.h" -#include "SkPM4f.h" -#include "SkPaint.h" -#include "SkPath.h" #include "SkPixelRef.h" -#include "SkPixmap.h" -#include "SkPoint.h" -#include "SkRRect.h" +#include "SkPM4f.h" +#include "SkPoint3.h" #include "SkShader.h" #include "SkSurface.h" +#include "SkTestScalerContext.h" #include "SkTextBlob.h" -#include "sk_tool_utils.h" - -#include <cmath> -#include <cstring> -#include <memory> namespace sk_tool_utils { @@ -169,7 +159,7 @@ SkPath make_star(const SkRect& bounds, int numPts, int step) { #pragma optimize("", off) #endif void make_big_path(SkPath& path) { - #include "BigPathBench.inc" // IWYU pragma: keep + #include "BigPathBench.inc" } static float gaussian2d_value(int x, int y, float sigma) { |