diff options
author | Hal Canary <halcanary@google.com> | 2018-06-06 13:29:51 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-06 13:29:57 +0000 |
commit | 74b390d6b136a60f1df15ac5ecd19bd8ad5a394b (patch) | |
tree | afba5f9d8d8d802e9b6873c5f4c7948a94f76762 /tests | |
parent | 102c8cf26e2886ba783a2b54827e1f5d1cf0a774 (diff) |
Revert "Have draw(Text|PosText|PosTextH) use a single entry on the device"
This reverts commit 4225b3220ef4bf50f0d9403f812ea94d50c4ee59.
Reason for revert: made valgrind unhappy.
Original change's description:
> Have draw(Text|PosText|PosTextH) use a single entry on the device
>
> Handle the positioning of drawText at the canvas layer. Simplify
> the code by removing similar implementations.
>
> Change-Id: I8b711783435072f560e29fca1dd934fa2e345ed2
> Reviewed-on: https://skia-review.googlesource.com/127131
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
TBR=jvanverth@google.com,bungeman@google.com,herb@google.com
Change-Id: I65c9d30ae6ecb1f87e8660e56d8f8ce5daab7551
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/132403
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GlyphRunTest.cpp | 20 | ||||
-rw-r--r-- | tests/SVGDeviceTest.cpp | 15 |
2 files changed, 2 insertions, 33 deletions
diff --git a/tests/GlyphRunTest.cpp b/tests/GlyphRunTest.cpp deleted file mode 100644 index cad01acef7..0000000000 --- a/tests/GlyphRunTest.cpp +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2018 The Android Open Source Project - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkGlyphRun.h" - -#include "Test.h" - -DEF_TEST(GlyphRunInfo, reporter) { - SkGlyphID glyphs[] = {100, 3, 240, 3, 234, 111, 3, 4, 10, 11}; - uint16_t count = SK_ARRAY_COUNT(glyphs); - - SkPaint paint; - paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); - - SkGlyphRun::MakeFromDrawText(paint, glyphs, count, SkPoint::Make(0, 0)); -}
\ No newline at end of file diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp index 6cf533fa1b..b55a35fc56 100644 --- a/tests/SVGDeviceTest.cpp +++ b/tests/SVGDeviceTest.cpp @@ -24,9 +24,6 @@ #include "SkSVGCanvas.h" #include "SkXMLWriter.h" -#if 0 -Using the new system where devices only gets glyphs causes this to fail because the font has no -glyph to unichar data. namespace { @@ -52,9 +49,6 @@ void check_text_node(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, textNode != nullptr); if (textNode != nullptr) { REPORTER_ASSERT(reporter, dom.getType(textNode) == SkDOM::kText_Type); - if (strcmp(expected, dom.getName(textNode)) != 0) { - SkDebugf("string fail %s == %s\n", expected, dom.getName(textNode)); - } REPORTER_ASSERT(reporter, strcmp(expected, dom.getName(textNode)) == 0); } @@ -72,9 +66,6 @@ void check_text_node(skiatest::Reporter* reporter, REPORTER_ASSERT(reporter, xpos[0] == offset.x()); } else { for (int i = 0; i < xposCount; ++i) { - if (xpos[i] != SkIntToScalar(expected[i])) { - SkDebugf("Bad xs %g == %g\n", xpos[i], SkIntToScalar(expected[i])); - } REPORTER_ASSERT(reporter, xpos[i] == SkIntToScalar(expected[i])); } } @@ -112,7 +103,7 @@ void test_whitespace_pos(skiatest::Reporter* reporter, std::unique_ptr<SkCanvas> svgCanvas = SkSVGCanvas::Make(SkRect::MakeWH(100, 100), &writer); svgCanvas->drawText(txt, len, offset.x(), offset.y(), paint); } - check_text_node(reporter, dom, dom.finishParsing(), offset, 2, expected); + check_text_node(reporter, dom, dom.finishParsing(), offset, 0, expected); { SkAutoTMalloc<SkScalar> xpos(len); @@ -124,7 +115,7 @@ void test_whitespace_pos(skiatest::Reporter* reporter, std::unique_ptr<SkCanvas> svgCanvas = SkSVGCanvas::Make(SkRect::MakeWH(100, 100), &writer); svgCanvas->drawPosTextH(txt, len, xpos, offset.y(), paint); } - check_text_node(reporter, dom, dom.finishParsing(), offset, 2, expected); + check_text_node(reporter, dom, dom.finishParsing(), offset, 1, expected); { SkAutoTMalloc<SkPoint> pos(len); @@ -141,7 +132,6 @@ void test_whitespace_pos(skiatest::Reporter* reporter, } - DEF_TEST(SVGDevice_whitespace_pos, reporter) { static const struct { const char* tst_in; @@ -163,7 +153,6 @@ DEF_TEST(SVGDevice_whitespace_pos, reporter) { test_whitespace_pos(reporter, tests[i].tst_in, tests[i].tst_out); } } -#endif void SetImageShader(SkPaint* paint, int imageWidth, int imageHeight, SkShader::TileMode xTile, |