commit 3560b58de36988e1fba54d9ac341735ab849e913
author Ben Wagner <bungeman@google.com> Tue Mar 27 18:15:53 2018 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 27 18:16:04 2018 +0000
tree bedddd24f268048bf5974914fd9ba81c8d35e018
parent 83ee463c315851c53f6368fcc3df0a30b0052a57

Revert "Add color fonts."

This reverts commit d3b933f3e03d5c22e9e7c56d2110469e41509720.

Reason for revert: we're not mirroring experimental/ everywhere.

Original change's description:
> Add color fonts.
> 
> BUG=skia:7624
> 
> Change-Id: I1d0974282adce2fd7b13a003309e63593b6e1a9c
> 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>
> Reviewed-on: https://skia-review.googlesource.com/116541

TBR=mtklein@google.com,bungeman@google.com,herb@google.com

Change-Id: Ic2d763244cbce663a23eb53321ac45201c466501
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7624
Reviewed-on: https://skia-review.googlesource.com/116680
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6fc9b0b..7786024 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1278,11 +1278,7 @@
       "tools/debugger/SkObjectParser.cpp",
       "tools/fonts/SkRandomScalerContext.cpp",
       "tools/fonts/SkTestFontMgr.cpp",
-      "tools/fonts/SkTestFontMgr.h",
-      "tools/fonts/SkTestSVGTypeface.cpp",
-      "tools/fonts/SkTestSVGTypeface.h",
-      "tools/fonts/SkTestTypeface.cpp",
-      "tools/fonts/SkTestTypeface.h",
+      "tools/fonts/SkTestScalerContext.cpp",
       "tools/fonts/sk_tool_utils_font.cpp",
       "tools/picture_utils.cpp",
       "tools/random_parse_path.cpp",
@@ -1302,7 +1298,6 @@
     }
     deps = [
       ":common_flags",
-      ":experimental_svg_model",
       ":flags",
       "//third_party/libpng",
     ]
@@ -1674,17 +1669,6 @@
     ]
   }
 
-  test_app("create_test_font_color") {
-    sources = [
-      "tools/fonts/create_test_font_color.cpp",
-    ]
-    deps = [
-      ":flags",
-      ":skia",
-      ":tool_utils"
-    ]
-  }
-
   test_app("get_images_from_skps") {
     sources = [
       "tools/get_images_from_skps.cpp",