commit d3895d867c6a801dd8d0ee425276f1a6af13177b
author Herb Derby <herb@google.com> Tue Sep 04 13:27:00 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 05 19:25:29 2018 +0000
tree 0ceae1fe6b305d9088fd4dae3fe2514074968631
parent 20ea47a5d9aa99b20a7745efce0f6c325666b463

Centralize the predicate for a glyph being too large for the atlas

Centralize the calculation to SkGlyphCacheCommon. This allows this
function to be used with NO_GPU.

In addition, this was used in the last remaining function in GrTest.
That function was used in a single place. I made the function a static
and remove GrTest.h. This had massive knock-on effects.

Change-Id: I80f874a988f9af4383a83acf7c273d23b8d67c22
Reviewed-on: https://skia-review.googlesource.com/151480
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Herb Derby <herb@google.com>

tests/TextBlobCacheTest.cpp

diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index 897ba1d..4e8a704 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -9,6 +9,7 @@
 
 #include "SkCanvas.h"
 #include "SkFontMgr.h"
+#include "SkGlyphRun.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkPoint.h"
@@ -25,7 +26,6 @@
 
 #include "GrContext.h"
 #include "GrContextPriv.h"
-#include "GrTest.h"
 
 static void draw(SkCanvas* canvas, int redraw, const SkTArray<sk_sp<SkTextBlob>>& blobs) {
     int yOffset = 0;
@@ -43,6 +43,29 @@
 static const int kWidth = 1024;
 static const int kHeight = 768;
 
+static void setup_always_evict_atlas(GrContext* context) {
+    int dim = SkGlyphCacheCommon::kSkSideTooBigForAtlas;
+    // These sizes were selected because they allow each atlas to hold a single plot and will thus
+    // stress the atlas
+    GrDrawOpAtlasConfig configs[3];
+    configs[kA8_GrMaskFormat].fWidth = dim;
+    configs[kA8_GrMaskFormat].fHeight = dim;
+    configs[kA8_GrMaskFormat].fPlotWidth = dim;
+    configs[kA8_GrMaskFormat].fPlotHeight = dim;
+
+    configs[kA565_GrMaskFormat].fWidth = dim;
+    configs[kA565_GrMaskFormat].fHeight = dim;
+    configs[kA565_GrMaskFormat].fPlotWidth = dim;
+    configs[kA565_GrMaskFormat].fPlotHeight = dim;
+
+    configs[kARGB_GrMaskFormat].fWidth = dim;
+    configs[kARGB_GrMaskFormat].fHeight = dim;
+    configs[kARGB_GrMaskFormat].fPlotWidth = dim;
+    configs[kARGB_GrMaskFormat].fPlotHeight = dim;
+
+    context->contextPriv().setTextContextAtlasSizes_ForTesting(configs);
+}
+
 // This test hammers the GPU textblobcache and font atlas
 static void text_blob_cache_inner(skiatest::Reporter* reporter, GrContext* context,
                                   int maxTotalText, int maxGlyphID, int maxFamilies, bool normal,
@@ -53,7 +76,7 @@
 
     // configure our context for maximum stressing of cache and atlas
     if (stressTest) {
-        GrTest::SetupAlwaysEvictAtlas(context);
+        setup_always_evict_atlas(context);
         context->contextPriv().setTextBlobCacheLimit_ForTesting(0);
     }