diff options
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | gm/textblobrandomfont.cpp | 2 | ||||
| -rw-r--r-- | gn/utils.gni | 5 | ||||
| -rw-r--r-- | public.bzl | 4 | ||||
| -rw-r--r-- | tests/TextBlobCacheTest.cpp | 8 | ||||
| -rw-r--r-- | tools/SkRandomScalerContext.cpp (renamed from src/fonts/SkRandomScalerContext.cpp) | 0 | ||||
| -rw-r--r-- | tools/SkRandomScalerContext.h (renamed from src/fonts/SkRandomScalerContext.h) | 0 | ||||
| -rw-r--r-- | tools/SkTestScalerContext.cpp (renamed from src/fonts/SkTestScalerContext.cpp) | 0 | ||||
| -rw-r--r-- | tools/SkTestScalerContext.h (renamed from src/fonts/SkTestScalerContext.h) | 0 |
9 files changed, 11 insertions, 10 deletions
@@ -1073,6 +1073,8 @@ if (skia_enable_tools) { "tools/LsanSuppressions.cpp", "tools/ProcStats.cpp", "tools/Resources.cpp", + "tools/SkRandomScalerContext.cpp", + "tools/SkTestScalerContext.cpp", "tools/ThermalManager.cpp", "tools/UrlDataManager.cpp", "tools/debugger/SkDebugCanvas.cpp", diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp index 8dd77c51f0..c1b55f3521 100644 --- a/gm/textblobrandomfont.cpp +++ b/gm/textblobrandomfont.cpp @@ -11,11 +11,11 @@ #include "Resources.h" #include "SkCanvas.h" #include "SkGradientShader.h" +#include "SkRandomScalerContext.h" #include "SkStream.h" #include "SkSurface.h" #include "SkTextBlob.h" #include "SkTypeface.h" -#include "../src/fonts/SkRandomScalerContext.h" #if SK_SUPPORT_GPU diff --git a/gn/utils.gni b/gn/utils.gni index 8bcf4ee7d1..4d32314cbc 100644 --- a/gn/utils.gni +++ b/gn/utils.gni @@ -87,9 +87,4 @@ skia_utils_sources = [ "$_src/utils/win/SkWGL.h", "$_src/utils/win/SkWGL_win.cpp", - #testing - "$_src/fonts/SkRandomScalerContext.cpp", - "$_src/fonts/SkRandomScalerContext.h", - "$_src/fonts/SkTestScalerContext.cpp", - "$_src/fonts/SkTestScalerContext.h", ] diff --git a/public.bzl b/public.bzl index 95f94c31ec..2d23bd76d8 100644 --- a/public.bzl +++ b/public.bzl @@ -438,6 +438,10 @@ DM_SRCS_ALL = struct( "tools/Resources.cpp", "tools/Resources.h", "tools/SkJSONCPP.h", + "tools/SkRandomScalerContext.cpp", + "tools/SkRandomScalerContext.h", + "tools/SkTestScalerContext.cpp", + "tools/SkTestScalerContext.h", "tools/UrlDataManager.cpp", "tools/UrlDataManager.h", "tools/debugger/*.cpp", diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp index 995328d26d..bd74301117 100644 --- a/tests/TextBlobCacheTest.cpp +++ b/tests/TextBlobCacheTest.cpp @@ -8,14 +8,14 @@ #include "sk_tool_utils.h" #include "SkCanvas.h" -#include "SkPaint.h" -#include "SkPoint.h" -#include "SkTextBlob.h" #include "SkFontMgr.h" #include "SkGraphics.h" +#include "SkPaint.h" +#include "SkPoint.h" +#include "SkRandomScalerContext.h" #include "SkSurface.h" +#include "SkTextBlob.h" #include "SkTypeface.h" -#include "../src/fonts/SkRandomScalerContext.h" #ifdef SK_BUILD_FOR_WIN #include "SkTypeface_win.h" diff --git a/src/fonts/SkRandomScalerContext.cpp b/tools/SkRandomScalerContext.cpp index 49d9ab43ff..49d9ab43ff 100644 --- a/src/fonts/SkRandomScalerContext.cpp +++ b/tools/SkRandomScalerContext.cpp diff --git a/src/fonts/SkRandomScalerContext.h b/tools/SkRandomScalerContext.h index b71689d9e2..b71689d9e2 100644 --- a/src/fonts/SkRandomScalerContext.h +++ b/tools/SkRandomScalerContext.h diff --git a/src/fonts/SkTestScalerContext.cpp b/tools/SkTestScalerContext.cpp index 34ec6af849..34ec6af849 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/tools/SkTestScalerContext.cpp diff --git a/src/fonts/SkTestScalerContext.h b/tools/SkTestScalerContext.h index 1d362901eb..1d362901eb 100644 --- a/src/fonts/SkTestScalerContext.h +++ b/tools/SkTestScalerContext.h |