From b8d864902b4c9e893cbdc62eb77c4d49416a2bc1 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 24 Feb 2016 09:23:03 -0800 Subject: [PATCH] fixup GLPrograms textblob todo BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1730253002 Review URL: https://codereview.chromium.org/1730253002 --- src/gpu/text/GrAtlasTextContext.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/gpu/text/GrAtlasTextContext.cpp b/src/gpu/text/GrAtlasTextContext.cpp index 1934a8d..9cdd891 100644 --- a/src/gpu/text/GrAtlasTextContext.cpp +++ b/src/gpu/text/GrAtlasTextContext.cpp @@ -389,9 +389,15 @@ DRAW_BATCH_TEST_DEFINE(TextBlobBatch) { const char* text = "The quick brown fox jumps over the lazy dog."; int textLen = (int)strlen(text); - // Setup clip - GrClip clip; - + // create some random x/y offsets, including negative offsets + static const int kMaxTrans = 1024; + int xPos = (random->nextU() % 2) * 2 - 1; + int yPos = (random->nextU() % 2) * 2 - 1; + int xInt = (random->nextU() % kMaxTrans) * xPos; + int yInt = (random->nextU() % kMaxTrans) * yPos; + SkScalar x = SkIntToScalar(xInt); + SkScalar y = SkIntToScalar(yInt); + // right now we don't handle textblobs, nor do we handle drawPosText. Since we only // intend to test the batch with this unit test, that is okay. SkAutoTUnref blob( @@ -400,12 +406,8 @@ DRAW_BATCH_TEST_DEFINE(TextBlobBatch) { *context->caps()->shaderCaps(), grPaint, skPaint, viewMatrix, gSurfaceProps, text, - static_cast(textLen), 0, 0)); + static_cast(textLen), x, y)); - // We'd like to be able to test this with random translations, but currently the vertex - // bounds and vertices will get out of sync - SkScalar x = 0.f;//SkIntToScalar(random->nextU()); - SkScalar y = 0.f;//SkIntToScalar(random->nextU()); return blob->test_createBatch(textLen, 0, 0, viewMatrix, x, y, color, skPaint, gSurfaceProps, gTextContext->dfAdjustTable(), context->getBatchFontCache()); -- 2.7.4