commit ee7cb5d9747eae500e7dd5bf8373ef5e9a8ba171
author Matt Sarett <msarett@google.com> Tue Apr 25 11:09:16 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 25 15:49:55 2017 +0000
tree fc9ab9175f9d659d2ffc6993fbbee645e91b87c3
parent 20b82524e7a7959803edd80cb0e6737629029ef2

Delete SkGTypeface and SkGScalerContext

Bug: skia:
Change-Id: I6a513d0cb3600678bc3b9c2bdfa8e04d692e9acf
Reviewed-on: https://skia-review.googlesource.com/14191
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

gn/gm.gni

diff --git a/gn/gm.gni b/gn/gm.gni
index 252de69..e85ef7e 100644
--- a/gn/gm.gni
+++ b/gn/gm.gni
@@ -61,13 +61,12 @@
   "$_gm/clippedbitmapshaders.cpp",
   "$_gm/color4f.cpp",
   "$_gm/coloremoji.cpp",
+  "$_gm/coloremoji_blendmodes.cpp",
   "$_gm/colorfilteralpha8.cpp",
   "$_gm/colorfilterimagefilter.cpp",
   "$_gm/colorfilters.cpp",
   "$_gm/colormatrix.cpp",
   "$_gm/colorspacexform.cpp",
-  "$_gm/colortype.cpp",
-  "$_gm/colortypexfermode.cpp",
   "$_gm/colorwheel.cpp",
   "$_gm/complexclip.cpp",
   "$_gm/complexclip_blur_tiled.cpp",

gn/utils.gni

diff --git a/gn/utils.gni b/gn/utils.gni
index bb0bd94..2aeb539 100644
--- a/gn/utils.gni
+++ b/gn/utils.gni
@@ -95,8 +95,6 @@
   "$_src/utils/win/SkWGL_win.cpp",
 
   #testing
-  "$_src/fonts/SkGScalerContext.cpp",
-  "$_src/fonts/SkGScalerContext.h",
   "$_src/fonts/SkRandomScalerContext.cpp",
   "$_src/fonts/SkRandomScalerContext.h",
   "$_src/fonts/SkTestScalerContext.cpp",